aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/hotkey
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/General/hotkey
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/General/hotkey')
-rw-r--r--src/plugins/General/hotkey/hotkeydialog.h2
-rw-r--r--src/plugins/General/hotkey/hotkeymanager.h2
-rw-r--r--src/plugins/General/hotkey/settingsdialog.cpp2
-rw-r--r--src/plugins/General/hotkey/settingsdialog.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/General/hotkey/hotkeydialog.h b/src/plugins/General/hotkey/hotkeydialog.h
index 4124e8c8f..4bae2d01b 100644
--- a/src/plugins/General/hotkey/hotkeydialog.h
+++ b/src/plugins/General/hotkey/hotkeydialog.h
@@ -33,7 +33,7 @@ class HotkeyDialog : public QDialog
{
Q_OBJECT
public:
- HotkeyDialog(quint32 key, quint32 mod, QWidget *parent = 0);
+ HotkeyDialog(quint32 key, quint32 mod, QWidget *parent = nullptr);
~HotkeyDialog();
diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h
index ec5278982..45692cf1e 100644
--- a/src/plugins/General/hotkey/hotkeymanager.h
+++ b/src/plugins/General/hotkey/hotkeymanager.h
@@ -70,7 +70,7 @@ class HotkeyManager : public QObject, public QAbstractNativeEventFilter
{
Q_OBJECT
public:
- HotkeyManager(QObject *parent = 0);
+ HotkeyManager(QObject *parent = nullptr);
~HotkeyManager();
diff --git a/src/plugins/General/hotkey/settingsdialog.cpp b/src/plugins/General/hotkey/settingsdialog.cpp
index 2830e58ee..7a5bd612d 100644
--- a/src/plugins/General/hotkey/settingsdialog.cpp
+++ b/src/plugins/General/hotkey/settingsdialog.cpp
@@ -86,7 +86,7 @@ void SettingsDialog::accept()
void SettingsDialog::on_tableWidget_itemDoubleClicked (QTableWidgetItem *item)
{
- Hotkey *k = 0;
+ Hotkey *k = nullptr;
foreach(k, m_hotkeys)
{
if (k->action == item->type())
diff --git a/src/plugins/General/hotkey/settingsdialog.h b/src/plugins/General/hotkey/settingsdialog.h
index e1fde23ec..da947e681 100644
--- a/src/plugins/General/hotkey/settingsdialog.h
+++ b/src/plugins/General/hotkey/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();