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/General/rgscan | |
| 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/General/rgscan')
| -rw-r--r-- | src/plugins/General/rgscan/rgscandialog.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/rgscan/rgscandialog.h | 2 | ||||
| -rw-r--r-- | src/plugins/General/rgscan/rgscanfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/rgscan/rgscanhelper.h | 2 | ||||
| -rw-r--r-- | src/plugins/General/rgscan/rgscanner.cpp | 14 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp index c2814b60c..0818ee26d 100644 --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.cpp @@ -270,7 +270,7 @@ RGScanner *RGScanDialog::findScannerByUrl(const QString &url) if(scanner->url() == url) return scanner; } - return 0; + return nullptr; } QString RGScanDialog::getAlbumName(const QString &url) diff --git a/src/plugins/General/rgscan/rgscandialog.h b/src/plugins/General/rgscan/rgscandialog.h index 18dcda9ad..22f5e457b 100644 --- a/src/plugins/General/rgscan/rgscandialog.h +++ b/src/plugins/General/rgscan/rgscandialog.h @@ -61,7 +61,7 @@ class RGScanDialog : public QDialog { Q_OBJECT public: - explicit RGScanDialog(QList <PlayListTrack *> tracks, QWidget *parent = 0); + explicit RGScanDialog(QList <PlayListTrack *> tracks, QWidget *parent = nullptr); virtual ~RGScanDialog(); private slots: diff --git a/src/plugins/General/rgscan/rgscanfactory.cpp b/src/plugins/General/rgscan/rgscanfactory.cpp index 9e68e89a9..18998ac2c 100644 --- a/src/plugins/General/rgscan/rgscanfactory.cpp +++ b/src/plugins/General/rgscan/rgscanfactory.cpp @@ -41,7 +41,7 @@ QObject *RGScanFactory::create(QObject *parent) QDialog *RGScanFactory::createConfigDialog(QWidget *parent) { Q_UNUSED(parent); - return 0; + return nullptr; } void RGScanFactory::showAbout(QWidget *parent) diff --git a/src/plugins/General/rgscan/rgscanhelper.h b/src/plugins/General/rgscan/rgscanhelper.h index bc67a700b..e68f857a0 100644 --- a/src/plugins/General/rgscan/rgscanhelper.h +++ b/src/plugins/General/rgscan/rgscanhelper.h @@ -33,7 +33,7 @@ class RGScanHelper : public QObject { Q_OBJECT public: - RGScanHelper(QObject *parent = 0); + RGScanHelper(QObject *parent = nullptr); ~RGScanHelper(); private slots: diff --git a/src/plugins/General/rgscan/rgscanner.cpp b/src/plugins/General/rgscan/rgscanner.cpp index e1311bd97..13ff79cdf 100644 --- a/src/plugins/General/rgscan/rgscanner.cpp +++ b/src/plugins/General/rgscan/rgscanner.cpp @@ -35,9 +35,9 @@ RGScanner::RGScanner() m_is_running = false; m_is_pending = false; m_has_values = false; - m_handle = 0; - m_decoder = 0; - m_source = 0; + m_handle = nullptr; + m_decoder = nullptr; + m_source = nullptr; } RGScanner::~RGScanner() @@ -47,7 +47,7 @@ RGScanner::~RGScanner() if(m_handle) { DeinitGainAnalysis(m_handle); - m_handle = 0; + m_handle = nullptr; } } @@ -57,7 +57,7 @@ bool RGScanner::prepare(const QString &url) deinit(); m_url = url; QString name = m_url.section("/", -1); - InputSource *source = InputSource::create(url, 0); + InputSource *source = InputSource::create(url, nullptr); if(!source->initialize()) { delete source; @@ -273,11 +273,11 @@ void RGScanner::deinit() if(m_decoder) { delete m_decoder; - m_decoder = 0; + m_decoder = nullptr; } if(m_source) { delete m_source; - m_source = 0; + m_source = nullptr; } } |
