From b917024aa1ac4cb0a40164132db3c6d2913157eb Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 3 Jan 2019 07:41:04 +0000 Subject: 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 --- src/plugins/Ui/skinned/actionmanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/Ui/skinned/actionmanager.cpp') 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 #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) -- cgit v1.2.3-13-gbd6f