Changeset 10765 for code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
- 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/GUIManager.cc
r10624 r10765 268 268 */ 269 269 GUIManager::GUIManager(const std::pair<int, int>& mousePosition) 270 : guiRenderer_( NULL)271 , resourceProvider_( NULL)270 : guiRenderer_(nullptr) 271 , resourceProvider_(nullptr) 272 272 #ifndef ORXONOX_OLD_CEGUI 273 , rqListener_( NULL)274 , imageCodec_( NULL)275 #endif 276 , luaState_( NULL)277 , scriptModule_( NULL)278 , guiSystem_( NULL)279 , ceguiLogger_( NULL)280 , rootWindow_( NULL)281 , hudRootWindow_( NULL)282 , menuRootWindow_( NULL)283 , camera_( NULL)273 , rqListener_(nullptr) 274 , imageCodec_(nullptr) 275 #endif 276 , luaState_(nullptr) 277 , scriptModule_(nullptr) 278 , guiSystem_(nullptr) 279 , ceguiLogger_(nullptr) 280 , rootWindow_(nullptr) 281 , hudRootWindow_(nullptr) 282 , menuRootWindow_(nullptr) 283 , camera_(nullptr) 284 284 , destructionHelper_(this) 285 285 { … … 467 467 { 468 468 #ifdef ORXONOX_OLD_CEGUI 469 if (camera == NULL)469 if (camera == nullptr) 470 470 this->guiRenderer_->setTargetSceneManager(0); 471 471 else 472 472 this->guiRenderer_->setTargetSceneManager(camera->getSceneManager()); 473 473 #else 474 if (camera_ != NULL && camera_->getSceneManager() != NULL)474 if (camera_ != nullptr && camera_->getSceneManager() != nullptr) 475 475 camera_->getSceneManager()->removeRenderQueueListener(rqListener_); 476 if (camera != NULL && camera->getSceneManager() != NULL)476 if (camera != nullptr && camera->getSceneManager() != nullptr) 477 477 camera->getSceneManager()->addRenderQueueListener(rqListener_); 478 478 #endif … … 876 876 return; 877 877 878 CEGUI::Font* font = NULL;878 CEGUI::Font* font = nullptr; 879 879 CEGUI::XMLAttributes xmlAttributes; 880 880 … … 892 892 893 893 font = CEGUI::FontManager::getSingleton().createFont("FreeType", xmlAttributes); 894 if(font != NULL)894 if(font != nullptr) 895 895 font->load(); 896 896 #else
Note: See TracChangeset
for help on using the changeset viewer.