removed unused OmwLoader

apps/openmw/CMakeLists.txt

@@ -65,7 +65,7 @@ add_openmw_dir (mwworld
     cells localscripts customdata weather inventorystore ptr actionopen actionread
     actionequip timestamp actionalchemy cellstore actionapply actioneat
     esmstore store recordcmp fallback actionrepair actionsoulgem livecellref actiondoor
-    contentloader esmloader omwloader actiontrap cellreflist projectilemanager cellref
+    contentloader esmloader actiontrap cellreflist projectilemanager cellref
     )
 
 add_openmw_dir (mwclass
@@ -110,7 +110,7 @@ if (NOT ANDROID)
         ${APPLE_BUNDLE_RESOURCES}
     )
 else ()
-    add_library(openmw 
+    add_library(openmw
         SHARED
         ${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
         ${OPENMW_FILES}
@@ -140,18 +140,18 @@ target_link_libraries(openmw
 
 if (ANDROID)
     target_link_libraries(openmw
-        ${OGRE_STATIC_PLUGINS} 
+        ${OGRE_STATIC_PLUGINS}
         EGL
         android
         log
-        dl  
+        dl
         MyGUI.OgrePlatform
         MyGUIEngineStatic
         Plugin_StrangeButtonStatic
         cpufeatures
         BulletCollision
         BulletDynamics
-        LinearMath 
+        LinearMath
     )
 endif (ANDROID)
 

apps/openmw/mwworld/omwloader.cpp

@@ -1,17 +0,0 @@
-#include "omwloader.hpp"
-
-namespace MWWorld
-{
-
-OmwLoader::OmwLoader(Loading::Listener& listener)
-  : ContentLoader(listener)
-{
-}
-
-void OmwLoader::load(const boost::filesystem::path& filepath, int& index)
-{
-    ContentLoader::load(filepath.filename(), index);
-}
-
-} /* namespace MWWorld */
-

apps/openmw/mwworld/omwloader.hpp

@@ -1,21 +0,0 @@
-#ifndef OMWLOADER_HPP
-#define OMWLOADER_HPP
-
-#include "contentloader.hpp"
-
-namespace MWWorld
-{
-
-/**
- * @brief Placeholder for real OpenMW content loader
- */
-struct OmwLoader : public ContentLoader
-{
-    OmwLoader(Loading::Listener& listener);
-
-    void load(const boost::filesystem::path& filepath, int& index);
-};
-
-} /* namespace MWWorld */
-
-#endif /* OMWLOADER_HPP */

apps/openmw/mwworld/worldimp.cpp

@@ -51,7 +51,6 @@
 
 #include "contentloader.hpp"
 #include "esmloader.hpp"
-#include "omwloader.hpp"
 
 using namespace Ogre;
 
@@ -170,7 +169,6 @@ namespace MWWorld
 
         GameContentLoader gameContentLoader(*listener);
         EsmLoader esmLoader(mStore, mEsm, encoder, *listener);
-        OmwLoader omwLoader(*listener);
 
         gameContentLoader.addLoader(".esm", &esmLoader);
         gameContentLoader.addLoader(".esp", &esmLoader);