From ca9b4dff3f04567ac5c1f954cec5ff7bbb32f48c Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 5 Jan 2019 17:55:13 +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@8586 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp | 2 +- src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp index 7de68b081..b6b534051 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp +++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp @@ -29,7 +29,7 @@ #include -OutputQtMultimedia::OutputQtMultimedia() : Output(), m_buffer(NULL), m_bytes_per_second(0) +OutputQtMultimedia::OutputQtMultimedia() : Output(), m_buffer(nullptr), m_bytes_per_second(0) { } diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp index 6bf8676a1..d2b26058d 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp @@ -43,7 +43,7 @@ Output* OutputQtMultimediaFactory::create() Volume *OutputQtMultimediaFactory::createVolume() { - return 0; + return nullptr; } void OutputQtMultimediaFactory::showSettings(QWidget* parent) -- cgit v1.2.3-13-gbd6f