- Timestamp:
- Nov 4, 2015, 10:25:42 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc
r10580 r10765 56 56 PluginManager::~PluginManager() 57 57 { 58 ModifyConsoleCommand("PluginManager", __CC_PluginManager_load_name).setObject( NULL);59 ModifyConsoleCommand("PluginManager", __CC_PluginManager_unload_name).setObject( NULL);58 ModifyConsoleCommand("PluginManager", __CC_PluginManager_load_name).setObject(nullptr); 59 ModifyConsoleCommand("PluginManager", __CC_PluginManager_unload_name).setObject(nullptr); 60 60 61 61 for (std::map<std::string, PluginReference*>::iterator it = this->references_.begin(); it != this->references_.end(); ++it) … … 89 89 { 90 90 Plugin* plugin = this->plugins_[name]; 91 if (plugin != NULL)91 if (plugin != nullptr) 92 92 plugin->load(); 93 93 else … … 98 98 { 99 99 Plugin* plugin = this->plugins_[name]; 100 if (plugin != NULL)100 if (plugin != nullptr) 101 101 plugin->unload(); 102 102 else … … 109 109 void PluginManager::loadPlugin(const std::string& name) 110 110 { 111 if (this->references_[name] == NULL)111 if (this->references_[name] == nullptr) 112 112 { 113 113 this->references_[name] = new PluginReference(name); … … 124 124 { 125 125 PluginReference* reference = this->references_[name]; 126 if (reference != NULL)126 if (reference != nullptr) 127 127 { 128 this->references_[name] = NULL;128 this->references_[name] = nullptr; 129 129 delete reference; 130 130 }
Note: See TracChangeset
for help on using the changeset viewer.