aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/wildmidi
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/Input/wildmidi
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/Input/wildmidi')
-rw-r--r--src/plugins/Input/wildmidi/decoder_wildmidi.cpp2
-rw-r--r--src/plugins/Input/wildmidi/decoderwildmidifactory.cpp2
-rw-r--r--src/plugins/Input/wildmidi/settingsdialog.h2
-rw-r--r--src/plugins/Input/wildmidi/wildmidihelper.cpp4
-rw-r--r--src/plugins/Input/wildmidi/wildmidihelper.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
index 198175d4c..f3c2e459c 100644
--- a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
+++ b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
@@ -26,7 +26,7 @@
DecoderWildMidi::DecoderWildMidi(const QString &path) : Decoder()
{
m_path = path;
- midi_ptr = 0;
+ midi_ptr = nullptr;
m_sample_rate = 0;
}
diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
index c57d14c49..540846af5 100644
--- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
+++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
@@ -92,7 +92,7 @@ MetaDataModel* DecoderWildMidiFactory::createMetaDataModel(const QString &path,
{
Q_UNUSED(path);
Q_UNUSED(readOnly);
- return 0;
+ return nullptr;
}
void DecoderWildMidiFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/wildmidi/settingsdialog.h b/src/plugins/Input/wildmidi/settingsdialog.h
index 2b706f1f3..d190ebe7d 100644
--- a/src/plugins/Input/wildmidi/settingsdialog.h
+++ b/src/plugins/Input/wildmidi/settingsdialog.h
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp
index 612e544f7..812930561 100644
--- a/src/plugins/Input/wildmidi/wildmidihelper.cpp
+++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp
@@ -26,7 +26,7 @@ extern "C"{
#include <qmmp/qmmp.h>
#include "wildmidihelper.h"
-WildMidiHelper *WildMidiHelper::m_instance = 0;
+WildMidiHelper *WildMidiHelper::m_instance = nullptr;
WildMidiHelper::WildMidiHelper(QObject *parent) :
QObject(parent)
@@ -40,7 +40,7 @@ WildMidiHelper::~WildMidiHelper()
{
if(m_inited)
WildMidi_Shutdown();
- m_instance = 0;
+ m_instance = nullptr;
}
bool WildMidiHelper::initialize()
diff --git a/src/plugins/Input/wildmidi/wildmidihelper.h b/src/plugins/Input/wildmidi/wildmidihelper.h
index 9c4141ecd..7d50775c7 100644
--- a/src/plugins/Input/wildmidi/wildmidihelper.h
+++ b/src/plugins/Input/wildmidi/wildmidihelper.h
@@ -29,7 +29,7 @@ class WildMidiHelper : public QObject
{
Q_OBJECT
public:
- explicit WildMidiHelper(QObject *parent = 0);
+ explicit WildMidiHelper(QObject *parent = nullptr);
~WildMidiHelper();
bool initialize();
void readSettings();