aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/converter
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/converter
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/converter')
-rw-r--r--src/plugins/General/converter/converter.cpp10
-rw-r--r--src/plugins/General/converter/converter.h2
-rw-r--r--src/plugins/General/converter/converterdialog.h2
-rw-r--r--src/plugins/General/converter/converterfactory.cpp2
-rw-r--r--src/plugins/General/converter/converterhelper.h2
-rw-r--r--src/plugins/General/converter/preseteditor.h2
6 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp
index d5e39c8a0..b4e693211 100644
--- a/src/plugins/General/converter/converter.cpp
+++ b/src/plugins/General/converter/converter.cpp
@@ -36,8 +36,8 @@
Converter::Converter(QObject *parent) : QObject(parent), QRunnable()
{
m_user_stop = false;
- m_decoder = 0;
- m_input = 0;
+ m_decoder = nullptr;
+ m_input = nullptr;
m_row = -1;
}
@@ -47,12 +47,12 @@ Converter::~Converter()
if(m_decoder)
{
delete m_decoder;
- m_decoder = 0;
+ m_decoder = nullptr;
}
if(m_input)
{
delete m_input;
- m_input = 0;
+ m_input = nullptr;
}
}
@@ -78,7 +78,7 @@ bool Converter::prepare(const QString &url, int row, const QVariantMap &preset)
}
}
- DecoderFactory *factory = 0;
+ DecoderFactory *factory = nullptr;
if(!source->path().contains("://"))
factory = Decoder::findByFilePath(source->path());
diff --git a/src/plugins/General/converter/converter.h b/src/plugins/General/converter/converter.h
index 94571f11b..f35a4251c 100644
--- a/src/plugins/General/converter/converter.h
+++ b/src/plugins/General/converter/converter.h
@@ -38,7 +38,7 @@ class Converter : public QObject, public QRunnable
{
Q_OBJECT
public:
- explicit Converter(QObject *parent = 0);
+ explicit Converter(QObject *parent = nullptr);
virtual ~Converter();
bool prepare(const QString &url, int row, const QVariantMap &preset);
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index edde11558..6bc6f066e 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -37,7 +37,7 @@ class ConverterDialog : public QDialog
{
Q_OBJECT
public:
- explicit ConverterDialog(QList <PlayListTrack *> items, QWidget *parent = 0);
+ explicit ConverterDialog(QList <PlayListTrack *> items, QWidget *parent = nullptr);
virtual ~ConverterDialog();
public slots:
diff --git a/src/plugins/General/converter/converterfactory.cpp b/src/plugins/General/converter/converterfactory.cpp
index c48deae30..dc37f53e8 100644
--- a/src/plugins/General/converter/converterfactory.cpp
+++ b/src/plugins/General/converter/converterfactory.cpp
@@ -41,7 +41,7 @@ QObject *ConverterFactory::create(QObject *parent)
QDialog *ConverterFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void ConverterFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/converter/converterhelper.h b/src/plugins/General/converter/converterhelper.h
index a75ad6426..a9f3c5fcd 100644
--- a/src/plugins/General/converter/converterhelper.h
+++ b/src/plugins/General/converter/converterhelper.h
@@ -33,7 +33,7 @@ class ConverterHelper : public QObject
{
Q_OBJECT
public:
- ConverterHelper(QObject *parent = 0);
+ ConverterHelper(QObject *parent = nullptr);
~ConverterHelper();
diff --git a/src/plugins/General/converter/preseteditor.h b/src/plugins/General/converter/preseteditor.h
index c9dabc8f7..98786747c 100644
--- a/src/plugins/General/converter/preseteditor.h
+++ b/src/plugins/General/converter/preseteditor.h
@@ -36,7 +36,7 @@ class PresetEditor : public QDialog
Q_OBJECT
public:
- explicit PresetEditor(const QVariantMap &data, QWidget *parent = 0);
+ explicit PresetEditor(const QVariantMap &data, QWidget *parent = nullptr);
virtual ~PresetEditor();
const QVariantMap data() const;