aboutsummaryrefslogtreecommitdiff
path: root/src/app
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/app
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/app')
-rw-r--r--src/app/builtincommandlineoption.cpp4
-rw-r--r--src/app/builtincommandlineoption.h2
-rw-r--r--src/app/qmmpstarter.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp
index 919ab6df4..e52abfa84 100644
--- a/src/app/builtincommandlineoption.cpp
+++ b/src/app/builtincommandlineoption.cpp
@@ -33,7 +33,7 @@
BuiltinCommandLineOption::BuiltinCommandLineOption(QObject *parent) : QObject(parent)
{
- m_model = 0;
+ m_model = nullptr;
m_options << "--enqueue" << "-e"
<< "--play" << "-p"
<< "--pause" << "-u"
@@ -253,7 +253,7 @@ void BuiltinCommandLineOption::disconnectPl()
disconnect(m_model, SIGNAL(trackAdded(PlayListTrack*)), MediaPlayer::instance(), SLOT(play()));
disconnect(m_model, SIGNAL(trackAdded(PlayListTrack*)), this, SLOT(disconnectPl()));
disconnect(m_model, SIGNAL(loaderFinished()), this, SLOT(disconnectPl()));
- m_model = 0;
+ m_model = nullptr;
}
}
diff --git a/src/app/builtincommandlineoption.h b/src/app/builtincommandlineoption.h
index 9121ebf76..370c57890 100644
--- a/src/app/builtincommandlineoption.h
+++ b/src/app/builtincommandlineoption.h
@@ -38,7 +38,7 @@ class BuiltinCommandLineOption : public QObject
{
Q_OBJECT
public:
- BuiltinCommandLineOption(QObject *parent = 0);
+ BuiltinCommandLineOption(QObject *parent = nullptr);
~BuiltinCommandLineOption();
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index bb47791af..291a6db7a 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -57,9 +57,9 @@ using namespace std;
QMMPStarter::QMMPStarter() : QObject()
{
- m_player = 0;
- m_core = 0;
- m_ui = 0;
+ m_player = nullptr;
+ m_core = nullptr;
+ m_ui = nullptr;
m_finished = false;
m_exit_code = EXIT_SUCCESS;
#ifndef QT_NO_SESSIONMANAGER