Changeset 10552 for code/branches/core7/src
- Timestamp:
- Aug 27, 2015, 11:05:18 PM (9 years ago)
- Location:
- code/branches/core7/src/libraries/core
- Files:
-
- 4 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core7/src/libraries/core/Core.cc
r10551 r10552 76 76 #include "module/ModuleInstance.h" 77 77 #include "module/StaticInitializationManager.h" 78 #include "module/PluginManager.h" 78 79 #include "CoreStaticInitializationHandler.h" 79 80 #include "UpdateListener.h" … … 111 112 , bGraphicsLoaded_(false) 112 113 , staticInitHandler_(NULL) 114 , pluginManager_(NULL) 113 115 , rootModule_(NULL) 114 116 , config_(NULL) … … 197 199 this->staticInitHandler_->initInstances(this->rootModule_); 198 200 this->staticInitHandler_->setInitInstances(true); 201 202 // Create plugin manager and search for plugins 203 this->pluginManager_ = new PluginManager(); 204 this->pluginManager_->findPlugins(); 199 205 200 206 // Loader … … 248 254 safeObjectDelete(&configFileManager_); 249 255 safeObjectDelete(&signalHandler_); 256 safeObjectDelete(&pluginManager_); 250 257 Context::getRootContext()->unregisterObject(); // unregister context from object lists - otherwise the root context would be destroyed while unloading the root module 251 258 if (this->rootModule_) -
code/branches/core7/src/libraries/core/Core.h
r10532 r10552 114 114 115 115 CoreStaticInitializationHandler* staticInitHandler_; 116 PluginManager* pluginManager_; 116 117 ModuleInstance* rootModule_; 117 118 std::list<ModuleInstance*> modules_; -
code/branches/core7/src/libraries/core/CorePrereqs.h
r10535 r10552 210 210 class OrxonoxClass; 211 211 class OrxonoxInterface; 212 class Plugin; 213 class PluginManager; 212 214 struct ResourceInfo; 213 215 template <ScopeID::Value> -
code/branches/core7/src/libraries/core/module/CMakeLists.txt
r10540 r10552 3 3 DynLibManager.cc 4 4 ModuleInstance.cc 5 Plugin.cc 6 PluginManager.cc 5 7 StaticallyInitializedInstance.cc 6 8 StaticInitializationHandlerIncludes.cc
Note: See TracChangeset
for help on using the changeset viewer.