aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 08:41:40 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 08:41:40 +0000
commita49047c93e91edbc35b8ba74437ad2e94ad8f5e4 (patch)
treec86bea5a8233d6ca157edb2f60dddf3e3571af13 /src/plugins/General
parentb917024aa1ac4cb0a40164132db3c6d2913157eb (diff)
downloadqmmp-a49047c93e91edbc35b8ba74437ad2e94ad8f5e4.tar.gz
qmmp-a49047c93e91edbc35b8ba74437ad2e94ad8f5e4.tar.bz2
qmmp-a49047c93e91edbc35b8ba74437ad2e94ad8f5e4.zip
fixed build with -Werror=zero-as-null-pointer-constant
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8573 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
-rw-r--r--src/plugins/General/hotkey/hotkeymanager_win.cpp2
-rw-r--r--src/plugins/General/taskbar/taskbarfactory.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp
index 5769cc48c..5dd8632f3 100644
--- a/src/plugins/General/hotkey/hotkeymanager_win.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp
@@ -65,7 +65,7 @@ static struct
{ VK_MEDIA_PREV_TRACK, 0x110, "Media Previous Track"},
{ VK_MEDIA_STOP, 0x124, "Media Stop"},
{ VK_MEDIA_PLAY_PAUSE, 0x122, "Media Play/Pause"},
-{ 0, 0, 0 }
+{ 0, 0, nullptr }
};
quint32 Hotkey::defaultKey()
diff --git a/src/plugins/General/taskbar/taskbarfactory.cpp b/src/plugins/General/taskbar/taskbarfactory.cpp
index a3ab76ce2..fcdd88f34 100644
--- a/src/plugins/General/taskbar/taskbarfactory.cpp
+++ b/src/plugins/General/taskbar/taskbarfactory.cpp
@@ -41,7 +41,7 @@ QObject *TaskbarFactory::create(QObject *parent)
QDialog *TaskbarFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void TaskbarFactory::showAbout(QWidget *parent)