aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/skinned/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/skinned/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/skinned/actionmanager.cpp')
-rw-r--r--src/plugins/Ui/skinned/actionmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp
index b88206aba..02158089c 100644
--- a/src/plugins/Ui/skinned/actionmanager.cpp
+++ b/src/plugins/Ui/skinned/actionmanager.cpp
@@ -26,7 +26,7 @@
#include <qmmp/qmmp.h>
#include "actionmanager.h"
-ActionManager *ActionManager::m_instance = 0;
+ActionManager *ActionManager::m_instance = nullptr;
ActionManager::ActionManager(QObject *parent) :
QObject(parent)
@@ -104,14 +104,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)