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/Engines/mplayer/mplayerengine.cpp | 6 +++--- src/plugins/Engines/mplayer/mplayerenginefactory.h | 2 +- src/plugins/Engines/mplayer/settingsdialog.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/Engines/mplayer') diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index dbd01b871..4b1741b0d 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -97,7 +97,7 @@ QStringList MplayerInfo::filters() MplayerEngine::MplayerEngine(QObject *parent) : AbstractEngine(parent) { - m_source = 0; + m_source = nullptr; m_bitrate = 0; m_samplerate = 0; m_channels = 0; @@ -106,7 +106,7 @@ MplayerEngine::MplayerEngine(QObject *parent) m_currentTime = 0; m_muted = false; m_user_stop = false; - m_process = 0; + m_process = nullptr; } MplayerEngine::~MplayerEngine() @@ -297,7 +297,7 @@ void MplayerEngine::startMplayerProcess() StateHandler::instance()->dispatch(*info); delete info; m_source->deleteLater(); - m_source = 0; + m_source = nullptr; m_currentTime = 0; if(m_muted) setMuted(true); diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.h b/src/plugins/Engines/mplayer/mplayerenginefactory.h index 19d822d5e..d57081d0e 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.h +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.h @@ -31,7 +31,7 @@ Q_INTERFACES(EngineFactory) public: EngineProperties properties() const; bool supports(const QString &source) const; - AbstractEngine *create(QObject *parent = 0); + AbstractEngine *create(QObject *parent = nullptr); QList createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); diff --git a/src/plugins/Engines/mplayer/settingsdialog.h b/src/plugins/Engines/mplayer/settingsdialog.h index 4f4559e49..902e55f63 100644 --- a/src/plugins/Engines/mplayer/settingsdialog.h +++ b/src/plugins/Engines/mplayer/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); -- cgit v1.2.3-13-gbd6f