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/Ui/skinned/skin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/Ui/skinned/skin.cpp') diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp index fa38278fe..cc619a7bc 100644 --- a/src/plugins/Ui/skinned/skin.cpp +++ b/src/plugins/Ui/skinned/skin.cpp @@ -37,7 +37,7 @@ #include "skin.h" #include "cursorimage.h" -Skin *Skin::m_instance = 0; +Skin *Skin::m_instance = nullptr; Skin *Skin::instance() { @@ -858,7 +858,7 @@ QPixmap * Skin::getDummyPixmap(const QString &name, const QString &fallback) } qFatal("Skin: default skin is corrupted"); - return 0; + return nullptr; } QPixmap Skin::scalePixmap(const QPixmap &pix, int ratio) -- cgit v1.2.3-13-gbd6f