aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/qtmultimedia
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-05 17:55:13 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-05 17:55:13 +0000
commitca9b4dff3f04567ac5c1f954cec5ff7bbb32f48c (patch)
tree634c09771ae839349907a04733464f0df977d11c /src/plugins/Output/qtmultimedia
parent5ab256d56a484d4b67e961ed21da93091e620d9a (diff)
downloadqmmp-ca9b4dff3f04567ac5c1f954cec5ff7bbb32f48c.tar.gz
qmmp-ca9b4dff3f04567ac5c1f954cec5ff7bbb32f48c.tar.bz2
qmmp-ca9b4dff3f04567ac5c1f954cec5ff7bbb32f48c.zip
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
Diffstat (limited to 'src/plugins/Output/qtmultimedia')
-rw-r--r--src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp2
-rw-r--r--src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp2
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 <unistd.h>
-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)