diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
| commit | b917024aa1ac4cb0a40164132db3c6d2913157eb (patch) | |
| tree | 4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Transports/mms | |
| parent | bef5a901922c002815d047d276e61ec0bf8c0f46 (diff) | |
| download | qmmp-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/Transports/mms')
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputfactory.h | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputsource.h | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsstreamreader.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/settingsdialog.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h index d9f083262..da9698eb6 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.h +++ b/src/plugins/Transports/mms/mmsinputfactory.h @@ -35,7 +35,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0") Q_INTERFACES(InputSourceFactory) public: InputSourceProperties properties() const; - InputSource *create(const QString &url, QObject *parent = 0); + InputSource *create(const QString &url, QObject *parent = nullptr); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h index c7105a6c5..d125a2c45 100644 --- a/src/plugins/Transports/mms/mmsinputsource.h +++ b/src/plugins/Transports/mms/mmsinputsource.h @@ -32,7 +32,7 @@ class MMSInputSource : public InputSource { Q_OBJECT public: - MMSInputSource(const QString &path, QObject *parent = 0); + MMSInputSource(const QString &path, QObject *parent = nullptr); QIODevice *ioDevice(); bool initialize(); diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp index 73bb1bdbb..1acbbdb4c 100644 --- a/src/plugins/Transports/mms/mmsstreamreader.cpp +++ b/src/plugins/Transports/mms/mmsstreamreader.cpp @@ -31,7 +31,7 @@ MMSStreamReader::MMSStreamReader(const QString &url, MMSInputSource *parent) : Q { m_parent = parent; m_url = url; - m_handle = 0; + m_handle = nullptr; m_aborted = false; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_prebuf_size = settings.value("MMS/buffer_size",384).toInt() * 1024; @@ -47,7 +47,7 @@ MMSStreamReader::~MMSStreamReader() qDebug("%s", Q_FUNC_INFO); abort(); free(m_buffer); - m_buffer = 0; + m_buffer = nullptr; m_buffer_at = 0; m_buffer_size = 0; } @@ -128,7 +128,7 @@ void MMSStreamReader::abort() m_ready = false; if (m_handle) mmsx_close(m_handle); - m_handle = 0; + m_handle = nullptr; } qint64 MMSStreamReader::bytesAvailable() const @@ -140,7 +140,7 @@ void MMSStreamReader::run() { int to_read = 1024; char prebuf[to_read]; - m_handle = mmsx_connect (0, 0, m_url.toLocal8Bit().constData(), 128 * 1024); + m_handle = mmsx_connect (nullptr, nullptr, m_url.toLocal8Bit().constData(), 128 * 1024); if(!m_handle) { qWarning("MMSStreamReader: connection failed"); @@ -168,7 +168,7 @@ void MMSStreamReader::run() m_buffer = (char *)realloc(m_buffer, m_buffer_size); } m_mutex.unlock(); - len = mmsx_read (0, m_handle, prebuf, to_read); + len = mmsx_read (nullptr, m_handle, prebuf, to_read); m_mutex.lock(); if(len < 0) { diff --git a/src/plugins/Transports/mms/settingsdialog.h b/src/plugins/Transports/mms/settingsdialog.h index cbf94c84d..8d109b132 100644 --- a/src/plugins/Transports/mms/settingsdialog.h +++ b/src/plugins/Transports/mms/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); |
