aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/qsui
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/qsui
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/qsui')
-rw-r--r--src/plugins/Ui/qsui/aboutqsuidialog.h2
-rw-r--r--src/plugins/Ui/qsui/actionmanager.cpp14
-rw-r--r--src/plugins/Ui/qsui/actionmanager.h2
-rw-r--r--src/plugins/Ui/qsui/colorwidget.h2
-rw-r--r--src/plugins/Ui/qsui/coverwidget.h2
-rw-r--r--src/plugins/Ui/qsui/elidinglabel.h4
-rw-r--r--src/plugins/Ui/qsui/equalizer.h2
-rw-r--r--src/plugins/Ui/qsui/filesystembrowser.h2
-rw-r--r--src/plugins/Ui/qsui/hotkeyeditor.h2
-rw-r--r--src/plugins/Ui/qsui/keyboardmanager.cpp2
-rw-r--r--src/plugins/Ui/qsui/keyboardmanager.h2
-rw-r--r--src/plugins/Ui/qsui/listwidget.cpp16
-rw-r--r--src/plugins/Ui/qsui/listwidget.h2
-rw-r--r--src/plugins/Ui/qsui/listwidgetdrawer.cpp8
-rw-r--r--src/plugins/Ui/qsui/logo.h2
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp14
-rw-r--r--src/plugins/Ui/qsui/mainwindow.h2
-rw-r--r--src/plugins/Ui/qsui/playlistbrowser.h2
-rw-r--r--src/plugins/Ui/qsui/playlistheader.cpp6
-rw-r--r--src/plugins/Ui/qsui/playlistheader.h2
-rw-r--r--src/plugins/Ui/qsui/popupsettings.h2
-rw-r--r--src/plugins/Ui/qsui/popupwidget.h2
-rw-r--r--src/plugins/Ui/qsui/positionslider.h2
-rw-r--r--src/plugins/Ui/qsui/qsuianalyzer.cpp6
-rw-r--r--src/plugins/Ui/qsui/qsuianalyzer.h2
-rw-r--r--src/plugins/Ui/qsui/qsuiquicksearch.h2
-rw-r--r--src/plugins/Ui/qsui/qsuisettings.h2
-rw-r--r--src/plugins/Ui/qsui/qsuitabbar.h2
-rw-r--r--src/plugins/Ui/qsui/qsuitabwidget.cpp12
-rw-r--r--src/plugins/Ui/qsui/qsuitabwidget.h2
-rw-r--r--src/plugins/Ui/qsui/shortcutdialog.h2
-rw-r--r--src/plugins/Ui/qsui/visualmenu.cpp2
-rw-r--r--src/plugins/Ui/qsui/visualmenu.h4
-rw-r--r--src/plugins/Ui/qsui/volumeslider.h2
34 files changed, 67 insertions, 67 deletions
diff --git a/src/plugins/Ui/qsui/aboutqsuidialog.h b/src/plugins/Ui/qsui/aboutqsuidialog.h
index a93e894a3..192ce37b1 100644
--- a/src/plugins/Ui/qsui/aboutqsuidialog.h
+++ b/src/plugins/Ui/qsui/aboutqsuidialog.h
@@ -31,7 +31,7 @@ class AboutQSUIDialog : public QDialog
{
Q_OBJECT
public:
- explicit AboutQSUIDialog(QWidget *parent = 0);
+ explicit AboutQSUIDialog(QWidget *parent = nullptr);
virtual ~AboutQSUIDialog();
private:
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp
index c3ae20fc5..03d900624 100644
--- a/src/plugins/Ui/qsui/actionmanager.cpp
+++ b/src/plugins/Ui/qsui/actionmanager.cpp
@@ -28,7 +28,7 @@
#include <qmmp/qmmp.h>
#include "actionmanager.h"
-ActionManager *ActionManager::m_instance = 0;
+ActionManager *ActionManager::m_instance = nullptr;
ActionManager::ActionManager(QObject *parent) :
QObject(parent)
@@ -59,10 +59,10 @@ ActionManager::ActionManager(QObject *parent) :
//view
m_actions[WM_ALLWAYS_ON_TOP] = createAction2(tr("Always on Top"), "always_on_top", "");
m_actions[WM_STICKY] = createAction2(tr("Put on All Workspaces"), "sticky", "");
- m_actions[UI_ANALYZER] = 0; //external action
- m_actions[UI_FILEBROWSER] = 0; //external action
- m_actions[UI_COVER] = 0; //external action
- m_actions[UI_PLAYLISTBROWSER] = 0; //external action
+ m_actions[UI_ANALYZER] = nullptr; //external action
+ m_actions[UI_FILEBROWSER] = nullptr; //external action
+ m_actions[UI_COVER] = nullptr; //external action
+ m_actions[UI_PLAYLISTBROWSER] = nullptr; //external action
m_actions[UI_SHOW_TABS] = createAction2(tr("Show Tabs"), "show_tabs", "");
m_actions[UI_SHOW_TITLEBARS] = createAction2(tr("Show Title Bars"), "show_titlebars", "");
m_actions[UI_BLOCK_TOOLBARS] = createAction2(tr("Block Toolbars"), "block_toolbars", "");
@@ -112,14 +112,14 @@ ActionManager::ActionManager(QObject *parent) :
m_settings->endGroup();
readStates();
delete m_settings;
- m_settings = 0;
+ m_settings = nullptr;
m_actions[ABOUT]->setIcon(qApp->windowIcon());
}
ActionManager::~ActionManager()
{
saveStates();
- m_instance = 0;
+ m_instance = nullptr;
}
QAction *ActionManager::action(int type)
diff --git a/src/plugins/Ui/qsui/actionmanager.h b/src/plugins/Ui/qsui/actionmanager.h
index 163443b84..a33b0fed2 100644
--- a/src/plugins/Ui/qsui/actionmanager.h
+++ b/src/plugins/Ui/qsui/actionmanager.h
@@ -40,7 +40,7 @@ class ActionManager : public QObject
{
Q_OBJECT
public:
- explicit ActionManager(QObject *parent = 0);
+ explicit ActionManager(QObject *parent = nullptr);
~ActionManager();
enum Type
diff --git a/src/plugins/Ui/qsui/colorwidget.h b/src/plugins/Ui/qsui/colorwidget.h
index 86d915a09..1f8049ef5 100644
--- a/src/plugins/Ui/qsui/colorwidget.h
+++ b/src/plugins/Ui/qsui/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/Ui/qsui/coverwidget.h b/src/plugins/Ui/qsui/coverwidget.h
index 92a324de1..e66dfad35 100644
--- a/src/plugins/Ui/qsui/coverwidget.h
+++ b/src/plugins/Ui/qsui/coverwidget.h
@@ -32,7 +32,7 @@ class CoverWidget : public QWidget
{
Q_OBJECT
public:
- CoverWidget(QWidget *parent = 0);
+ CoverWidget(QWidget *parent = nullptr);
~CoverWidget();
diff --git a/src/plugins/Ui/qsui/elidinglabel.h b/src/plugins/Ui/qsui/elidinglabel.h
index 70e35fd2f..f348bcfc1 100644
--- a/src/plugins/Ui/qsui/elidinglabel.h
+++ b/src/plugins/Ui/qsui/elidinglabel.h
@@ -41,8 +41,8 @@ class /*QTCREATOR_UTILS_EXPORT*/ ElidingLabel : public QLabel
Q_PROPERTY(Qt::TextElideMode elideMode READ elideMode WRITE setElideMode DESIGNABLE true)
public:
- explicit ElidingLabel(QWidget *parent = 0);
- explicit ElidingLabel(const QString &text, QWidget *parent = 0);
+ explicit ElidingLabel(QWidget *parent = nullptr);
+ explicit ElidingLabel(const QString &text, QWidget *parent = nullptr);
Qt::TextElideMode elideMode() const;
void setElideMode(const Qt::TextElideMode &elideMode);
diff --git a/src/plugins/Ui/qsui/equalizer.h b/src/plugins/Ui/qsui/equalizer.h
index 86434b40a..5ee8f5c6c 100644
--- a/src/plugins/Ui/qsui/equalizer.h
+++ b/src/plugins/Ui/qsui/equalizer.h
@@ -38,7 +38,7 @@ class Equalizer : public QDialog
{
Q_OBJECT
public:
- explicit Equalizer(QWidget *parent = 0);
+ explicit Equalizer(QWidget *parent = nullptr);
~Equalizer();
diff --git a/src/plugins/Ui/qsui/filesystembrowser.h b/src/plugins/Ui/qsui/filesystembrowser.h
index 802204620..1a01cfcad 100644
--- a/src/plugins/Ui/qsui/filesystembrowser.h
+++ b/src/plugins/Ui/qsui/filesystembrowser.h
@@ -42,7 +42,7 @@ class FileSystemBrowser : public QWidget
{
Q_OBJECT
public:
- explicit FileSystemBrowser(QWidget *parent = 0);
+ explicit FileSystemBrowser(QWidget *parent = nullptr);
~FileSystemBrowser();
void readSettings();
diff --git a/src/plugins/Ui/qsui/hotkeyeditor.h b/src/plugins/Ui/qsui/hotkeyeditor.h
index 91fe490a0..786e4d7f7 100644
--- a/src/plugins/Ui/qsui/hotkeyeditor.h
+++ b/src/plugins/Ui/qsui/hotkeyeditor.h
@@ -35,7 +35,7 @@ class HotkeyEditor : public QWidget
Q_OBJECT
public:
- explicit HotkeyEditor(QWidget *parent = 0);
+ explicit HotkeyEditor(QWidget *parent = nullptr);
virtual ~HotkeyEditor();
private slots:
diff --git a/src/plugins/Ui/qsui/keyboardmanager.cpp b/src/plugins/Ui/qsui/keyboardmanager.cpp
index 9820984b8..b1c447258 100644
--- a/src/plugins/Ui/qsui/keyboardmanager.cpp
+++ b/src/plugins/Ui/qsui/keyboardmanager.cpp
@@ -30,7 +30,7 @@
KeyboardManager::KeyboardManager(QObject *parent) :
QObject(parent)
{
- m_listWidget = 0;
+ m_listWidget = nullptr;
addAction(Qt::Key_Up, SLOT(processUp()));
addAction(Qt::Key_Up + Qt::ShiftModifier, SLOT(processUp()));
diff --git a/src/plugins/Ui/qsui/keyboardmanager.h b/src/plugins/Ui/qsui/keyboardmanager.h
index 903036095..6aac5d228 100644
--- a/src/plugins/Ui/qsui/keyboardmanager.h
+++ b/src/plugins/Ui/qsui/keyboardmanager.h
@@ -34,7 +34,7 @@ class KeyboardManager : public QObject
{
Q_OBJECT
public:
- explicit KeyboardManager(QObject *parent = 0);
+ explicit KeyboardManager(QObject *parent = nullptr);
QList<QAction*> actions();
void setListWidget(ListWidget *listWidget);
diff --git a/src/plugins/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp
index ac28992da..0841b5062 100644
--- a/src/plugins/Ui/qsui/listwidget.cpp
+++ b/src/plugins/Ui/qsui/listwidget.cpp
@@ -45,9 +45,9 @@ ListWidget::ListWidget(PlayListModel *model, QWidget *parent)
: QWidget(parent)
{
setFocusPolicy(Qt::StrongFocus);
- m_popupWidget = 0;
+ m_popupWidget = nullptr;
m_ui_settings = QmmpUiSettings::instance();
- m_menu = 0;
+ m_menu = nullptr;
m_filterMode = false;
m_model = model;
m_timer = new QTimer(this);
@@ -67,7 +67,7 @@ ListWidget::ListWidget(PlayListModel *model, QWidget *parent)
m_row_count = 0;
m_select_on_release = false;
m_count = 0;
- m_firstItem = 0;
+ m_firstItem = nullptr;
setAcceptDrops(true);
setMouseTracking(true);
@@ -108,7 +108,7 @@ void ListWidget::readSettings()
if(m_popupWidget)
{
m_popupWidget->deleteLater();
- m_popupWidget = 0;
+ m_popupWidget = nullptr;
}
}
else
@@ -174,13 +174,13 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous)
if(previous)
{
previous->setProperty("first_visible", m_first);
- disconnect(previous, 0, this, 0); //disconnect previous model
- disconnect(previous,0,m_header,0);
+ disconnect(previous, nullptr, this, nullptr); //disconnect previous model
+ disconnect(previous,nullptr,m_header,nullptr);
}
qApp->processEvents();
m_model = selected;
m_count = m_model->count();
- m_firstItem = 0;
+ m_firstItem = nullptr;
if(m_model->property("first_visible").isValid())
{
@@ -436,7 +436,7 @@ void ListWidget::updateList(int flags)
if(!m_filterMode)
{
- m_firstItem = m_model->isEmpty() ? 0 : m_model->item(m_first);
+ m_firstItem = m_model->isEmpty() ? nullptr : m_model->item(m_first);
m_count = m_model->count();
}
items = m_filterMode ? m_filteredItems.mid(m_first, m_row_count) : m_model->mid(m_first, m_row_count);
diff --git a/src/plugins/Ui/qsui/listwidget.h b/src/plugins/Ui/qsui/listwidget.h
index ab981f4d5..1ac01cddf 100644
--- a/src/plugins/Ui/qsui/listwidget.h
+++ b/src/plugins/Ui/qsui/listwidget.h
@@ -47,7 +47,7 @@ class ListWidget : public QWidget
{
Q_OBJECT
public:
- ListWidget(PlayListModel *model, QWidget *parent = 0);
+ ListWidget(PlayListModel *model, QWidget *parent = nullptr);
~ListWidget();
diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
index 5481a21a4..000965152 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
@@ -41,9 +41,9 @@ ListWidgetDrawer::ListWidgetDrawer()
m_row_height = 0;
m_number_width = 0;
m_padding = 0;
- m_metrics = 0;
- m_extra_metrics = 0;
- m_bold_metrics = 0;
+ m_metrics = nullptr;
+ m_extra_metrics = nullptr;
+ m_bold_metrics = nullptr;
readSettings();
}
@@ -312,7 +312,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
painter->setFont(m_font);
painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_normal);
- QFontMetrics *metrics = 0;
+ QFontMetrics *metrics = nullptr;
if(row->flags & ListWidgetRow::CURRENT)
{
m_font.setBold(true);
diff --git a/src/plugins/Ui/qsui/logo.h b/src/plugins/Ui/qsui/logo.h
index afbff5947..d8a478125 100644
--- a/src/plugins/Ui/qsui/logo.h
+++ b/src/plugins/Ui/qsui/logo.h
@@ -38,7 +38,7 @@ class Logo : public Visual
{
Q_OBJECT
public:
- explicit Logo(QWidget *parent = 0);
+ explicit Logo(QWidget *parent = nullptr);
virtual ~Logo();
public slots:
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index d523aa041..fe1932269 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -778,7 +778,7 @@ void MainWindow::readSettings()
else
{
m_addListButton->setVisible(false);
- m_tabWidget->setCornerWidget(0, Qt::TopLeftCorner);
+ m_tabWidget->setCornerWidget(nullptr, Qt::TopLeftCorner);
}
if(settings.value("pl_show_tab_list_menu", false).toBool())
{
@@ -789,7 +789,7 @@ void MainWindow::readSettings()
else
{
m_tabListMenuButton->setVisible(false);
- m_tabWidget->setCornerWidget(0, Qt::TopRightCorner);
+ m_tabWidget->setCornerWidget(nullptr, Qt::TopRightCorner);
}
settings.endGroup();
@@ -878,25 +878,25 @@ void MainWindow::setTitleBarsVisible(bool visible)
{
if(visible)
{
- QWidget *widget = 0;
+ QWidget *widget = nullptr;
if((widget = m_ui.analyzerDockWidget->titleBarWidget()))
{
- m_ui.analyzerDockWidget->setTitleBarWidget(0);
+ m_ui.analyzerDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
if((widget = m_ui.fileSystemDockWidget->titleBarWidget()))
{
- m_ui.fileSystemDockWidget->setTitleBarWidget(0);
+ m_ui.fileSystemDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
if((widget = m_ui.coverDockWidget->titleBarWidget()))
{
- m_ui.coverDockWidget->setTitleBarWidget(0);
+ m_ui.coverDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
if((widget = m_ui.playlistsDockWidget->titleBarWidget()))
{
- m_ui.playlistsDockWidget->setTitleBarWidget(0);
+ m_ui.playlistsDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
}
diff --git a/src/plugins/Ui/qsui/mainwindow.h b/src/plugins/Ui/qsui/mainwindow.h
index cf51dc826..90d9a9174 100644
--- a/src/plugins/Ui/qsui/mainwindow.h
+++ b/src/plugins/Ui/qsui/mainwindow.h
@@ -52,7 +52,7 @@ class MainWindow : public QMainWindow
{
Q_OBJECT
public:
- MainWindow(QWidget *parent = 0);
+ MainWindow(QWidget *parent = nullptr);
~MainWindow();
private slots:
diff --git a/src/plugins/Ui/qsui/playlistbrowser.h b/src/plugins/Ui/qsui/playlistbrowser.h
index 07aa5b71b..5f5d38df9 100644
--- a/src/plugins/Ui/qsui/playlistbrowser.h
+++ b/src/plugins/Ui/qsui/playlistbrowser.h
@@ -38,7 +38,7 @@ class PlayListBrowser : public QWidget
{
Q_OBJECT
public:
- PlayListBrowser(PlayListManager *manager, QWidget *parent = 0);
+ PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
~PlayListBrowser();
private slots:
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index b6f8a4a43..2ce470fcc 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -55,7 +55,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) :
m_scrollbar_width = 0;
m_reverted = false;
m_auto_resize = false;
- m_metrics = 0;
+ m_metrics = nullptr;
m_task = NO_TASK;
m_model = PlayListManager::instance()->headerModel();
@@ -96,7 +96,7 @@ PlayListHeader::~PlayListHeader()
{
if (m_metrics)
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
}
void PlayListHeader::readSettings()
@@ -104,7 +104,7 @@ void PlayListHeader::readSettings()
if (m_metrics)
{
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
}
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
diff --git a/src/plugins/Ui/qsui/playlistheader.h b/src/plugins/Ui/qsui/playlistheader.h
index fce8248e3..fa5cafb71 100644
--- a/src/plugins/Ui/qsui/playlistheader.h
+++ b/src/plugins/Ui/qsui/playlistheader.h
@@ -40,7 +40,7 @@ class PlayListHeader : public QWidget
{
Q_OBJECT
public:
- explicit PlayListHeader(QWidget *parent = 0);
+ explicit PlayListHeader(QWidget *parent = nullptr);
~PlayListHeader();
void readSettings();
diff --git a/src/plugins/Ui/qsui/popupsettings.h b/src/plugins/Ui/qsui/popupsettings.h
index 15fd24922..3be5c6daa 100644
--- a/src/plugins/Ui/qsui/popupsettings.h
+++ b/src/plugins/Ui/qsui/popupsettings.h
@@ -30,7 +30,7 @@ class PopupSettings : public QDialog
{
Q_OBJECT
public:
- PopupSettings(QWidget *parent = 0);
+ PopupSettings(QWidget *parent = nullptr);
~PopupSettings();
diff --git a/src/plugins/Ui/qsui/popupwidget.h b/src/plugins/Ui/qsui/popupwidget.h
index f341f819d..00f3751f1 100644
--- a/src/plugins/Ui/qsui/popupwidget.h
+++ b/src/plugins/Ui/qsui/popupwidget.h
@@ -37,7 +37,7 @@ class PopupWidget : public QWidget
{
Q_OBJECT
public:
- PopupWidget(QWidget *parent = 0);
+ PopupWidget(QWidget *parent = nullptr);
~PopupWidget();
diff --git a/src/plugins/Ui/qsui/positionslider.h b/src/plugins/Ui/qsui/positionslider.h
index 350c62ea5..ebb3db302 100644
--- a/src/plugins/Ui/qsui/positionslider.h
+++ b/src/plugins/Ui/qsui/positionslider.h
@@ -33,7 +33,7 @@ class PositionSlider : public QSlider
{
Q_OBJECT
public:
- explicit PositionSlider(QWidget *parent = 0);
+ explicit PositionSlider(QWidget *parent = nullptr);
virtual ~PositionSlider(){}
protected:
diff --git a/src/plugins/Ui/qsui/qsuianalyzer.cpp b/src/plugins/Ui/qsui/qsuianalyzer.cpp
index e24301ea1..e510c6bc7 100644
--- a/src/plugins/Ui/qsui/qsuianalyzer.cpp
+++ b/src/plugins/Ui/qsui/qsuianalyzer.cpp
@@ -33,9 +33,9 @@
QSUiAnalyzer::QSUiAnalyzer(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_offset = 0;
diff --git a/src/plugins/Ui/qsui/qsuianalyzer.h b/src/plugins/Ui/qsui/qsuianalyzer.h
index 6abb6ad11..b75e9569a 100644
--- a/src/plugins/Ui/qsui/qsuianalyzer.h
+++ b/src/plugins/Ui/qsui/qsuianalyzer.h
@@ -34,7 +34,7 @@ class QSUiAnalyzer : public Visual
{
Q_OBJECT
public:
- QSUiAnalyzer(QWidget *parent = 0);
+ QSUiAnalyzer(QWidget *parent = nullptr);
virtual ~QSUiAnalyzer();
void setCover(const QPixmap &pixmap);
diff --git a/src/plugins/Ui/qsui/qsuiquicksearch.h b/src/plugins/Ui/qsui/qsuiquicksearch.h
index 96e96cd29..ec04e3b89 100644
--- a/src/plugins/Ui/qsui/qsuiquicksearch.h
+++ b/src/plugins/Ui/qsui/qsuiquicksearch.h
@@ -35,7 +35,7 @@ class QSUIQuickSearch : public QWidget
{
Q_OBJECT
public:
- explicit QSUIQuickSearch(ListWidget *listWidget, QWidget *parent = 0);
+ explicit QSUIQuickSearch(ListWidget *listWidget, QWidget *parent = nullptr);
private:
QLineEdit *m_lineEdit;
diff --git a/src/plugins/Ui/qsui/qsuisettings.h b/src/plugins/Ui/qsui/qsuisettings.h
index 85a718d9e..26a7935e4 100644
--- a/src/plugins/Ui/qsui/qsuisettings.h
+++ b/src/plugins/Ui/qsui/qsuisettings.h
@@ -32,7 +32,7 @@ class QSUISettings : public QWidget
{
Q_OBJECT
public:
- explicit QSUISettings(QWidget *parent = 0);
+ explicit QSUISettings(QWidget *parent = nullptr);
virtual ~QSUISettings();
void writeSettings();
diff --git a/src/plugins/Ui/qsui/qsuitabbar.h b/src/plugins/Ui/qsui/qsuitabbar.h
index 3be74a688..955e73c81 100644
--- a/src/plugins/Ui/qsui/qsuitabbar.h
+++ b/src/plugins/Ui/qsui/qsuitabbar.h
@@ -30,7 +30,7 @@ class QSUiTabBar : public QTabBar
{
Q_OBJECT
public:
- explicit QSUiTabBar(QWidget *parent = 0);
+ explicit QSUiTabBar(QWidget *parent = nullptr);
private:
void mouseReleaseEvent(QMouseEvent *e);
diff --git a/src/plugins/Ui/qsui/qsuitabwidget.cpp b/src/plugins/Ui/qsui/qsuitabwidget.cpp
index 3e4b56456..19f2e78e4 100644
--- a/src/plugins/Ui/qsui/qsuitabwidget.cpp
+++ b/src/plugins/Ui/qsui/qsuitabwidget.cpp
@@ -42,8 +42,8 @@ QSUiTabWidget::QSUiTabWidget(QWidget *parent) : QWidget(parent)
setFocusPolicy(Qt::TabFocus);
setFocusProxy(m_tabBar);
- m_rightCornerWidget = 0;
- m_leftCornerWidget = 0;
+ m_rightCornerWidget = nullptr;
+ m_leftCornerWidget = nullptr;
m_menu = new QMenu(this);
m_group = new QActionGroup(this);
@@ -184,9 +184,9 @@ void QSUiTabWidget::initStyleOption(QStyleOptionTabWidgetFrame *option) const
return;
option->initFrom(this);
- option->lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, this);
+ option->lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, this);
- int exth = style()->pixelMetric(QStyle::PM_TabBarBaseHeight, 0, this);
+ int exth = style()->pixelMetric(QStyle::PM_TabBarBaseHeight, nullptr, this);
QSize t(0, 0);
if (m_tabBar->isVisibleTo(const_cast<QSUiTabWidget *>(this)))
t = m_tabBar->sizeHint();
@@ -328,7 +328,7 @@ void QSUiTabWidget::tabRemoved(int index)
void QSUiTabWidget::mousePressEvent(QMouseEvent *e)
{
if((e->button() == Qt::MidButton) &&
- (childAt(e->pos()) == 0))
+ (childAt(e->pos()) == nullptr))
{
e->accept();
emit createPlayListRequested();
@@ -339,7 +339,7 @@ void QSUiTabWidget::mousePressEvent(QMouseEvent *e)
void QSUiTabWidget::mouseDoubleClickEvent(QMouseEvent *e)
{
if((e->button() == Qt::LeftButton) &&
- (childAt(e->pos()) == 0))
+ (childAt(e->pos()) == nullptr))
{
e->accept();
emit createPlayListRequested();
diff --git a/src/plugins/Ui/qsui/qsuitabwidget.h b/src/plugins/Ui/qsui/qsuitabwidget.h
index 64f03b197..85988e7a4 100644
--- a/src/plugins/Ui/qsui/qsuitabwidget.h
+++ b/src/plugins/Ui/qsui/qsuitabwidget.h
@@ -35,7 +35,7 @@ class QSUiTabWidget : public QWidget
{
Q_OBJECT
public:
- QSUiTabWidget(QWidget *parent = 0);
+ QSUiTabWidget(QWidget *parent = nullptr);
QSUiTabBar *tabBar() const;
ListWidget *listWidget() const;
diff --git a/src/plugins/Ui/qsui/shortcutdialog.h b/src/plugins/Ui/qsui/shortcutdialog.h
index 92c549ac7..5d9a13469 100644
--- a/src/plugins/Ui/qsui/shortcutdialog.h
+++ b/src/plugins/Ui/qsui/shortcutdialog.h
@@ -32,7 +32,7 @@ class ShortcutDialog : public QDialog
{
Q_OBJECT
public:
- ShortcutDialog(const QString &key, QWidget *parent = 0);
+ ShortcutDialog(const QString &key, QWidget *parent = nullptr);
~ShortcutDialog();
diff --git a/src/plugins/Ui/qsui/visualmenu.cpp b/src/plugins/Ui/qsui/visualmenu.cpp
index 6548a642f..0defc96fe 100644
--- a/src/plugins/Ui/qsui/visualmenu.cpp
+++ b/src/plugins/Ui/qsui/visualmenu.cpp
@@ -26,7 +26,7 @@
VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent)
{
- VisualFactory *factory = 0;
+ VisualFactory *factory = nullptr;
foreach(factory, Visual::factories())
{
VisualAction *act = new VisualAction(factory, this);
diff --git a/src/plugins/Ui/qsui/visualmenu.h b/src/plugins/Ui/qsui/visualmenu.h
index 301ce4e4e..2994e40dd 100644
--- a/src/plugins/Ui/qsui/visualmenu.h
+++ b/src/plugins/Ui/qsui/visualmenu.h
@@ -32,7 +32,7 @@ class VisualMenu : public QMenu
{
Q_OBJECT
public:
- VisualMenu(QWidget *parent = 0);
+ VisualMenu(QWidget *parent = nullptr);
~VisualMenu();
@@ -44,7 +44,7 @@ class VisualAction : public QAction
{
Q_OBJECT
public:
- VisualAction(VisualFactory *factory, QWidget *parent = 0);
+ VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
private slots:
void select(bool);
diff --git a/src/plugins/Ui/qsui/volumeslider.h b/src/plugins/Ui/qsui/volumeslider.h
index ea3f9a7e2..344c08000 100644
--- a/src/plugins/Ui/qsui/volumeslider.h
+++ b/src/plugins/Ui/qsui/volumeslider.h
@@ -33,7 +33,7 @@ class VolumeSlider : public QSlider
{
Q_OBJECT
public:
- explicit VolumeSlider(QWidget *parent = 0);
+ explicit VolumeSlider(QWidget *parent = nullptr);
virtual ~VolumeSlider(){}
protected: