kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: modernize C++11

Browse Source 
* use nullptr
This commit is contained in:
wmayer
2022-03-23 18:41:21 +01:00
parent be7e18757c
commit 1178df06b4
239 changed files with 1197 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Gui/Control.cpp
View File

@@ -45,11 +45,11 @@ using namespace std;
/* TRANSLATOR Gui::ControlSingleton */
ControlSingleton* ControlSingleton::_pcSingleton = 0;
static QPointer<Gui::TaskView::TaskView> _taskPanel = 0;
ControlSingleton* ControlSingleton::_pcSingleton = nullptr;
static QPointer<Gui::TaskView::TaskView> _taskPanel = nullptr;
ControlSingleton::ControlSingleton()
: ActiveDialog(0)
: ActiveDialog(nullptr)
{
}
@@ -71,7 +71,7 @@ Gui::TaskView::TaskView* ControlSingleton::taskPanel() const
return _taskPanel;
// no task panel available
else
return 0;
return nullptr;
}
void ControlSingleton::showTaskView()
@@ -164,7 +164,7 @@ QTabWidget* ControlSingleton::tabPanel() const
// should return the pointer to combo view
if (pcComboView)
return pcComboView->getTabPanel();
return 0;
return nullptr;
}
Gui::TaskView::TaskDialog* ControlSingleton::activeDialog() const
@@ -216,7 +216,7 @@ void ControlSingleton::closeDialog()
void ControlSingleton::closedDialog()
{
ActiveDialog = 0;
ActiveDialog = nullptr;
Gui::DockWnd::ComboView* pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
// should return the pointer to combo view
@@ -256,16 +256,16 @@ bool ControlSingleton::isAllowedAlterSelection(void) const
ControlSingleton& ControlSingleton::instance(void)
{
if (_pcSingleton == NULL)
if (_pcSingleton == nullptr)
_pcSingleton = new ControlSingleton;
return *_pcSingleton;
}
void ControlSingleton::destruct (void)
{
if (_pcSingleton != NULL)
if (_pcSingleton != nullptr)
delete _pcSingleton;
_pcSingleton = 0;
_pcSingleton = nullptr;
}