diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
| commit | b917024aa1ac4cb0a40164132db3c6d2913157eb (patch) | |
| tree | 4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Visual | |
| parent | bef5a901922c002815d047d276e61ec0bf8c0f46 (diff) | |
| download | qmmp-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/Visual')
| -rw-r--r-- | src/plugins/Visual/analyzer/analyzer.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Visual/analyzer/analyzer.h | 2 | ||||
| -rw-r--r-- | src/plugins/Visual/analyzer/colorwidget.h | 2 | ||||
| -rw-r--r-- | src/plugins/Visual/analyzer/settingsdialog.h | 2 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/projectmplugin.h | 2 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/projectmwidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/projectmwidget.h | 2 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/projectmwrapper.h | 4 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/visualprojectmfactory.cpp | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp index 5a409142b..e8ccf7ccb 100644 --- a/src/plugins/Visual/analyzer/analyzer.cpp +++ b/src/plugins/Visual/analyzer/analyzer.cpp @@ -33,9 +33,9 @@ Analyzer::Analyzer (QWidget *parent) : Visual (parent) { - m_intern_vis_data = 0; - m_peaks = 0; - m_x_scale = 0; + m_intern_vis_data = nullptr; + m_peaks = nullptr; + m_x_scale = nullptr; m_rows = 0; m_cols = 0; m_update = false; @@ -202,7 +202,7 @@ void Analyzer::mousePressEvent(QMouseEvent *e) void Analyzer::process() { - static fft_state *state = 0; + static fft_state *state = nullptr; if (!state) state = fft_init(); diff --git a/src/plugins/Visual/analyzer/analyzer.h b/src/plugins/Visual/analyzer/analyzer.h index c44e99aee..df090de8b 100644 --- a/src/plugins/Visual/analyzer/analyzer.h +++ b/src/plugins/Visual/analyzer/analyzer.h @@ -37,7 +37,7 @@ class Analyzer : public Visual Q_OBJECT public: - Analyzer( QWidget *parent = 0); + Analyzer( QWidget *parent = nullptr); virtual ~Analyzer(); public slots: diff --git a/src/plugins/Visual/analyzer/colorwidget.h b/src/plugins/Visual/analyzer/colorwidget.h index 86d915a09..1f8049ef5 100644 --- a/src/plugins/Visual/analyzer/colorwidget.h +++ b/src/plugins/Visual/analyzer/colorwidget.h @@ -30,7 +30,7 @@ class ColorWidget : public QFrame { Q_OBJECT public: - ColorWidget(QWidget *parent = 0); + ColorWidget(QWidget *parent = nullptr); ~ColorWidget(); diff --git a/src/plugins/Visual/analyzer/settingsdialog.h b/src/plugins/Visual/analyzer/settingsdialog.h index 1ad4e632e..dd2df6cd7 100644 --- a/src/plugins/Visual/analyzer/settingsdialog.h +++ b/src/plugins/Visual/analyzer/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Visual/projectm/projectmplugin.h b/src/plugins/Visual/projectm/projectmplugin.h index 76847a72d..84800f7ca 100644 --- a/src/plugins/Visual/projectm/projectmplugin.h +++ b/src/plugins/Visual/projectm/projectmplugin.h @@ -33,7 +33,7 @@ class ProjectMPlugin : public Visual { Q_OBJECT public: - ProjectMPlugin(QWidget *parent = 0); + ProjectMPlugin(QWidget *parent = nullptr); virtual ~ProjectMPlugin(); public slots: diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp index 95c2ea61d..2f5a87dd6 100644 --- a/src/plugins/Visual/projectm/projectmwidget.cpp +++ b/src/plugins/Visual/projectm/projectmwidget.cpp @@ -42,7 +42,7 @@ ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent) { setMouseTracking(true); m_listWidget = listWidget; - m_projectM = 0; + m_projectM = nullptr; m_menu = new QMenu(this); connect(SoundCore::instance(), SIGNAL(trackInfoChanged()), SLOT(updateTitle())); createActions(); diff --git a/src/plugins/Visual/projectm/projectmwidget.h b/src/plugins/Visual/projectm/projectmwidget.h index 561aa1658..596180e84 100644 --- a/src/plugins/Visual/projectm/projectmwidget.h +++ b/src/plugins/Visual/projectm/projectmwidget.h @@ -35,7 +35,7 @@ class ProjectMWidget : public QOpenGLWidget { Q_OBJECT public: - ProjectMWidget(QListWidget *listWidget, QWidget *parent = 0); + ProjectMWidget(QListWidget *listWidget, QWidget *parent = nullptr); ~ProjectMWidget(); diff --git a/src/plugins/Visual/projectm/projectmwrapper.h b/src/plugins/Visual/projectm/projectmwrapper.h index 530ee0fee..95f76f5ea 100644 --- a/src/plugins/Visual/projectm/projectmwrapper.h +++ b/src/plugins/Visual/projectm/projectmwrapper.h @@ -28,8 +28,8 @@ class ProjectMWrapper : public QObject, public projectM { Q_OBJECT public: - explicit ProjectMWrapper(std::string config_file, int flags, QObject *parent = 0); - explicit ProjectMWrapper(Settings settings, int flags, QObject *parent = 0); + explicit ProjectMWrapper(std::string config_file, int flags, QObject *parent = nullptr); + explicit ProjectMWrapper(Settings settings, int flags, QObject *parent = nullptr); virtual ~ProjectMWrapper(); diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp index 60698c067..e0f092c94 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp +++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp @@ -41,7 +41,7 @@ Visual *VisualProjectMFactory::create(QWidget *parent) QDialog *VisualProjectMFactory::createConfigDialog(QWidget *parent) { Q_UNUSED(parent); - return 0; + return nullptr; } void VisualProjectMFactory::showAbout(QWidget *parent) |
