aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/qsui/actionmanager.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
commitb917024aa1ac4cb0a40164132db3c6d2913157eb (patch)
tree4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Ui/qsui/actionmanager.cpp
parentbef5a901922c002815d047d276e61ec0bf8c0f46 (diff)
downloadqmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.gz
qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.bz2
qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.zip
fixed build with -Werror=zero-as-null-pointer-constant
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8572 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui/qsui/actionmanager.cpp')
-rw-r--r--src/plugins/Ui/qsui/actionmanager.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp
index c3ae20fc5..03d900624 100644
--- a/src/plugins/Ui/qsui/actionmanager.cpp
+++ b/src/plugins/Ui/qsui/actionmanager.cpp
@@ -28,7 +28,7 @@
#include <qmmp/qmmp.h>
#include "actionmanager.h"
-ActionManager *ActionManager::m_instance = 0;
+ActionManager *ActionManager::m_instance = nullptr;
ActionManager::ActionManager(QObject *parent) :
QObject(parent)
@@ -59,10 +59,10 @@ ActionManager::ActionManager(QObject *parent) :
//view
m_actions[WM_ALLWAYS_ON_TOP] = createAction2(tr("Always on Top"), "always_on_top", "");
m_actions[WM_STICKY] = createAction2(tr("Put on All Workspaces"), "sticky", "");
- m_actions[UI_ANALYZER] = 0; //external action
- m_actions[UI_FILEBROWSER] = 0; //external action
- m_actions[UI_COVER] = 0; //external action
- m_actions[UI_PLAYLISTBROWSER] = 0; //external action
+ m_actions[UI_ANALYZER] = nullptr; //external action
+ m_actions[UI_FILEBROWSER] = nullptr; //external action
+ m_actions[UI_COVER] = nullptr; //external action
+ m_actions[UI_PLAYLISTBROWSER] = nullptr; //external action
m_actions[UI_SHOW_TABS] = createAction2(tr("Show Tabs"), "show_tabs", "");
m_actions[UI_SHOW_TITLEBARS] = createAction2(tr("Show Title Bars"), "show_titlebars", "");
m_actions[UI_BLOCK_TOOLBARS] = createAction2(tr("Block Toolbars"), "block_toolbars", "");
@@ -112,14 +112,14 @@ ActionManager::ActionManager(QObject *parent) :
m_settings->endGroup();
readStates();
delete m_settings;
- m_settings = 0;
+ m_settings = nullptr;
m_actions[ABOUT]->setIcon(qApp->windowIcon());
}
ActionManager::~ActionManager()
{
saveStates();
- m_instance = 0;
+ m_instance = nullptr;
}
QAction *ActionManager::action(int type)