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/General/lyrics/lyrics.h | 2 +- src/plugins/General/lyrics/lyricsfactory.cpp | 2 +- src/plugins/General/lyrics/lyricswindow.cpp | 6 +++--- src/plugins/General/lyrics/lyricswindow.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/General/lyrics') diff --git a/src/plugins/General/lyrics/lyrics.h b/src/plugins/General/lyrics/lyrics.h index 663fe4af5..16523a30e 100644 --- a/src/plugins/General/lyrics/lyrics.h +++ b/src/plugins/General/lyrics/lyrics.h @@ -37,7 +37,7 @@ class Lyrics : public QObject { Q_OBJECT public: - Lyrics(QObject *parent = 0); + Lyrics(QObject *parent = nullptr); ~Lyrics(); diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp index 1b5cac3e2..aef4322f9 100644 --- a/src/plugins/General/lyrics/lyricsfactory.cpp +++ b/src/plugins/General/lyrics/lyricsfactory.cpp @@ -42,7 +42,7 @@ QObject *LyricsFactory::create(QObject *parent) QDialog *LyricsFactory::createConfigDialog(QWidget *parent) { Q_UNUSED(parent); - return 0; + return nullptr; } void LyricsFactory::showAbout(QWidget *parent) diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index 39626c1ec..fa26ca049 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -37,7 +37,7 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget setWindowFlags(Qt::Dialog); setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_QuitOnClose, false); - m_requestReply = 0; + m_requestReply = nullptr; m_cachePath = Qmmp::configDir() + "/lyrics/"; m_ui.artistLineEdit->setText(artist); m_ui.titleLineEdit->setText(title); @@ -78,7 +78,7 @@ void LyricsWindow::showText(QNetworkReply *reply) { m_ui.stateLabel->setText(tr("Error")); m_ui.textBrowser->setText(reply->errorString()); - m_requestReply = 0; + m_requestReply = nullptr; reply->deleteLater(); return; } @@ -87,7 +87,7 @@ void LyricsWindow::showText(QNetworkReply *reply) if(m_requestReply == reply) { - m_requestReply = 0; + m_requestReply = nullptr; reply->deleteLater(); QRegExp artist_regexp("(.*)"); artist_regexp.setMinimal(true); diff --git a/src/plugins/General/lyrics/lyricswindow.h b/src/plugins/General/lyrics/lyricswindow.h index 7ccec881f..564fb5a10 100644 --- a/src/plugins/General/lyrics/lyricswindow.h +++ b/src/plugins/General/lyrics/lyricswindow.h @@ -34,7 +34,7 @@ class LyricsWindow : public QWidget { Q_OBJECT public: - LyricsWindow(const QString &artist, const QString &title, QWidget *parent = 0); + LyricsWindow(const QString &artist, const QString &title, QWidget *parent = nullptr); ~LyricsWindow(); -- cgit v1.2.3-13-gbd6f