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

58 files changed, 105 insertions, 105 deletions

diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp
index b88206aba..02158089c 100644
--- a/src/plugins/Ui/skinned/actionmanager.cpp
+++ b/src/plugins/Ui/skinned/actionmanager.cpp
@@ -26,7 +26,7 @@
 #include <qmmp/qmmp.h>
 #include "actionmanager.h"
 
-ActionManager *ActionManager::m_instance = 0;
+ActionManager *ActionManager::m_instance = nullptr;
 
 ActionManager::ActionManager(QObject *parent) :
     QObject(parent)
@@ -104,14 +104,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/skinned/actionmanager.h b/src/plugins/Ui/skinned/actionmanager.h
index bbe9a1f95..d4d0f18f0 100644
--- a/src/plugins/Ui/skinned/actionmanager.h
+++ b/src/plugins/Ui/skinned/actionmanager.h
@@ -38,7 +38,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/skinned/balancebar.h b/src/plugins/Ui/skinned/balancebar.h
index 50d7b7397..23628163f 100644
--- a/src/plugins/Ui/skinned/balancebar.h
+++ b/src/plugins/Ui/skinned/balancebar.h
@@ -31,7 +31,7 @@ class BalanceBar : public PixmapWidget
 {
 Q_OBJECT
 public:
-    BalanceBar(QWidget *parent = 0);
+    BalanceBar(QWidget *parent = nullptr);
 
     ~BalanceBar();
 
diff --git a/src/plugins/Ui/skinned/display.h b/src/plugins/Ui/skinned/display.h
index 95781eb94..796630bb8 100644
--- a/src/plugins/Ui/skinned/display.h
+++ b/src/plugins/Ui/skinned/display.h
@@ -51,7 +51,7 @@ class MainDisplay : public PixmapWidget
 {
     Q_OBJECT
 public:
-    MainDisplay(MainWindow *parent = 0);
+    MainDisplay(MainWindow *parent = nullptr);
 
     ~MainDisplay();
 
diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp
index 09249be58..0cd867493 100644
--- a/src/plugins/Ui/skinned/dock.cpp
+++ b/src/plugins/Ui/skinned/dock.cpp
@@ -25,7 +25,7 @@
 #include <QApplication>
 #include "dock.h"
 
-Dock *Dock::m_instance = 0;
+Dock *Dock::m_instance = nullptr;
 
 Dock *Dock::instance()
 {
@@ -38,12 +38,12 @@ Dock::Dock (QObject *parent)
         : QObject (parent)
 {
     m_instance = this;
-    m_mainWidget = 0;
+    m_mainWidget = nullptr;
 }
 
 Dock::~Dock()
 {
-    m_instance = 0;
+    m_instance = nullptr;
 }
 
 void Dock::setMainWidget (QWidget *widget)
diff --git a/src/plugins/Ui/skinned/dock.h b/src/plugins/Ui/skinned/dock.h
index 74a64c9fa..e8e39fc16 100644
--- a/src/plugins/Ui/skinned/dock.h
+++ b/src/plugins/Ui/skinned/dock.h
@@ -32,7 +32,7 @@ class Dock : public QObject
 {
     Q_OBJECT
 public:
-    Dock(QObject *parent = 0);
+    Dock(QObject *parent = nullptr);
 
     ~Dock();
 
diff --git a/src/plugins/Ui/skinned/eqgraph.h b/src/plugins/Ui/skinned/eqgraph.h
index 898575af0..6373243ba 100644
--- a/src/plugins/Ui/skinned/eqgraph.h
+++ b/src/plugins/Ui/skinned/eqgraph.h
@@ -30,7 +30,7 @@ class EQGraph : public PixmapWidget
 {
    Q_OBJECT
 public:
-    EQGraph (QWidget *parent = 0);
+    EQGraph (QWidget *parent = nullptr);
 
    ~EQGraph();
 
diff --git a/src/plugins/Ui/skinned/eqslider.h b/src/plugins/Ui/skinned/eqslider.h
index 70873d3c1..eb1d53116 100644
--- a/src/plugins/Ui/skinned/eqslider.h
+++ b/src/plugins/Ui/skinned/eqslider.h
@@ -33,7 +33,7 @@ class EqSlider : public PixmapWidget
 {
 Q_OBJECT
 public:
-    EqSlider(QWidget *parent = 0);
+    EqSlider(QWidget *parent = nullptr);
 
     ~EqSlider();
 
diff --git a/src/plugins/Ui/skinned/eqtitlebar.cpp b/src/plugins/Ui/skinned/eqtitlebar.cpp
index 17a3b3b2f..a6d202bfe 100644
--- a/src/plugins/Ui/skinned/eqtitlebar.cpp
+++ b/src/plugins/Ui/skinned/eqtitlebar.cpp
@@ -32,9 +32,9 @@
 EqTitleBar::EqTitleBar(QWidget *parent)
         : PixmapWidget(parent)
 {
-    m_volumeBar = 0;
-    m_balanceBar = 0;
-    m_shade2 = 0;
+    m_volumeBar = nullptr;
+    m_balanceBar = nullptr;
+    m_shade2 = nullptr;
     m_left = 0;
     m_right = 0;
     m_shaded = false;
@@ -159,9 +159,9 @@ void EqTitleBar::shade()
         m_shade2->deleteLater();
         m_volumeBar->deleteLater();
         m_balanceBar->deleteLater();
-        m_volumeBar = 0;
-        m_balanceBar = 0;
-        m_shade2 = 0;
+        m_volumeBar = nullptr;
+        m_balanceBar = nullptr;
+        m_shade2 = nullptr;
         m_shade->show();
     }
     qobject_cast<EqWidget *>(m_eq)->setMimimalMode(m_shaded);
diff --git a/src/plugins/Ui/skinned/eqtitlebar.h b/src/plugins/Ui/skinned/eqtitlebar.h
index 2c4e01f7b..1db1af2ab 100644
--- a/src/plugins/Ui/skinned/eqtitlebar.h
+++ b/src/plugins/Ui/skinned/eqtitlebar.h
@@ -35,7 +35,7 @@ class EqTitleBar : public PixmapWidget
 {
 Q_OBJECT
 public:
-    EqTitleBar(QWidget *parent = 0);
+    EqTitleBar(QWidget *parent = nullptr);
 
     ~EqTitleBar();
 
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 46765c67f..f9cabdfc1 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -396,7 +396,7 @@ EQPreset *EqWidget::findPreset(const QString &name)
         if (preset->text() == name)
             return preset;
     }
-    return 0;
+    return nullptr;
 }
 
 void EqWidget::importWinampEQF()
diff --git a/src/plugins/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h
index 43783df6a..b05c608b4 100644
--- a/src/plugins/Ui/skinned/eqwidget.h
+++ b/src/plugins/Ui/skinned/eqwidget.h
@@ -42,7 +42,7 @@ class EqWidget : public PixmapWidget
 {
     Q_OBJECT
 public:
-    EqWidget(QWidget *parent = 0);
+    EqWidget(QWidget *parent = nullptr);
 
     ~EqWidget();
 
diff --git a/src/plugins/Ui/skinned/horizontalslider.h b/src/plugins/Ui/skinned/horizontalslider.h
index 7ccaeacf8..19ddfae8d 100644
--- a/src/plugins/Ui/skinned/horizontalslider.h
+++ b/src/plugins/Ui/skinned/horizontalslider.h
@@ -32,7 +32,7 @@ class HorizontalSlider : public QWidget
 {
 Q_OBJECT
 public:
-    HorizontalSlider(QWidget *parent = 0);
+    HorizontalSlider(QWidget *parent = nullptr);
 
     ~HorizontalSlider();
 
diff --git a/src/plugins/Ui/skinned/hotkeyeditor.h b/src/plugins/Ui/skinned/hotkeyeditor.h
index 91fe490a0..786e4d7f7 100644
--- a/src/plugins/Ui/skinned/hotkeyeditor.h
+++ b/src/plugins/Ui/skinned/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/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 264273568..dc2c2d41d 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -46,7 +46,7 @@
 ListWidget::ListWidget(QWidget *parent)
         : QWidget(parent)
 {
-    m_popupWidget = 0;
+    m_popupWidget = nullptr;
 
     m_skin = Skin::instance();
     m_ui_settings = QmmpUiSettings::instance();
@@ -65,7 +65,7 @@ ListWidget::ListWidget(QWidget *parent)
     m_first = 0;
     m_row_count = 0;
     m_count = 0;
-    m_firstItem = 0;
+    m_firstItem = nullptr;
     m_select_on_release = false;
 
     setAcceptDrops(true);
@@ -104,7 +104,7 @@ void ListWidget::readSettings()
         if(m_popupWidget)
         {
             m_popupWidget->deleteLater();
-            m_popupWidget = 0;
+            m_popupWidget = nullptr;
         }
     }
     else
@@ -340,7 +340,7 @@ void ListWidget::updateList(int flags)
             emit positionChanged(m_first, m_model->count() - m_row_count);
         }
 
-        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_model->mid(m_first, m_row_count);
 
@@ -459,13 +459,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())
     {
diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h
index abaa5fec8..9f4b95bc7 100644
--- a/src/plugins/Ui/skinned/listwidget.h
+++ b/src/plugins/Ui/skinned/listwidget.h
@@ -48,7 +48,7 @@ class ListWidget : public QWidget
 {
     Q_OBJECT
 public:
-    ListWidget(QWidget *parent = 0);
+    ListWidget(QWidget *parent = nullptr);
 
     ~ListWidget();
 
@@ -70,7 +70,7 @@ public slots:
     void readSettings();
     void updateList(int flags);
     void setViewPosition(int sc);
-    void setModel(PlayListModel *selected, PlayListModel *previous = 0);
+    void setModel(PlayListModel *selected, PlayListModel *previous = nullptr);
 
 signals:
     void doubleClicked();
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 0418f9938..7293dc8a0 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -41,8 +41,8 @@ ListWidgetDrawer::ListWidgetDrawer()
     m_show_splitters = false;
     m_alternate_splitter_color = false;
     m_padding = 0;
-    m_metrics = 0;
-    m_extra_metrics = 0;
+    m_metrics = nullptr;
+    m_extra_metrics = nullptr;
     readSettings();
     loadColors();
 }
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];
diff --git a/src/plugins/Ui/skinned/mainvisual.h b/src/plugins/Ui/skinned/mainvisual.h
index 8ae0b0995..e5b5e300e 100644
--- a/src/plugins/Ui/skinned/mainvisual.h
+++ b/src/plugins/Ui/skinned/mainvisual.h
@@ -45,7 +45,7 @@ class MainVisual : public Visual
     Q_OBJECT
 
 public:
-    MainVisual(QWidget *parent = 0);
+    MainVisual(QWidget *parent = nullptr);
     virtual ~MainVisual();
 
     static MainVisual *instance();
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index f12109a17..2074bdc9b 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -58,7 +58,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 #ifdef QMMP_WS_X11
     qDebug("MainWindow: detected wm: %s", qPrintable(WindowSystem::netWindowManagerName()));
 #endif
-    m_vis = 0;
+    m_vis = nullptr;
     m_update = false;
 
 #ifdef QMMP_WS_X11
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index db8c684c7..cf4f1bb9b 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -50,7 +50,7 @@ class MainWindow : public QMainWindow
 {
     Q_OBJECT
 public:
-    MainWindow(QWidget *parent = 0);
+    MainWindow(QWidget *parent = nullptr);
 
     ~MainWindow();
 
diff --git a/src/plugins/Ui/skinned/monostereo.h b/src/plugins/Ui/skinned/monostereo.h
index 8779ca741..b038a4759 100644
--- a/src/plugins/Ui/skinned/monostereo.h
+++ b/src/plugins/Ui/skinned/monostereo.h
@@ -31,7 +31,7 @@ class MonoStereo : public PixmapWidget
 {
 Q_OBJECT
 public:
-    MonoStereo(QWidget *parent = 0);
+    MonoStereo(QWidget *parent = nullptr);
 
     ~MonoStereo();
 
diff --git a/src/plugins/Ui/skinned/number.h b/src/plugins/Ui/skinned/number.h
index 8b44b790d..5c89406ed 100644
--- a/src/plugins/Ui/skinned/number.h
+++ b/src/plugins/Ui/skinned/number.h
@@ -31,7 +31,7 @@ class Number : public PixmapWidget
 {
 Q_OBJECT
 public:
-    Number(QWidget *parent = 0);
+    Number(QWidget *parent = nullptr);
 
     ~Number();
 
diff --git a/src/plugins/Ui/skinned/pixmapwidget.h b/src/plugins/Ui/skinned/pixmapwidget.h
index 73aff2613..9b37feec7 100644
--- a/src/plugins/Ui/skinned/pixmapwidget.h
+++ b/src/plugins/Ui/skinned/pixmapwidget.h
@@ -31,7 +31,7 @@ class PixmapWidget : public QWidget
 {
 Q_OBJECT
 public:
-    PixmapWidget(QWidget *parent = 0);
+    PixmapWidget(QWidget *parent = nullptr);
 
     virtual ~PixmapWidget();
 
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 67a5b3d93..8f280907e 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -60,8 +60,8 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent)
     m_skin = Skin::instance();
     m_ratio = m_skin->ratio();
     m_shaded = false;
-    m_pl_browser = 0;
-    m_pl_selector = 0;
+    m_pl_browser = nullptr;
+    m_pl_selector = nullptr;
 
 #ifdef QMMP_WS_X11
     QString wm_name = WindowSystem::netWindowManagerName();
@@ -455,7 +455,7 @@ void PlayList::readSettings()
             m_pl_selector->deleteLater();
             m_listWidget->menu()->removeAction(m_copySelectedMenu->menuAction());
         }
-        m_pl_selector = 0;
+        m_pl_selector = nullptr;
     }
 
     if (m_update)
@@ -621,7 +621,7 @@ void PlayList::generateCopySelectedMenu()
 
 void PlayList::copySelectedMenuActionTriggered(QAction *action)
 {
-    PlayListModel *targetPlayList = 0;
+    PlayListModel *targetPlayList = nullptr;
     QString actionText=action->text();
     if(action == m_copySelectedMenu->actions().at(0))//actionText == tr ("&New PlayList"))
     {
diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h
index d960255c7..67570da88 100644
--- a/src/plugins/Ui/skinned/playlist.h
+++ b/src/plugins/Ui/skinned/playlist.h
@@ -49,7 +49,7 @@ class PlayList : public QWidget
 {
         Q_OBJECT
     public:
-        PlayList (PlayListManager *manager, QWidget *parent = 0);
+        PlayList (PlayListManager *manager, QWidget *parent = nullptr);
         virtual ~PlayList();
 
         void readSettings();
diff --git a/src/plugins/Ui/skinned/playlistbrowser.h b/src/plugins/Ui/skinned/playlistbrowser.h
index 65d01155b..5cfe21508 100644
--- a/src/plugins/Ui/skinned/playlistbrowser.h
+++ b/src/plugins/Ui/skinned/playlistbrowser.h
@@ -36,7 +36,7 @@ class PlayListBrowser : public QDialog
 {
 Q_OBJECT
 public:
-    PlayListBrowser(PlayListManager *manager, QWidget *parent = 0);
+    PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
     ~PlayListBrowser();
 
 private slots:
diff --git a/src/plugins/Ui/skinned/playlistcontrol.h b/src/plugins/Ui/skinned/playlistcontrol.h
index 8f85d0344..d661f09a8 100644
--- a/src/plugins/Ui/skinned/playlistcontrol.h
+++ b/src/plugins/Ui/skinned/playlistcontrol.h
@@ -34,7 +34,7 @@ class PlaylistControl : public PixmapWidget
 {
 Q_OBJECT
 public:
-    PlaylistControl(QWidget* parent = 0);
+    PlaylistControl(QWidget* parent = nullptr);
 
 
 signals:
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 4ad6bac03..442aab3cf 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -69,7 +69,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) :
     QWidget(parent)
 {
     setMouseTracking(true);
-    m_metrics = 0;
+    m_metrics = nullptr;
     m_padding = 0;
     m_pl_padding = 0;
     m_number_width = 0;
@@ -118,7 +118,7 @@ PlayListHeader::~PlayListHeader()
 {
     if (m_metrics)
         delete m_metrics;
-    m_metrics = 0;
+    m_metrics = nullptr;
     writeSettings();
 }
 
@@ -131,7 +131,7 @@ void PlayListHeader::readSettings()
     if (m_metrics)
     {
         delete m_metrics;
-        m_metrics = 0;
+        m_metrics = nullptr;
     }
 
     m_metrics = new QFontMetrics(m_font);
diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h
index 3f57ee6d0..f5622b955 100644
--- a/src/plugins/Ui/skinned/playlistheader.h
+++ b/src/plugins/Ui/skinned/playlistheader.h
@@ -41,7 +41,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/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp
index f0fb9a6b3..37ac13eb5 100644
--- a/src/plugins/Ui/skinned/playlistselector.cpp
+++ b/src/plugins/Ui/skinned/playlistselector.cpp
@@ -40,7 +40,7 @@ PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) :
     m_moving = false;
     m_offset = 0;
     m_offset_max = 0;
-    m_metrics = 0;
+    m_metrics = nullptr;
     m_pressed_button = BUTTON_UNKNOWN;
     m_skin = Skin::instance();
     m_pl_manager = manager;
@@ -60,7 +60,7 @@ PlayListSelector::~PlayListSelector()
 {
     if (m_metrics)
         delete m_metrics;
-    m_metrics = 0;
+    m_metrics = nullptr;
 }
 
 void PlayListSelector::readSettings()
@@ -70,7 +70,7 @@ void PlayListSelector::readSettings()
     if (m_metrics)
     {
         delete m_metrics;
-        m_metrics = 0;
+        m_metrics = nullptr;
     }
     m_metrics = new QFontMetrics(m_font);
     m_pl_separator = settings.value("Skinned/pl_separator", "::").toString();
diff --git a/src/plugins/Ui/skinned/playlistselector.h b/src/plugins/Ui/skinned/playlistselector.h
index 61a1ca972..63d000e8f 100644
--- a/src/plugins/Ui/skinned/playlistselector.h
+++ b/src/plugins/Ui/skinned/playlistselector.h
@@ -40,7 +40,7 @@ class PlayListSelector : public QWidget
 {
 Q_OBJECT
 public:
-    PlayListSelector(PlayListManager *manager, QWidget *parent = 0);
+    PlayListSelector(PlayListManager *manager, QWidget *parent = nullptr);
     ~PlayListSelector();
     void readSettings();
 
diff --git a/src/plugins/Ui/skinned/playlistslider.h b/src/plugins/Ui/skinned/playlistslider.h
index 9e2172eb2..8e3b267ca 100644
--- a/src/plugins/Ui/skinned/playlistslider.h
+++ b/src/plugins/Ui/skinned/playlistslider.h
@@ -30,7 +30,7 @@ class PlayListSlider : public QWidget
 {
 Q_OBJECT
 public:
-    PlayListSlider(QWidget *parent = 0);
+    PlayListSlider(QWidget *parent = nullptr);
 
     ~PlayListSlider();
 
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index 1c4b3d98f..3450a5bc5 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -38,8 +38,8 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent)
     m_active = false;
     m_resize = false;
     m_formatter.setPattern(TITLE_FORMAT);
-    m_shade2 = 0;
-    m_model = 0;
+    m_shade2 = nullptr;
+    m_model = nullptr;
     m_shaded = false;
     m_align = false;
     m_skin = Skin::instance();
@@ -221,7 +221,7 @@ void PlayListTitleBar::setActive(bool a)
 void PlayListTitleBar::setModel(PlayListModel *selected, PlayListModel *previous)
 {
     if(previous)
-        disconnect(previous, 0, this, 0); //disconnect previous model
+        disconnect(previous, nullptr, this, nullptr); //disconnect previous model
     m_model = selected;
     connect (m_model, SIGNAL(listChanged(int)), SLOT(showCurrent()));
     showCurrent();
@@ -262,7 +262,7 @@ void PlayListTitleBar::shade()
     else
     {
         m_shade2->deleteLater();
-        m_shade2 = 0;
+        m_shade2 = nullptr;
         m_shade->show();
     }
     m_pl->setMinimalMode(m_shaded);
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.h b/src/plugins/Ui/skinned/playlisttitlebar.h
index f1de7a3cb..6e2a48cf5 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.h
+++ b/src/plugins/Ui/skinned/playlisttitlebar.h
@@ -37,14 +37,14 @@ class PlayListTitleBar : public PixmapWidget
 {
 Q_OBJECT
 public:
-    PlayListTitleBar(QWidget *parent = 0);
+    PlayListTitleBar(QWidget *parent = nullptr);
     ~PlayListTitleBar();
     void setActive(bool);
     void readSettings();
 
 public slots:
     void showCurrent();
-    void setModel(PlayListModel *selected, PlayListModel *previous = 0);
+    void setModel(PlayListModel *selected, PlayListModel *previous = nullptr);
 
 private slots:
     void updateSkin();
diff --git a/src/plugins/Ui/skinned/playstatus.h b/src/plugins/Ui/skinned/playstatus.h
index 819568fa4..85deb480e 100644
--- a/src/plugins/Ui/skinned/playstatus.h
+++ b/src/plugins/Ui/skinned/playstatus.h
@@ -31,7 +31,7 @@ class PlayStatus : public PixmapWidget
 {
 Q_OBJECT
 public:
-    PlayStatus(QWidget *parent = 0);
+    PlayStatus(QWidget *parent = nullptr);
 
     ~PlayStatus();
 
diff --git a/src/plugins/Ui/skinned/popupsettings.h b/src/plugins/Ui/skinned/popupsettings.h
index c669629e4..b79f1609b 100644
--- a/src/plugins/Ui/skinned/popupsettings.h
+++ b/src/plugins/Ui/skinned/popupsettings.h
@@ -30,7 +30,7 @@ class PopupSettings : public QDialog
 {
 Q_OBJECT
 public:
-    PopupSettings(QWidget *parent = 0);
+    PopupSettings(QWidget *parent = nullptr);
     ~PopupSettings();
 
 public slots:
diff --git a/src/plugins/Ui/skinned/popupwidget.h b/src/plugins/Ui/skinned/popupwidget.h
index fd855dfec..84d00d4f4 100644
--- a/src/plugins/Ui/skinned/popupwidget.h
+++ b/src/plugins/Ui/skinned/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/skinned/positionbar.h b/src/plugins/Ui/skinned/positionbar.h
index bf16c83d6..2b0261fb9 100644
--- a/src/plugins/Ui/skinned/positionbar.h
+++ b/src/plugins/Ui/skinned/positionbar.h
@@ -33,7 +33,7 @@ class PositionBar : public PixmapWidget
 {
     Q_OBJECT
 public:
-    PositionBar(QWidget *parent = 0);
+    PositionBar(QWidget *parent = nullptr);
     virtual ~PositionBar();
 
 public slots:
diff --git a/src/plugins/Ui/skinned/preseteditor.cpp b/src/plugins/Ui/skinned/preseteditor.cpp
index 0d241b603..87e29f869 100644
--- a/src/plugins/Ui/skinned/preseteditor.cpp
+++ b/src/plugins/Ui/skinned/preseteditor.cpp
@@ -61,7 +61,7 @@ void PresetEditor::addAutoPresets(const QList<EQPreset*> &presets)
 
 void PresetEditor::loadPreset()
 {
-    EQPreset* preset = 0;
+    EQPreset* preset = nullptr;
     if (ui.tabWidget->currentIndex () == 0)
         preset = (EQPreset *) ui.presetListWidget->currentItem ();
     if (ui.tabWidget->currentIndex () == 1)
@@ -72,7 +72,7 @@ void PresetEditor::loadPreset()
 
 void PresetEditor::deletePreset()
 {
-    EQPreset* preset = 0;
+    EQPreset* preset = nullptr;
     if (ui.tabWidget->currentIndex () == 0)
         preset = (EQPreset *) ui.presetListWidget->currentItem ();
     if (ui.tabWidget->currentIndex () == 1)
diff --git a/src/plugins/Ui/skinned/preseteditor.h b/src/plugins/Ui/skinned/preseteditor.h
index b77932ce3..842122506 100644
--- a/src/plugins/Ui/skinned/preseteditor.h
+++ b/src/plugins/Ui/skinned/preseteditor.h
@@ -34,7 +34,7 @@ class PresetEditor : public QDialog
 {
 Q_OBJECT
 public:
-    PresetEditor(QWidget *parent = 0);
+    PresetEditor(QWidget *parent = nullptr);
 
     ~PresetEditor();
 
diff --git a/src/plugins/Ui/skinned/shadedbar.h b/src/plugins/Ui/skinned/shadedbar.h
index f5e3a9d8d..1a5f96fd3 100644
--- a/src/plugins/Ui/skinned/shadedbar.h
+++ b/src/plugins/Ui/skinned/shadedbar.h
@@ -33,7 +33,7 @@ class ShadedBar : public QWidget
 {
     Q_OBJECT
 public:
-    ShadedBar(QWidget *parent = 0, uint slider1 = 0, uint slider2 = 0, uint slider3 = 0);
+    ShadedBar(QWidget *parent = nullptr, uint slider1 = 0, uint slider2 = 0, uint slider3 = 0);
 
     ~ShadedBar();
     int value()
diff --git a/src/plugins/Ui/skinned/shadedvisual.h b/src/plugins/Ui/skinned/shadedvisual.h
index 04b92b671..a74c6f693 100644
--- a/src/plugins/Ui/skinned/shadedvisual.h
+++ b/src/plugins/Ui/skinned/shadedvisual.h
@@ -35,7 +35,7 @@ class ShadedVisual : public Visual
 {
     Q_OBJECT
 public:
-    ShadedVisual(QWidget *parent = 0);
+    ShadedVisual(QWidget *parent = nullptr);
 
     ~ShadedVisual();
 
diff --git a/src/plugins/Ui/skinned/shortcutdialog.h b/src/plugins/Ui/skinned/shortcutdialog.h
index 92c549ac7..5d9a13469 100644
--- a/src/plugins/Ui/skinned/shortcutdialog.h
+++ b/src/plugins/Ui/skinned/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/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)
diff --git a/src/plugins/Ui/skinned/skin.h b/src/plugins/Ui/skinned/skin.h
index 6a6509aa3..3077f2f07 100644
--- a/src/plugins/Ui/skinned/skin.h
+++ b/src/plugins/Ui/skinned/skin.h
@@ -35,7 +35,7 @@ class Skin : public QObject
 {
     Q_OBJECT
 public:
-    Skin(QObject *parent = 0);
+    Skin(QObject *parent = nullptr);
 
     ~Skin();
 
diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h
index ec8e30467..4f2c0c757 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.h
+++ b/src/plugins/Ui/skinned/skinnedsettings.h
@@ -32,7 +32,7 @@ class SkinnedSettings : public QWidget
 {
     Q_OBJECT
 public:
-    explicit SkinnedSettings(QWidget *parent = 0);
+    explicit SkinnedSettings(QWidget *parent = nullptr);
     virtual ~SkinnedSettings();
     void writeSettings();
 
diff --git a/src/plugins/Ui/skinned/skinreader.h b/src/plugins/Ui/skinned/skinreader.h
index ce76075f2..cebda0cb7 100644
--- a/src/plugins/Ui/skinned/skinreader.h
+++ b/src/plugins/Ui/skinned/skinreader.h
@@ -33,7 +33,7 @@ class SkinReader : public QObject
 {
     Q_OBJECT
 public:
-    SkinReader(QObject *parent = 0);
+    SkinReader(QObject *parent = nullptr);
 
     ~SkinReader();
 
diff --git a/src/plugins/Ui/skinned/symboldisplay.h b/src/plugins/Ui/skinned/symboldisplay.h
index 50761d08c..4f232ae01 100644
--- a/src/plugins/Ui/skinned/symboldisplay.h
+++ b/src/plugins/Ui/skinned/symboldisplay.h
@@ -32,7 +32,7 @@ class SymbolDisplay : public PixmapWidget
 {
     Q_OBJECT
 public:
-    SymbolDisplay(QWidget *parent = 0, int digits = 3);
+    SymbolDisplay(QWidget *parent = nullptr, int digits = 3);
 
     virtual ~SymbolDisplay();
 
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index 078455588..9167cc0fa 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -42,7 +42,7 @@ TextScroller::TextScroller (QWidget *parent) : QWidget (parent)
 {
     m_pressed = false;
     m_press_pos = 0;
-    m_metrics = 0;
+    m_metrics = nullptr;
     m_defautText = QString("Qmmp ") + Qmmp::strVersion();
     m_formater.setPattern(TITLE_FORMAT);
     m_core = SoundCore::instance();
@@ -234,14 +234,14 @@ void TextScroller::processState(Qmmp::State state)
     }
     case Qmmp::Playing:
     {
-        disconnect(m_core, SIGNAL(bufferingProgress(int)), this, 0);
+        disconnect(m_core, SIGNAL(bufferingProgress(int)), this, nullptr);
         m_bufferText.clear();
         updateText();
         break;
     }
     case Qmmp::Stopped:
     {
-        disconnect(m_core, SIGNAL(bufferingProgress(int)), this, 0);
+        disconnect(m_core, SIGNAL(bufferingProgress(int)), this, nullptr);
         break;
     }
     default:
diff --git a/src/plugins/Ui/skinned/textscroller.h b/src/plugins/Ui/skinned/textscroller.h
index 5dbf523be..2785b18ba 100644
--- a/src/plugins/Ui/skinned/textscroller.h
+++ b/src/plugins/Ui/skinned/textscroller.h
@@ -37,7 +37,7 @@ class TextScroller : public QWidget
 {
 Q_OBJECT
 public:
-    TextScroller(QWidget *parent = 0);
+    TextScroller(QWidget *parent = nullptr);
     virtual ~TextScroller();
 
     void setText(const QString &text);
diff --git a/src/plugins/Ui/skinned/timeindicator.h b/src/plugins/Ui/skinned/timeindicator.h
index 7f3721405..82ca728fd 100644
--- a/src/plugins/Ui/skinned/timeindicator.h
+++ b/src/plugins/Ui/skinned/timeindicator.h
@@ -35,7 +35,7 @@ class Skin;
 class TimeIndicatorModel : public QObject {
     Q_OBJECT
 public:
-    TimeIndicatorModel(QObject *parent = 0);
+    TimeIndicatorModel(QObject *parent = nullptr);
     ~TimeIndicatorModel();
 
     int position() { return m_position; }
@@ -77,7 +77,7 @@ class TimeIndicator : public PixmapWidget
 {
     Q_OBJECT
 public:
-    TimeIndicator(TimeIndicatorModel *model, QWidget *parent = 0);
+    TimeIndicator(TimeIndicatorModel *model, QWidget *parent = nullptr);
     ~TimeIndicator();
 
 protected:
diff --git a/src/plugins/Ui/skinned/titlebar.cpp b/src/plugins/Ui/skinned/titlebar.cpp
index 3b0f47a44..81ba910a7 100644
--- a/src/plugins/Ui/skinned/titlebar.cpp
+++ b/src/plugins/Ui/skinned/titlebar.cpp
@@ -45,10 +45,10 @@ TitleBar::TitleBar(TimeIndicatorModel *model, QWidget *parent)
     setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_A));
     m_mw = qobject_cast<MainWindow*>(parent->parent());
     m_shaded = false;
-    m_shade2 = 0;
-    m_currentTime = 0;
-    m_control = 0;
-    m_visual = 0;
+    m_shade2 = nullptr;
+    m_currentTime = nullptr;
+    m_control = nullptr;
+    m_visual = nullptr;
     //buttons
     m_menu = new Button(this,Skin::BT_MENU_N,Skin::BT_MENU_P, Skin::CUR_MAINMENU);
     connect(m_menu,SIGNAL(clicked()),this,SLOT(showMainMenu()));
@@ -184,10 +184,10 @@ void TitleBar::shade()
         m_control->deleteLater();
         Visual::remove(m_visual);
         m_visual->deleteLater();
-        m_shade2 = 0;
-        m_currentTime = 0;
-        m_control = 0;
-        m_visual = 0;
+        m_shade2 = nullptr;
+        m_currentTime = nullptr;
+        m_control = nullptr;
+        m_visual = nullptr;
         m_shade->show();
     }
     qobject_cast<MainDisplay *> (parent())->setMinimalMode(m_shaded);
diff --git a/src/plugins/Ui/skinned/titlebar.h b/src/plugins/Ui/skinned/titlebar.h
index a2c7b98d3..284ee12d1 100644
--- a/src/plugins/Ui/skinned/titlebar.h
+++ b/src/plugins/Ui/skinned/titlebar.h
@@ -42,7 +42,7 @@ class TitleBar : public PixmapWidget
 {
 Q_OBJECT
 public:
-    TitleBar(TimeIndicatorModel *model, QWidget *parent = 0);
+    TitleBar(TimeIndicatorModel *model, QWidget *parent = nullptr);
 
     ~TitleBar();
 
diff --git a/src/plugins/Ui/skinned/titlebarcontrol.h b/src/plugins/Ui/skinned/titlebarcontrol.h
index a2fd5a051..46c3a7975 100644
--- a/src/plugins/Ui/skinned/titlebarcontrol.h
+++ b/src/plugins/Ui/skinned/titlebarcontrol.h
@@ -31,7 +31,7 @@ class TitleBarControl : public QWidget
 {
 Q_OBJECT
 public:
-    TitleBarControl(QWidget *parent = 0);
+    TitleBarControl(QWidget *parent = nullptr);
     ~TitleBarControl();
 
 signals:
diff --git a/src/plugins/Ui/skinned/visualmenu.cpp b/src/plugins/Ui/skinned/visualmenu.cpp
index ba6409c55..cf99d361a 100644
--- a/src/plugins/Ui/skinned/visualmenu.cpp
+++ b/src/plugins/Ui/skinned/visualmenu.cpp
@@ -25,7 +25,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/skinned/visualmenu.h b/src/plugins/Ui/skinned/visualmenu.h
index 301ce4e4e..2994e40dd 100644
--- a/src/plugins/Ui/skinned/visualmenu.h
+++ b/src/plugins/Ui/skinned/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/skinned/volumebar.h b/src/plugins/Ui/skinned/volumebar.h
index 96a2315c7..7e8d83ecd 100644
--- a/src/plugins/Ui/skinned/volumebar.h
+++ b/src/plugins/Ui/skinned/volumebar.h
@@ -32,7 +32,7 @@ class VolumeBar : public PixmapWidget
 {
 Q_OBJECT
 public:
-    VolumeBar(QWidget *parent = 0);
+    VolumeBar(QWidget *parent = nullptr);
 
     ~VolumeBar();