Gui: modernize C++11
* use nullptr
This commit is contained in:
@@ -33,11 +33,11 @@
|
||||
|
||||
using namespace Gui;
|
||||
|
||||
WorkbenchManager* WorkbenchManager::_instance = 0;
|
||||
WorkbenchManager* WorkbenchManager::_instance = nullptr;
|
||||
|
||||
WorkbenchManager* WorkbenchManager::instance()
|
||||
{
|
||||
if (_instance == 0)
|
||||
if (_instance == nullptr)
|
||||
_instance = new WorkbenchManager;
|
||||
return _instance;
|
||||
}
|
||||
@@ -45,10 +45,10 @@ WorkbenchManager* WorkbenchManager::instance()
|
||||
void WorkbenchManager::destruct()
|
||||
{
|
||||
delete _instance;
|
||||
_instance = 0;
|
||||
_instance = nullptr;
|
||||
}
|
||||
|
||||
WorkbenchManager::WorkbenchManager() : _activeWorkbench(0)
|
||||
WorkbenchManager::WorkbenchManager() : _activeWorkbench(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -100,14 +100,14 @@ void WorkbenchManager::removeWorkbench(const std::string& name)
|
||||
Workbench* wb = it->second;
|
||||
_workbenches.erase(it);
|
||||
if (_activeWorkbench == wb)
|
||||
_activeWorkbench = 0;
|
||||
_activeWorkbench = nullptr;
|
||||
delete wb;
|
||||
}
|
||||
}
|
||||
|
||||
Workbench* WorkbenchManager::getWorkbench (const std::string& name) const
|
||||
{
|
||||
Workbench* wb=0;
|
||||
Workbench* wb=nullptr;
|
||||
|
||||
std::map<std::string, Workbench*>::const_iterator it = _workbenches.find(name);
|
||||
if (it != _workbenches.end()) {
|
||||
|
||||
Reference in New Issue
Block a user