aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/hal
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/hal
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/hal')
-rw-r--r--src/plugins/General/hal/haldevice.h2
-rw-r--r--src/plugins/General/hal/halmanager.h2
-rw-r--r--src/plugins/General/hal/halplugin.cpp4
-rw-r--r--src/plugins/General/hal/halplugin.h2
-rw-r--r--src/plugins/General/hal/settingsdialog.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/General/hal/haldevice.h b/src/plugins/General/hal/haldevice.h
index 934d7f8a1..08583fe0e 100644
--- a/src/plugins/General/hal/haldevice.h
+++ b/src/plugins/General/hal/haldevice.h
@@ -46,7 +46,7 @@ class HalDevice : public QObject
{
Q_OBJECT
public:
- HalDevice(const QString &udi, QObject *parent = 0);
+ HalDevice(const QString &udi, QObject *parent = nullptr);
~HalDevice();
diff --git a/src/plugins/General/hal/halmanager.h b/src/plugins/General/hal/halmanager.h
index ef81feab9..6c2eb2b8e 100644
--- a/src/plugins/General/hal/halmanager.h
+++ b/src/plugins/General/hal/halmanager.h
@@ -32,7 +32,7 @@ class HalManager : public QObject
{
Q_OBJECT
public:
- HalManager(QObject *parent = 0);
+ HalManager(QObject *parent = nullptr);
~HalManager();
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index cd4ee96de..d3477fec9 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -210,7 +210,7 @@ QAction *HalPlugin::findAction(const QString &dev_path)
if (action->data().toString() == dev_path)
return action;
}
- return 0;
+ return nullptr;
}
HalDevice *HalPlugin::findDevice(QAction *action)
@@ -232,7 +232,7 @@ HalDevice *HalPlugin::findDevice(QAction *action)
return device;
}
}
- return 0;
+ return nullptr;
}
void HalPlugin::addPath(const QString &path)
diff --git a/src/plugins/General/hal/halplugin.h b/src/plugins/General/hal/halplugin.h
index e618a1e76..9a2169f3a 100644
--- a/src/plugins/General/hal/halplugin.h
+++ b/src/plugins/General/hal/halplugin.h
@@ -36,7 +36,7 @@ class HalPlugin : public QObject
{
Q_OBJECT
public:
- HalPlugin(QObject *parent = 0);
+ HalPlugin(QObject *parent = nullptr);
~HalPlugin();
diff --git a/src/plugins/General/hal/settingsdialog.h b/src/plugins/General/hal/settingsdialog.h
index 6bd6b602f..604483326 100644
--- a/src/plugins/General/hal/settingsdialog.h
+++ b/src/plugins/General/hal/settingsdialog.h
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();