improved code style

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9585 90c681e8-e032-0410-971d-27865f9a5e38

10 files changed, 13 insertions, 23 deletions

diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index b2ec35881..ec1004836 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -33,9 +33,6 @@ FileLoader::FileLoader(QObject *parent) : QThread(parent)
 {
     qRegisterMetaType<QList<PlayListTrack*> >("QList<PlayListTrack*>");
     m_settings = QmmpUiSettings::instance();
-    m_finished = false;
-    m_readMetaDataForPlayLists = true;
-    m_parts = TrackInfo::Parts();
     connect(qApp, SIGNAL(aboutToQuit()), SLOT(finish()));
 }
 
diff --git a/src/qmmpui/fileloader_p.h b/src/qmmpui/fileloader_p.h
index 070560047..aa0afd08a 100644
--- a/src/qmmpui/fileloader_p.h
+++ b/src/qmmpui/fileloader_p.h
@@ -100,9 +100,9 @@ private:
     QQueue <LoaderTask> m_tasks;
     QStringList m_filters;
     QmmpUiSettings *m_settings;
-    bool m_finished;
-    bool m_readMetaDataForPlayLists;
-    TrackInfo::Parts m_parts;
+    bool m_finished = false;
+    bool m_readMetaDataForPlayLists = false;
+    TrackInfo::Parts m_parts = TrackInfo::Parts();
     QMutex m_mutex;
 
 };
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index d6f2d9975..a5f223102 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -35,9 +35,9 @@ MediaPlayer::MediaPlayer(QObject *parent)
     if(m_instance)
         qFatal("StateHandler: only one instance is allowed");
     m_instance = this;
-    m_pl_manager = nullptr;
-    m_core = nullptr;
-    m_skips = 0;
+    m_core = new SoundCore(this);
+    m_settings = new QmmpUiSettings(this);
+    m_pl_manager = new PlayListManager(this);
     m_finishTimer = new QTimer(this);
     m_finishTimer->setSingleShot(true);
     m_finishTimer->setInterval(500);
@@ -46,9 +46,7 @@ MediaPlayer::MediaPlayer(QObject *parent)
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/libqmmpui_") + locale);
     qApp->installTranslator(translator);
-    m_core = new SoundCore(this);
-    m_settings = new QmmpUiSettings(this);
-    m_pl_manager = new PlayListManager(this);
+
     connect(m_core, SIGNAL(nextTrackRequest()), SLOT(updateNextUrl()));
     connect(m_core, SIGNAL(finished()), SLOT(playNext()));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(processState(Qmmp::State)));
diff --git a/src/qmmpui/mediaplayer.h b/src/qmmpui/mediaplayer.h
index 29174874d..92403fedd 100644
--- a/src/qmmpui/mediaplayer.h
+++ b/src/qmmpui/mediaplayer.h
@@ -90,7 +90,7 @@ private:
     PlayListManager *m_pl_manager;
     SoundCore *m_core;
     static MediaPlayer* m_instance;
-    int m_skips;
+    int m_skips = 0;
     QString m_nextUrl;
     QTimer *m_finishTimer;
 };
diff --git a/src/qmmpui/playlistheadermodel.cpp b/src/qmmpui/playlistheadermodel.cpp
index 5e16be5d0..9077dd88b 100644
--- a/src/qmmpui/playlistheadermodel.cpp
+++ b/src/qmmpui/playlistheadermodel.cpp
@@ -30,7 +30,6 @@ PlayListHeaderModel::PlayListHeaderModel(QObject *parent) :
     QObject(parent)
 {
     m_helper = MetaDataHelper::instance();
-    m_settings_loaded = false;
 
     ColumnHeader col;
     col.name = tr("Artist - Title");
diff --git a/src/qmmpui/playlistheadermodel.h b/src/qmmpui/playlistheadermodel.h
index aae68baa0..13098749c 100644
--- a/src/qmmpui/playlistheadermodel.h
+++ b/src/qmmpui/playlistheadermodel.h
@@ -161,7 +161,7 @@ private:
         QHash<int, QVariant> data;
     };
     QList<ColumnHeader> m_columns;
-    bool m_settings_loaded;
+    bool m_settings_loaded = false;
     MetaDataHelper *m_helper;
 };
 
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index f9c29ce29..5fb5d0965 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -23,9 +23,7 @@
 #include "playlistitem.h"
 
 PlayListItem::PlayListItem()
-{
-    m_selected = false;
-}
+{}
 
 PlayListItem::~PlayListItem()
 {}
diff --git a/src/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h
index 080129618..9097f2f04 100644
--- a/src/qmmpui/playlistitem.h
+++ b/src/qmmpui/playlistitem.h
@@ -78,7 +78,7 @@ public:
     virtual int trackIndex() const;
 
 private:
-    bool m_selected;
+    bool m_selected = false;
 };
 
 #endif
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 3b128745a..02ca9731b 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -40,8 +40,6 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent)
     m_instance = this;
     m_ui_settings = QmmpUiSettings::instance();
     m_header = new PlayListHeaderModel(this);
-    m_current = nullptr;
-    m_selected = nullptr;
     m_timer = new QTimer(this);
     m_timer->setInterval(5000);
     m_timer->setSingleShot(true);
diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h
index 5352eef43..c1a5c08ae 100644
--- a/src/qmmpui/playlistmanager.h
+++ b/src/qmmpui/playlistmanager.h
@@ -268,8 +268,8 @@ private:
     void readPlayLists();
     static PlayListManager* m_instance;
     QList <PlayListModel *> m_models;
-    PlayListModel *m_current;
-    PlayListModel *m_selected;
+    PlayListModel *m_current = nullptr;
+    PlayListModel *m_selected = nullptr;
     QTimer *m_timer;
     PlayListHeaderModel *m_header;
     QmmpUiSettings *m_ui_settings;