aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/skinned/mainvisual.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
commitb917024aa1ac4cb0a40164132db3c6d2913157eb (patch)
tree4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Ui/skinned/mainvisual.cpp
parentbef5a901922c002815d047d276e61ec0bf8c0f46 (diff)
downloadqmmp-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/Ui/skinned/mainvisual.cpp')
-rw-r--r--src/plugins/Ui/skinned/mainvisual.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp
index 4b71c660f..05b2855c9 100644
--- a/src/plugins/Ui/skinned/mainvisual.cpp
+++ b/src/plugins/Ui/skinned/mainvisual.cpp
@@ -31,7 +31,7 @@
#include "inlines.h"
#include "mainvisual.h"
-MainVisual *MainVisual::m_instance = 0;
+MainVisual *MainVisual::m_instance = nullptr;
MainVisual *MainVisual::instance()
{
@@ -40,7 +40,7 @@ MainVisual *MainVisual::instance()
return m_instance;
}
-MainVisual::MainVisual (QWidget *parent) : Visual (parent), m_vis (0)
+MainVisual::MainVisual (QWidget *parent) : Visual (parent), m_vis (nullptr)
{
m_skin = Skin::instance();
m_ratio = m_skin->ratio();
@@ -60,9 +60,9 @@ MainVisual::~MainVisual()
if (m_vis)
{
delete m_vis;
- m_vis = 0;
+ m_vis = nullptr;
}
- m_instance = 0;
+ m_instance = nullptr;
}
void MainVisual::setVisual (VisualBase *newvis)
@@ -129,7 +129,7 @@ void MainVisual::mousePressEvent (QMouseEvent *e)
else if (m_vis->name() == "Analyzer")
setVisual(new mainvisual::Scope);
else if (m_vis->name() == "Scope")
- setVisual(0);
+ setVisual(nullptr);
QString str = m_vis ? m_vis->name() : "Off";
foreach(QAction *act, m_visModeGroup->actions ())
@@ -358,7 +358,7 @@ void MainVisual::readSettings()
else if (vis_name == "Scope")
setVisual(new mainvisual::Scope);
else
- setVisual(0);
+ setVisual(nullptr);
resize(76 * m_ratio, 16 * m_ratio);
update();
}
@@ -395,7 +395,7 @@ void Analyzer::clear()
bool Analyzer::process (float *l)
{
- static fft_state *state = 0;
+ static fft_state *state = nullptr;
if (!state)
state = fft_init();
short dest[256];