From 48c7312f4ba78ccf2947a9b4b0e6fd2bcdcb3066 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 2 Jan 2021 19:12:15 +0000 Subject: improved coding style git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9614 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/qsui/eqpreset.cpp | 12 ++++-------- src/plugins/Ui/qsui/eqpreset.h | 10 +++++----- src/plugins/Ui/qsui/filesystembrowser.cpp | 12 +++++------- src/plugins/Ui/qsui/filesystembrowser.h | 2 +- src/plugins/Ui/qsui/keyboardmanager.cpp | 2 -- src/plugins/Ui/qsui/keyboardmanager.h | 2 +- src/plugins/Ui/qsui/listwidgetdrawer.cpp | 14 -------------- src/plugins/Ui/qsui/listwidgetdrawer.h | 28 ++++++++++++++-------------- src/plugins/Ui/qsui/playlistheader.cpp | 11 ----------- src/plugins/Ui/qsui/playlistheader.h | 18 +++++++++--------- src/plugins/Ui/qsui/popupwidget.cpp | 2 +- src/plugins/Ui/qsui/qsuitabwidget.cpp | 2 -- src/plugins/Ui/qsui/qsuitabwidget.h | 4 ++-- 13 files changed, 42 insertions(+), 77 deletions(-) (limited to 'src/plugins/Ui') diff --git a/src/plugins/Ui/qsui/eqpreset.cpp b/src/plugins/Ui/qsui/eqpreset.cpp index 08bcf3f6f..e7a8563e4 100644 --- a/src/plugins/Ui/qsui/eqpreset.cpp +++ b/src/plugins/Ui/qsui/eqpreset.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2021 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,11 +20,7 @@ #include "eqpreset.h" EQPreset::EQPreset() -{ - m_preamp = 0; - for(int i = 0; i < 10; ++i) - m_bands[i] = 0; -} +{} EQPreset::~EQPreset() @@ -42,14 +38,14 @@ void EQPreset::setPreamp(double preamp) m_preamp = preamp; } -double EQPreset::gain(int n) +double EQPreset::gain(int n) const { if(n > 14 || n < 0) return 0; return m_bands[n]; } -double EQPreset::preamp() +double EQPreset::preamp() const { return m_preamp; } diff --git a/src/plugins/Ui/qsui/eqpreset.h b/src/plugins/Ui/qsui/eqpreset.h index 4f61fc8c4..76714ae0d 100644 --- a/src/plugins/Ui/qsui/eqpreset.h +++ b/src/plugins/Ui/qsui/eqpreset.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2021 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,12 +33,12 @@ public: void setGain(int n, double value); void setPreamp(double); - double gain(int n); - double preamp(); + double gain(int n) const; + double preamp() const; private: - double m_bands[15]; - double m_preamp; + double m_bands[15] = { 0 }; + double m_preamp = 0; }; diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp index cbc23a9f0..9fd4059aa 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.cpp +++ b/src/plugins/Ui/qsui/filesystembrowser.cpp @@ -40,12 +40,12 @@ public: explicit FileSystemFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {} protected: - virtual bool filterAcceptsRow( - int source_row, const QModelIndex &source_parent) const override { + virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override + { QFileSystemModel *sm = qobject_cast(sourceModel()); - if (source_parent == sm->index(sm->rootPath())) { + if (source_parent == sm->index(sm->rootPath())) return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent); - } + return true; } }; @@ -53,8 +53,6 @@ protected: FileSystemBrowser::FileSystemBrowser(QWidget *parent) : QWidget(parent) { - m_update = false; - m_listView = new QListView(this); m_listView->setFrameStyle(QFrame::NoFrame); m_listView->setDragEnabled(true); @@ -81,7 +79,7 @@ FileSystemBrowser::FileSystemBrowser(QWidget *parent) : m_fileSystemModel->setNameFilterDisables(false); m_fileSystemModel->setFilter(QDir::AllDirs | QDir::Files | QDir::NoDot); - m_proxyModel = new FileSystemFilterProxyModel(this); + m_proxyModel = new FileSystemFilterProxyModel(this); m_proxyModel->setDynamicSortFilter(true); m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); m_proxyModel->setSourceModel(m_fileSystemModel); diff --git a/src/plugins/Ui/qsui/filesystembrowser.h b/src/plugins/Ui/qsui/filesystembrowser.h index 0c816487b..0b957db22 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.h +++ b/src/plugins/Ui/qsui/filesystembrowser.h @@ -55,7 +55,7 @@ private slots: private: void setCurrentDirectory(const QString &path); - bool m_update; + bool m_update = false; Utils::ElidingLabel *m_label; QFileSystemModel *m_fileSystemModel; QListView *m_listView; diff --git a/src/plugins/Ui/qsui/keyboardmanager.cpp b/src/plugins/Ui/qsui/keyboardmanager.cpp index b409d88b0..2ae2513ba 100644 --- a/src/plugins/Ui/qsui/keyboardmanager.cpp +++ b/src/plugins/Ui/qsui/keyboardmanager.cpp @@ -30,8 +30,6 @@ KeyboardManager::KeyboardManager(QObject *parent) : QObject(parent) { - m_listWidget = nullptr; - addAction(Qt::Key_Up, SLOT(processUp())); addAction(Qt::Key_Up + Qt::ShiftModifier, SLOT(processUp())); addAction(Qt::Key_Up + Qt::AltModifier, SLOT(processUp())); diff --git a/src/plugins/Ui/qsui/keyboardmanager.h b/src/plugins/Ui/qsui/keyboardmanager.h index 6aac5d228..18cb5db82 100644 --- a/src/plugins/Ui/qsui/keyboardmanager.h +++ b/src/plugins/Ui/qsui/keyboardmanager.h @@ -50,7 +50,7 @@ private slots: private: QList m_actions; - ListWidget *m_listWidget; + ListWidget *m_listWidget = nullptr; void addAction(int keys, const char * method); enum SelectMode diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp index b78426e3f..dc6bd99df 100644 --- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp +++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp @@ -34,20 +34,6 @@ ListWidgetDrawer::ListWidgetDrawer() { m_header_model = PlayListManager::instance()->headerModel(); - m_update = false; - m_show_anchor = false; - m_show_number = false; - m_align_numbres = false; - m_show_lengths = false; - m_use_system_colors = false; - m_single_column = true; - m_show_splitters = true; - m_row_height = 0; - m_number_width = 0; - m_padding = 0; - m_metrics = nullptr; - m_extra_metrics = nullptr; - m_bold_metrics = nullptr; readSettings(); } diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.h b/src/plugins/Ui/qsui/listwidgetdrawer.h index 022299d07..8ae667516 100644 --- a/src/plugins/Ui/qsui/listwidgetdrawer.h +++ b/src/plugins/Ui/qsui/listwidgetdrawer.h @@ -97,22 +97,22 @@ public: private: QColor m_normal, m_current, m_normal_bg, m_selected_bg, m_alternate, m_highlighted, m_splitter; QColor m_group_bg, m_group_alt_bg, m_group_text, m_current_bg, m_current_alt_bg; - QFontMetrics *m_metrics; - QFontMetrics *m_extra_metrics; - QFontMetrics *m_bold_metrics; + QFontMetrics *m_metrics = nullptr; + QFontMetrics *m_extra_metrics = nullptr; + QFontMetrics *m_bold_metrics = nullptr; PlayListHeaderModel *m_header_model; QFont m_font, m_extra_font; - bool m_update; - bool m_show_number; - bool m_show_anchor; - bool m_align_numbres; - bool m_show_lengths; - bool m_use_system_colors; - bool m_single_column; - bool m_show_splitters; - int m_padding; - int m_number_width; - int m_row_height; + bool m_update = false; + bool m_show_number = false; + bool m_show_anchor = false; + bool m_align_numbres = false; + bool m_show_lengths = false; + bool m_use_system_colors = false; + bool m_single_column = true; + bool m_show_splitters = true; + int m_padding = 0; + int m_number_width = 0; + int m_row_height = 0; }; #endif // LISTWIDGETDRAWER_H diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp index b1fc59754..1709a34eb 100644 --- a/src/plugins/Ui/qsui/playlistheader.cpp +++ b/src/plugins/Ui/qsui/playlistheader.cpp @@ -52,17 +52,6 @@ PlayListHeader::PlayListHeader(QWidget *parent) : QWidget(parent) { setMouseTracking(true); - - m_pl_padding = 0; - m_number_width = 0; - m_offset = 0; - m_sorting_column = -1; - m_scrollbar_width = 0; - m_reverted = false; - m_auto_resize = false; - m_metrics = nullptr; - m_task = NO_TASK; - m_model = PlayListManager::instance()->headerModel(); //menus diff --git a/src/plugins/Ui/qsui/playlistheader.h b/src/plugins/Ui/qsui/playlistheader.h index 7b8d68a95..b3340f1a8 100644 --- a/src/plugins/Ui/qsui/playlistheader.h +++ b/src/plugins/Ui/qsui/playlistheader.h @@ -99,24 +99,24 @@ private: }; QSize m_size_hint; - QFontMetrics *m_metrics; + QFontMetrics *m_metrics = nullptr; QMenu *m_menu, *m_alignmentMenu; QPoint m_pressed_pos; QPoint m_mouse_pos; PlayListHeaderModel *m_model; QAction *m_trackStateAction; QAction *m_autoResizeAction; - bool m_reverted; - bool m_auto_resize; - int m_number_width; - int m_scrollbar_width; + bool m_reverted = false; + bool m_auto_resize = false; + int m_number_width = 0; + int m_scrollbar_width = 0; int m_pressed_column; int m_old_size; int m_press_offset; - int m_pl_padding; - int m_sorting_column; + int m_pl_padding = 0; + int m_sorting_column = -1; - int m_offset; + int m_offset = 0; enum { @@ -124,7 +124,7 @@ private: RESIZE, MOVE, SORT - } m_task; + } m_task = NO_TASK; }; diff --git a/src/plugins/Ui/qsui/popupwidget.cpp b/src/plugins/Ui/qsui/popupwidget.cpp index 264caef0a..3643c5c03 100644 --- a/src/plugins/Ui/qsui/popupwidget.cpp +++ b/src/plugins/Ui/qsui/popupwidget.cpp @@ -44,7 +44,7 @@ PopupWidget::PopupWidget(QWidget *parent) hlayout->addWidget(m_pixlabel); m_label1 = new QLabel(this); - hlayout->addWidget (m_label1); + hlayout->addWidget(m_label1); //settings QSettings settings(Qmmp::configFile(), QSettings::IniFormat); diff --git a/src/plugins/Ui/qsui/qsuitabwidget.cpp b/src/plugins/Ui/qsui/qsuitabwidget.cpp index 07e37811e..dc6647e0a 100644 --- a/src/plugins/Ui/qsui/qsuitabwidget.cpp +++ b/src/plugins/Ui/qsui/qsuitabwidget.cpp @@ -42,8 +42,6 @@ QSUiTabWidget::QSUiTabWidget(QWidget *parent) : QWidget(parent) setFocusPolicy(Qt::TabFocus); setFocusProxy(m_tabBar); - m_rightCornerWidget = nullptr; - m_leftCornerWidget = nullptr; m_menu = new QMenu(this); m_group = new QActionGroup(this); diff --git a/src/plugins/Ui/qsui/qsuitabwidget.h b/src/plugins/Ui/qsui/qsuitabwidget.h index 113771ed6..793d09ae8 100644 --- a/src/plugins/Ui/qsui/qsuitabwidget.h +++ b/src/plugins/Ui/qsui/qsuitabwidget.h @@ -84,8 +84,8 @@ private: QSUiTabBar *m_tabBar; ListWidget *m_listWidget; - QWidget *m_rightCornerWidget; - QWidget *m_leftCornerWidget; + QWidget *m_rightCornerWidget = nullptr; + QWidget *m_leftCornerWidget = nullptr; QRect m_panelRect; QMenu *m_menu; QActionGroup *m_group; -- cgit v1.2.3-13-gbd6f