diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-07-18 17:21:21 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-07-18 17:21:21 +0000 |
| commit | ef7a934ed7220b6f597e5ef1b6f85730b0fee25b (patch) | |
| tree | 434e9d125946cb02f865a22e9a7c556349cba0cb | |
| parent | 09eafb312823cb995cffc98cfd8f0de4ee7526b3 (diff) | |
| download | qmmp-ef7a934ed7220b6f597e5ef1b6f85730b0fee25b.tar.gz qmmp-ef7a934ed7220b6f597e5ef1b6f85730b0fee25b.tar.bz2 qmmp-ef7a934ed7220b6f597e5ef1b6f85730b0fee25b.zip | |
refactoring
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@10180 90c681e8-e032-0410-971d-27865f9a5e38
26 files changed, 70 insertions, 120 deletions
diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp index b8c3ea2c9..70b09df87 100644 --- a/src/plugins/Ui/qsui/logo.cpp +++ b/src/plugins/Ui/qsui/logo.cpp @@ -29,30 +29,32 @@ Logo::Logo(QWidget *parent) : Visual(parent) { QPixmap pixmap(":/qsui/terminus.png"); - m_letters.insert('0', pixmap.copy(0, 0, 8, 14)); - m_letters.insert('1', pixmap.copy(8, 0, 8, 14)); - m_letters.insert('2', pixmap.copy(16, 0, 8, 14)); - m_letters.insert('3', pixmap.copy(24, 0, 8, 14)); - m_letters.insert('4', pixmap.copy(32, 0, 8, 14)); - m_letters.insert('5', pixmap.copy(40, 0, 8, 14)); - m_letters.insert('6', pixmap.copy(48, 0, 8, 14)); - m_letters.insert('7', pixmap.copy(56, 0, 8, 14)); - m_letters.insert('8', pixmap.copy(64, 0, 8, 14)); - m_letters.insert('9', pixmap.copy(72, 0, 8, 14)); - m_letters.insert('A', pixmap.copy(80, 0, 8, 14)); - m_letters.insert('B', pixmap.copy(88, 0, 8, 14)); - m_letters.insert('C', pixmap.copy(96, 0, 8, 14)); - m_letters.insert('D', pixmap.copy(104, 0, 8, 14)); - m_letters.insert('E', pixmap.copy(112, 0, 8, 14)); - m_letters.insert('F', pixmap.copy(120, 0, 8, 14)); - m_letters.insert('/', pixmap.copy(128, 0, 8, 14)); - m_letters.insert('|', pixmap.copy(136, 0, 8, 14)); - m_letters.insert('\\', pixmap.copy(144, 0, 8, 14)); - m_letters.insert('_', pixmap.copy(152, 0, 8, 14)); - m_letters.insert('-', pixmap.copy(160, 0, 8, 14)); - m_letters.insert('X', pixmap.copy(168, 0, 8, 14)); - m_letters.insert('.', pixmap.copy(176, 0, 8, 14)); - m_letters.insert(' ', pixmap.copy(184, 0, 8, 14)); + m_letters = { + { '0', pixmap.copy(0, 0, 8, 14) }, + { '1', pixmap.copy(8, 0, 8, 14) }, + { '2', pixmap.copy(16, 0, 8, 14) }, + { '3', pixmap.copy(24, 0, 8, 14) }, + { '4', pixmap.copy(32, 0, 8, 14) }, + { '5', pixmap.copy(40, 0, 8, 14) }, + { '6', pixmap.copy(48, 0, 8, 14) }, + { '7', pixmap.copy(56, 0, 8, 14) }, + { '8', pixmap.copy(64, 0, 8, 14) }, + { '9', pixmap.copy(72, 0, 8, 14) }, + { 'A', pixmap.copy(80, 0, 8, 14) }, + { 'B', pixmap.copy(88, 0, 8, 14) }, + { 'C', pixmap.copy(96, 0, 8, 14) }, + { 'D', pixmap.copy(104, 0, 8, 14) }, + { 'E', pixmap.copy(112, 0, 8, 14) }, + { 'F', pixmap.copy(120, 0, 8, 14) }, + { '/', pixmap.copy(128, 0, 8, 14) }, + { '|', pixmap.copy(136, 0, 8, 14) }, + { '\\', pixmap.copy(144, 0, 8, 14) }, + { '_', pixmap.copy(152, 0, 8, 14) }, + { '-', pixmap.copy(160, 0, 8, 14) }, + { 'X', pixmap.copy(168, 0, 8, 14) }, + { '.', pixmap.copy(176, 0, 8, 14) }, + { ' ', pixmap.copy(184, 0, 8, 14) } + }; QFile file(":/ascii_logo.txt"); file.open(QIODevice::ReadOnly | QIODevice::Text); diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp index b3ec54a44..8e4fb2976 100644 --- a/src/plugins/Ui/skinned/dock.cpp +++ b/src/plugins/Ui/skinned/dock.cpp @@ -41,7 +41,6 @@ Dock::Dock (QObject *parent) : QObject (parent) { m_instance = this; - m_mainWidget = nullptr; } Dock::~Dock() diff --git a/src/plugins/Ui/skinned/dock.h b/src/plugins/Ui/skinned/dock.h index e8e39fc16..d730ff424 100644 --- a/src/plugins/Ui/skinned/dock.h +++ b/src/plugins/Ui/skinned/dock.h @@ -51,7 +51,7 @@ private: bool isDocked(QWidget*, QWidget*); bool isUnder(QWidget*, QWidget*, int); static Dock *m_instance; - QWidget *m_mainWidget; + QWidget *m_mainWidget = nullptr; QList <QWidget *> m_widgetList; QList <bool> m_dockedList; QList <QPoint> m_delta_list; diff --git a/src/plugins/Ui/skinned/eqpreset.cpp b/src/plugins/Ui/skinned/eqpreset.cpp index 41318a84e..158d7caa5 100644 --- a/src/plugins/Ui/skinned/eqpreset.cpp +++ b/src/plugins/Ui/skinned/eqpreset.cpp @@ -26,12 +26,7 @@ EQPreset::EQPreset() : QListWidgetItem() -{ - m_preamp = 0; - for(int i = 0; i < 10; ++i) - m_bands[i] = 0; -} - +{} EQPreset::~EQPreset() {} diff --git a/src/plugins/Ui/skinned/eqpreset.h b/src/plugins/Ui/skinned/eqpreset.h index 194a3c2fd..34d81eae0 100644 --- a/src/plugins/Ui/skinned/eqpreset.h +++ b/src/plugins/Ui/skinned/eqpreset.h @@ -39,8 +39,8 @@ public: double preamp(); private: - double m_bands[10]; - double m_preamp; + double m_bands[10] = { 0 }; + double m_preamp = 0; }; diff --git a/src/plugins/Ui/skinned/eqslider.cpp b/src/plugins/Ui/skinned/eqslider.cpp index f1a75415f..5c4be6e6a 100644 --- a/src/plugins/Ui/skinned/eqslider.cpp +++ b/src/plugins/Ui/skinned/eqslider.cpp @@ -27,12 +27,8 @@ EqSlider::EqSlider(QWidget *parent): PixmapWidget(parent) { m_skin = Skin::instance(); - connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); + connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin())); setPixmap(m_skin->getEqSlider(0)); - m_moving = false; - m_min = -20; - m_max = 20; - m_old = m_value = 0; draw(false); setCursor(m_skin->getCursor(Skin::CUR_EQSLID)); } diff --git a/src/plugins/Ui/skinned/eqslider.h b/src/plugins/Ui/skinned/eqslider.h index 0ca38c380..f5774ef53 100644 --- a/src/plugins/Ui/skinned/eqslider.h +++ b/src/plugins/Ui/skinned/eqslider.h @@ -51,9 +51,9 @@ private slots: private: Skin *m_skin; - bool m_moving; + bool m_moving = false; int press_pos; - double m_max, m_min, m_pos, m_value, m_old; + double m_max = 20, m_min = -20, m_pos = 0, m_value = 0, m_old = 0; QPixmap m_pixmap; double convert(int); // value = convert(position); void draw(bool pressed = true); diff --git a/src/plugins/Ui/skinned/eqtitlebar.cpp b/src/plugins/Ui/skinned/eqtitlebar.cpp index a6d202bfe..b60c4c3fd 100644 --- a/src/plugins/Ui/skinned/eqtitlebar.cpp +++ b/src/plugins/Ui/skinned/eqtitlebar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2013 by Ilya Kotov * + * Copyright (C) 2007-2021 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,13 +32,6 @@ EqTitleBar::EqTitleBar(QWidget *parent) : PixmapWidget(parent) { - m_volumeBar = nullptr; - m_balanceBar = nullptr; - m_shade2 = nullptr; - m_left = 0; - m_right = 0; - m_shaded = false; - m_align = false; m_skin = Skin::instance(); m_eq = parentWidget(); m_mw = qobject_cast<MainWindow*>(m_eq->parent()); diff --git a/src/plugins/Ui/skinned/eqtitlebar.h b/src/plugins/Ui/skinned/eqtitlebar.h index 6e56ab72e..b1b17af9f 100644 --- a/src/plugins/Ui/skinned/eqtitlebar.h +++ b/src/plugins/Ui/skinned/eqtitlebar.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2013 by Ilya Kotov * + * Copyright (C) 2007-2021 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -48,17 +48,17 @@ private slots: private: void updatePositions(); Skin* m_skin; - int m_left; - int m_right; + int m_left = 0; + int m_right = 0; QPoint m_pos; QWidget* m_eq; MainWindow* m_mw; Button* m_close; Button* m_shade; - Button* m_shade2; - bool m_shaded, m_align; - ShadedBar* m_volumeBar; - ShadedBar* m_balanceBar; + Button* m_shade2 = nullptr; + bool m_shaded = false, m_align = false; + ShadedBar* m_volumeBar = nullptr; + ShadedBar* m_balanceBar = nullptr; protected: void mousePressEvent(QMouseEvent*) override; diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp index 34e076345..1d6c8a307 100644 --- a/src/plugins/Ui/skinned/eqwidget.cpp +++ b/src/plugins/Ui/skinned/eqwidget.cpp @@ -45,7 +45,6 @@ EqWidget::EqWidget (QWidget *parent) : PixmapWidget (parent) { setWindowTitle(tr("Equalizer")); - m_shaded = false; m_skin = Skin::instance(); setPixmap (m_skin->getEqPart (Skin::EQ_MAIN), true); setCursor (m_skin->getCursor (Skin::CUR_EQNORMAL)); diff --git a/src/plugins/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h index 63d0098b9..6e7b3c007 100644 --- a/src/plugins/Ui/skinned/eqwidget.h +++ b/src/plugins/Ui/skinned/eqwidget.h @@ -95,7 +95,7 @@ private: QMenu *m_presetsMenu; QList<EQPreset*> m_presets; QList<EQPreset*> m_autoPresets; - bool m_shaded; + bool m_shaded = false; }; #endif diff --git a/src/plugins/Ui/skinned/horizontalslider.cpp b/src/plugins/Ui/skinned/horizontalslider.cpp index 45a61c740..e898380c3 100644 --- a/src/plugins/Ui/skinned/horizontalslider.cpp +++ b/src/plugins/Ui/skinned/horizontalslider.cpp @@ -30,9 +30,6 @@ HorizontalSlider::HorizontalSlider(QWidget *parent) : QWidget(parent) { m_skin = Skin::instance(); - m_min = 0; - m_max = 100; - m_value = 0; connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); updateSkin(); } diff --git a/src/plugins/Ui/skinned/horizontalslider.h b/src/plugins/Ui/skinned/horizontalslider.h index 3933d4a31..a702e2238 100644 --- a/src/plugins/Ui/skinned/horizontalslider.h +++ b/src/plugins/Ui/skinned/horizontalslider.h @@ -53,9 +53,9 @@ private: int sliderSize() const; Skin *m_skin; - int m_old_value, m_value; - int m_press_pos; - int m_min, m_max, m_slider_pos; + int m_old_value = -1, m_value = 0; + int m_press_pos = 0; + int m_min = 0, m_max = 100, m_slider_pos = 0; QColor m_normal, m_normal_bg; }; diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index 2a7fe390c..d96e9c53e 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.cpp @@ -58,8 +58,6 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent) m_ui_settings = QmmpUiSettings::instance(); m_skin = Skin::instance(); m_ratio = m_skin->ratio(); - m_pl_browser = nullptr; - m_pl_selector = nullptr; #ifdef QMMP_WS_X11 QString wm_name = WindowSystem::netWindowManagerName(); diff --git a/src/plugins/Ui/skinned/playlistslider.cpp b/src/plugins/Ui/skinned/playlistslider.cpp index 020c70d2b..87132cd59 100644 --- a/src/plugins/Ui/skinned/playlistslider.cpp +++ b/src/plugins/Ui/skinned/playlistslider.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2015 by Ilya Kotov * + * Copyright (C) 2006-2021 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -29,16 +29,10 @@ PlayListSlider::PlayListSlider(QWidget *parent) : QWidget(parent) { m_skin = Skin::instance(); - m_moving = false; - m_pressed = false; - m_min = 0; - m_max = 0; - m_value = 0; connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setCursor(m_skin->getCursor(Skin::CUR_PVSCROLL)); } - PlayListSlider::~PlayListSlider() {} diff --git a/src/plugins/Ui/skinned/playlistslider.h b/src/plugins/Ui/skinned/playlistslider.h index 83aaad957..3484e3bb0 100644 --- a/src/plugins/Ui/skinned/playlistslider.h +++ b/src/plugins/Ui/skinned/playlistslider.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2015 by Ilya Kotov * + * Copyright (C) 2006-2021 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -46,9 +46,9 @@ private slots: private: Skin *m_skin; int m_old; - bool m_moving, m_pressed; - int m_press_pos; - int m_min, m_max, m_value, m_pos; + bool m_moving = false, m_pressed = false; + int m_press_pos = 0; + int m_min = 0, m_max = 0, m_value = 0, m_pos = 0; int convert(int); // value = convert(position); protected: diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp index 4a79a2743..e69adb3cd 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.cpp +++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp @@ -35,13 +35,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) : PixmapWidget(parent) { - m_active = false; - m_resize = false; m_formatter.setPattern(TITLE_FORMAT); - m_shade2 = nullptr; - m_model = nullptr; - m_shaded = false; - m_align = false; m_skin = Skin::instance(); m_ratio = m_skin->ratio(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); diff --git a/src/plugins/Ui/skinned/playlisttitlebar.h b/src/plugins/Ui/skinned/playlisttitlebar.h index b470dd808..71d285560 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.h +++ b/src/plugins/Ui/skinned/playlisttitlebar.h @@ -55,17 +55,17 @@ private: void updatePixmap(); Skin *m_skin; QPoint pos; - bool m_active; + bool m_active = false; PlayList* m_pl; MainWindow* m_mw; - Button* m_close; - Button* m_shade; - Button* m_shade2; - bool m_shaded; - bool m_align, m_resize; + Button *m_close; + Button *m_shade = nullptr; + Button *m_shade2 = nullptr; + bool m_shaded = false; + bool m_align = false, m_resize = false; int m_ratio; int m_height; - PlayListModel* m_model; + PlayListModel* m_model = nullptr; QString m_text; QString m_truncatedText; QFont m_font; diff --git a/src/plugins/Ui/skinned/positionbar.cpp b/src/plugins/Ui/skinned/positionbar.cpp index a811164b3..782c8439d 100644 --- a/src/plugins/Ui/skinned/positionbar.cpp +++ b/src/plugins/Ui/skinned/positionbar.cpp @@ -31,10 +31,6 @@ PositionBar::PositionBar(QWidget *parent) : PixmapWidget(parent) m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getPosBar()); - m_moving = false; - m_min = 0; - m_max = 0; - m_old = m_value = 0; draw(false); setCursor(m_skin->getCursor(Skin::CUR_POSBAR)); } diff --git a/src/plugins/Ui/skinned/positionbar.h b/src/plugins/Ui/skinned/positionbar.h index 9456aaea6..da12cf6aa 100644 --- a/src/plugins/Ui/skinned/positionbar.h +++ b/src/plugins/Ui/skinned/positionbar.h @@ -56,9 +56,9 @@ private: void mouseMoveEvent(QMouseEvent*) override; void wheelEvent(QWheelEvent *e) override; Skin *m_skin; - bool m_moving; + bool m_moving = false; qint64 press_pos; - qint64 m_max, m_min, m_pos, m_value, m_old; + qint64 m_max = 0, m_min = 0, m_pos, m_value = 0, m_old = 0; QPixmap m_pixmap; qint64 convert(qint64); // value = convert(position); void draw(bool pressed = true); diff --git a/src/plugins/Ui/skinned/volumebar.cpp b/src/plugins/Ui/skinned/volumebar.cpp index dadf82c96..1119b83f9 100644 --- a/src/plugins/Ui/skinned/volumebar.cpp +++ b/src/plugins/Ui/skinned/volumebar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2013 by Ilya Kotov * + * Copyright (C) 2006-2021 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,10 +32,6 @@ VolumeBar::VolumeBar(QWidget *parent) : PixmapWidget(parent) m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getVolumeBar(0)); - m_moving = false; - m_min = 0; - m_max = 100; - m_old = m_value = 0; draw(false); } diff --git a/src/plugins/Ui/skinned/volumebar.h b/src/plugins/Ui/skinned/volumebar.h index 7a5db65cb..a712e9651 100644 --- a/src/plugins/Ui/skinned/volumebar.h +++ b/src/plugins/Ui/skinned/volumebar.h @@ -23,7 +23,6 @@ #include "pixmapwidget.h" class Skin; -class MainWindow; /** @author Ilya Kotov <forkotov02@ya.ru> @@ -59,11 +58,10 @@ private slots: private: Skin *m_skin; - bool m_moving; - int press_pos; - int m_max, m_min, m_pos, m_value, m_old; + bool m_moving = false; + int press_pos = -1; + int m_max = 100, m_min = 0, m_pos, m_value = 0, m_old = 0; QPixmap m_pixmap; - MainWindow *mw; int convert(int); // value = convert(position); void draw(bool pressed = true); diff --git a/src/qmmp/replaygain.cpp b/src/qmmp/replaygain.cpp index 29e9c2191..5bd37f2eb 100644 --- a/src/qmmp/replaygain.cpp +++ b/src/qmmp/replaygain.cpp @@ -23,9 +23,7 @@ #include "replaygain_p.h" ReplayGain::ReplayGain() -{ - m_mode = QmmpSettings::REPLAYGAIN_DISABLED; -} +{} ReplayGain::~ReplayGain() {} diff --git a/src/qmmp/replaygain_p.h b/src/qmmp/replaygain_p.h index 55a11164b..0b222d58f 100644 --- a/src/qmmp/replaygain_p.h +++ b/src/qmmp/replaygain_p.h @@ -44,7 +44,7 @@ public: private: void updateScale(); QMap<Qmmp::ReplayGainKey, double> m_info; - QmmpSettings::ReplayGainMode m_mode; + QmmpSettings::ReplayGainMode m_mode = QmmpSettings::REPLAYGAIN_DISABLED; double m_scale = 1.0; double m_preamp = 0.0; double m_default_gain = 0.0; diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp index ab453dcf1..c9594ace9 100644 --- a/src/qmmp/statehandler.cpp +++ b/src/qmmp/statehandler.cpp @@ -38,11 +38,6 @@ StateHandler::StateHandler(QObject *parent) qFatal("StateHandler: only one instance is allowed"); qRegisterMetaType<AudioParameters>("AudioParameters"); m_instance = this; - m_elapsed = -1; - m_duration = 0; - m_bitrate = 0; - m_sendAboutToFinish = true; - m_state = Qmmp::Stopped; } StateHandler::~StateHandler() diff --git a/src/qmmp/statehandler.h b/src/qmmp/statehandler.h index 9319fa9a4..35a577f3f 100644 --- a/src/qmmp/statehandler.h +++ b/src/qmmp/statehandler.h @@ -135,14 +135,14 @@ signals: private: - qint64 m_elapsed; - qint64 m_duration; - bool m_sendAboutToFinish; - int m_bitrate; + qint64 m_elapsed = -1; + qint64 m_duration = 0; + bool m_sendAboutToFinish = true; + int m_bitrate = 0; static StateHandler* m_instance; TrackInfo m_info; QHash <QString, QString> m_streamInfo; - Qmmp::State m_state; + Qmmp::State m_state = Qmmp::Stopped; AudioParameters m_audioParameters; mutable QMutex m_mutex; }; |
