aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/qsui
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Ui/qsui')
-rw-r--r--src/plugins/Ui/qsui/equalizer.cpp10
-rw-r--r--src/plugins/Ui/qsui/filesystembrowser.cpp2
-rw-r--r--src/plugins/Ui/qsui/listwidget.cpp24
-rw-r--r--src/plugins/Ui/qsui/listwidget.h24
-rw-r--r--src/plugins/Ui/qsui/listwidgetdrawer.cpp25
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp2
-rw-r--r--src/plugins/Ui/qsui/playlistbrowser.cpp6
-rw-r--r--src/plugins/Ui/qsui/playlistbrowser.h8
-rw-r--r--src/plugins/Ui/qsui/playlistheader.cpp12
-rw-r--r--src/plugins/Ui/qsui/qsuivisualization.h6
-rw-r--r--src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp2
-rw-r--r--src/plugins/Ui/qsui/shortcutdialog.h4
-rw-r--r--src/plugins/Ui/qsui/visualmenu.cpp8
-rw-r--r--src/plugins/Ui/qsui/visualmenu.h6
14 files changed, 59 insertions, 80 deletions
diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index 6777dc391..9e50cbc2c 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2016 by Ilya Kotov *
+ * Copyright (C) 2011-2020 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -94,11 +94,11 @@ Equalizer::Equalizer(QWidget *parent) : QDialog(parent)
slider->setRange(-20, 20);
slider->setTickPosition(QSlider::TicksLeft);
slider->setTickInterval(10);
- QLabel *label = new QLabel(this);
- label->setFrameShape(QFrame::Box);
- label->setText(names.at(i));
+ QLabel *eqLabel = new QLabel(this);
+ eqLabel->setFrameShape(QFrame::Box);
+ eqLabel->setText(names.at(i));
slidersLayout->addWidget(slider, 1, i, Qt::AlignHCenter);
- slidersLayout->addWidget(label, 2, i, Qt::AlignHCenter);
+ slidersLayout->addWidget(eqLabel, 2, i, Qt::AlignHCenter);
QLabel *label2 = new QLabel(this);
label2->setText(tr("%1dB").arg(0));
diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp
index 6215f9c92..1692c6568 100644
--- a/src/plugins/Ui/qsui/filesystembrowser.cpp
+++ b/src/plugins/Ui/qsui/filesystembrowser.cpp
@@ -37,7 +37,7 @@
class FileSystemFilterProxyModel : public QSortFilterProxyModel
{
public:
- FileSystemFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {}
+ explicit FileSystemFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {}
protected:
virtual bool filterAcceptsRow(
diff --git a/src/plugins/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp
index 823e31c1a..67771196d 100644
--- a/src/plugins/Ui/qsui/listwidget.cpp
+++ b/src/plugins/Ui/qsui/listwidget.cpp
@@ -41,33 +41,19 @@
#define INVALID_INDEX -1
-ListWidget::ListWidget(PlayListModel *model, QWidget *parent)
- : QWidget(parent)
+ListWidget::ListWidget(PlayListModel *model, QWidget *parent) : QWidget(parent),
+ m_pressed_index(INVALID_INDEX),
+ m_drop_index(INVALID_INDEX),
+ m_anchor_index(INVALID_INDEX),
+ m_model(model)
{
setFocusPolicy(Qt::StrongFocus);
- m_popupWidget = nullptr;
- m_ui_settings = QmmpUiSettings::instance();
- m_menu = nullptr;
- m_filterMode = false;
- m_model = model;
m_timer = new QTimer(this);
m_timer->setInterval(50);
-
m_header = new PlayListHeader(this);
m_scrollBar = new QScrollBar(Qt::Vertical, this);
m_hslider = new QScrollBar(Qt::Horizontal, this);
m_hslider->setPageStep(50);
- m_update = false;
- m_drop_index = INVALID_INDEX;
- m_scroll_direction = NONE;
- m_prev_y = 0;
- m_anchor_index = INVALID_INDEX;
- m_pressed_index = INVALID_INDEX;
- m_first = 0;
- m_row_count = 0;
- m_select_on_release = false;
- m_count = 0;
- m_firstItem = nullptr;
setAcceptDrops(true);
setMouseTracking(true);
diff --git a/src/plugins/Ui/qsui/listwidget.h b/src/plugins/Ui/qsui/listwidget.h
index 795560a9a..46c3f04d8 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 = nullptr);
+ explicit ListWidget(PlayListModel *model, QWidget *parent = nullptr);
~ListWidget();
@@ -120,24 +120,22 @@ private:
void restoreFirstVisible();
void updateScrollBars();
- bool m_update;
- int m_pressed_index;
- QMenu *m_menu;
+ bool m_update = false;
+ int m_pressed_index, m_drop_index, m_anchor_index;
+ QMenu *m_menu = nullptr;
PlayListModel *m_model;
- int m_row_count, m_first, m_count; //visible rows, first visible index, total item count
- PlayListItem *m_firstItem; //first visible item
- int m_anchor_index;
+ int m_row_count = 0, m_first = 0, m_count = 0; //visible rows, first visible index, total item count
+ PlayListItem *m_firstItem = nullptr; //first visible item
/*!
* Scroll direction that is performing in current moment.
*/
- ScrollDirection m_scroll_direction;
- int m_prev_y;
- bool m_select_on_release;
+ ScrollDirection m_scroll_direction = NONE;
+ int m_prev_y = 0;
+ bool m_select_on_release = false;
bool m_show_protocol;
- int m_drop_index;
QList<ListWidgetRow *> m_rows;
QmmpUiSettings *m_ui_settings;
- PlayListPopup::PopupWidget *m_popupWidget;
+ PlayListPopup::PopupWidget *m_popupWidget = nullptr;
QTimer *m_timer;
QScrollBar *m_scrollBar;
ListWidgetDrawer m_drawer;
@@ -145,7 +143,7 @@ private:
QScrollBar *m_hslider;
QString m_filterString;
- bool m_filterMode;
+ bool m_filterMode = false;
QList<PlayListItem *> m_filteredItems;
};
diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
index 706887f07..cae080b8a 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
@@ -229,7 +229,6 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
{
row->titles[i] = metrics->elidedText (row->titles[i], Qt::ElideRight, size - 2 * m_padding);
}
- visible_width -= size;
}
}
@@ -303,7 +302,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
int sy = row->rect.y() + m_metrics->overlinePos() - 1;
painter->setFont(m_font);
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_group_text);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_group_text);
if(rtl)
sx = row->rect.right() - sx - m_metrics->horizontalAdvance(row->titles[0]);
@@ -321,7 +320,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
row->rect.right() - row->numberColumnWidth - m_padding, sy);
if(m_show_splitters && row->numberColumnWidth)
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
painter->drawLine(row->rect.right() - row->numberColumnWidth, row->rect.top(),
row->rect.right() - row->numberColumnWidth, row->rect.bottom() + 1);
}
@@ -333,7 +332,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
row->rect.width(), sy);
if(m_show_splitters && row->numberColumnWidth)
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
painter->drawLine(row->rect.left() + row->numberColumnWidth, row->rect.top(),
row->rect.left() + row->numberColumnWidth, row->rect.bottom() + 1);
}
@@ -362,7 +361,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
else
metrics = m_metrics;
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
if(rtl)
{
@@ -376,9 +375,9 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
painter->drawText(sx + m_padding, sy, number);
if(m_show_splitters)
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
}
}
@@ -403,7 +402,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
{
for(int i = 0; i < row->sizes.count(); i++)
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
draw_extra = (i == row->trackStateColumn && !row->extraString.isEmpty());
if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
@@ -437,7 +436,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
if(m_show_splitters && (!row->autoResize || i < row->sizes.count() - 1)) //do not draw last vertical line
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
painter->drawLine(sx - 1, row->rect.top(), sx - 1, row->rect.bottom() + 1);
}
}
@@ -455,9 +454,9 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
painter->drawText(sx - m_padding - metrics->horizontalAdvance(number), sy, number);
if(m_show_splitters)
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
}
}
@@ -482,7 +481,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
{
for(int i = 0; i < row->sizes.count(); i++)
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
draw_extra = (i == row->trackStateColumn && !row->extraString.isEmpty());
if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
@@ -516,7 +515,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
if(m_show_splitters && (!row->autoResize || i < row->sizes.count() - 1)) //do not draw last vertical line
{
- painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+ painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
painter->drawLine(sx - 1, row->rect.top(), sx - 1, row->rect.bottom() + 1);
}
}
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index a1347faa0..710d7fa42 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -675,7 +675,7 @@ void MainWindow::readSettings()
toolBars.erase(it);
break;
}
- it++;
+ ++it;
}
if(!found)
diff --git a/src/plugins/Ui/qsui/playlistbrowser.cpp b/src/plugins/Ui/qsui/playlistbrowser.cpp
index 9d831e400..15d54b4cf 100644
--- a/src/plugins/Ui/qsui/playlistbrowser.cpp
+++ b/src/plugins/Ui/qsui/playlistbrowser.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2013 by Ilya Kotov *
+ * Copyright (C) 2009-2020 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -31,7 +31,8 @@
#include "actionmanager.h"
#include "playlistbrowser.h"
-PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QWidget(parent)
+PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QWidget(parent),
+ m_pl_manager(manager)
{
m_lineEdit = new QLineEdit(this);
m_lineEdit->installEventFilter(this);
@@ -47,7 +48,6 @@ PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QW
layout->addWidget(m_listView);
setLayout(layout);
- m_pl_manager = manager;
connect(m_pl_manager, SIGNAL(playListsChanged()), SLOT(updateList()));
//actions
m_listView->setContextMenuPolicy(Qt::ActionsContextMenu);
diff --git a/src/plugins/Ui/qsui/playlistbrowser.h b/src/plugins/Ui/qsui/playlistbrowser.h
index 98d613a13..69aae90bd 100644
--- a/src/plugins/Ui/qsui/playlistbrowser.h
+++ b/src/plugins/Ui/qsui/playlistbrowser.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2013 by Ilya Kotov *
+ * Copyright (C) 2013-2020 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -38,7 +38,7 @@ class PlayListBrowser : public QWidget
{
Q_OBJECT
public:
- PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
+ explicit PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
~PlayListBrowser();
private slots:
@@ -52,8 +52,8 @@ private:
QLineEdit *m_lineEdit;
QListView *m_listView;
PlayListManager *m_pl_manager;
- QStandardItemModel* m_listModel;
- QSortFilterProxyModel* m_proxyModel;
+ QStandardItemModel *m_listModel;
+ QSortFilterProxyModel *m_proxyModel;
};
#endif // PLAYLISTBROWSER_H
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index 2c4bdb9a9..ac12bc69c 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Ilya Kotov *
+ * Copyright (C) 2015-2020 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -32,6 +32,7 @@
#include <QIcon>
#include <QStyleOptionHeader>
#include <QActionGroup>
+#include <algorithm>
#include <qmmp/qmmp.h>
#include <qmmpui/playlistmanager.h>
#include <qmmpui/playlistheadermodel.h>
@@ -141,7 +142,7 @@ void PlayListHeader::readSettings()
{
m_model->setData(i, SIZE, INITAL_SIZE);
m_model->setData(i, ALIGNMENT, (layoutDirection() == Qt::RightToLeft) ?
- ListWidgetRow::ALIGN_LEFT : ListWidgetRow::ALIGN_LEFT);
+ ListWidgetRow::ALIGN_RIGHT : ListWidgetRow::ALIGN_LEFT);
if(i < sizes.count())
m_model->setData(i, SIZE, sizes.at(i).toInt());
@@ -274,11 +275,8 @@ int PlayListHeader::maxScrollValue() const
if(m_model->count() == 1)
return 0;
- int row_width = 0;
- for(int size : sizes())
- {
- row_width += size;
- }
+ const QList<int> sizeList = sizes();
+ int row_width = std::accumulate(sizeList.cbegin(), sizeList.cend(), 0);
return qMax(0, row_width - width() + m_scrollbar_width + 10);
}
diff --git a/src/plugins/Ui/qsui/qsuivisualization.h b/src/plugins/Ui/qsui/qsuivisualization.h
index 2de6d01dd..f905ec966 100644
--- a/src/plugins/Ui/qsui/qsuivisualization.h
+++ b/src/plugins/Ui/qsui/qsuivisualization.h
@@ -36,7 +36,7 @@ class QSUIVisualization : public Visual
{
Q_OBJECT
public:
- QSUIVisualization(QWidget *parent = nullptr);
+ explicit QSUIVisualization(QWidget *parent = nullptr);
virtual ~QSUIVisualization();
void setCover(const QPixmap &pixmap);
@@ -140,8 +140,8 @@ private:
QColor m_peakColor;
QSize m_cell_size;
QBrush m_brush;
- double m_peaks_falloff;
- double m_analyzer_falloff;
+ double m_peaks_falloff = 0;
+ double m_analyzer_falloff = 0;
bool m_show_peaks = false;
double *m_intern_vis_data = nullptr;
double *m_peaks = nullptr;
diff --git a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
index 540b04be9..d32bb211e 100644
--- a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
+++ b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
@@ -463,7 +463,7 @@ void QSUiWaveformScanner::run()
if(counter >= samplesPerValue)
{
m_mutex.lock();
- for(int ch = 0; ch < channels; ++ch)
+ for(ch = 0; ch < channels; ++ch)
{
m_data << max[ch] * 1000;
m_data << min[ch] * 1000;
diff --git a/src/plugins/Ui/qsui/shortcutdialog.h b/src/plugins/Ui/qsui/shortcutdialog.h
index f270b93d6..b390be0c2 100644
--- a/src/plugins/Ui/qsui/shortcutdialog.h
+++ b/src/plugins/Ui/qsui/shortcutdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2013 by Ilya Kotov *
+ * Copyright (C) 2010-2020 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -32,7 +32,7 @@ class ShortcutDialog : public QDialog
{
Q_OBJECT
public:
- ShortcutDialog(const QString &key, QWidget *parent = nullptr);
+ explicit 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 b8f56dc39..4201142e2 100644
--- a/src/plugins/Ui/qsui/visualmenu.cpp
+++ b/src/plugins/Ui/qsui/visualmenu.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007-2012 by Ilya Kotov *
+ * Copyright (C) 2007-2020 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -19,7 +19,6 @@
***************************************************************************/
#include <QAction>
-
#include <qmmp/visual.h>
#include <qmmp/visualfactory.h>
#include "visualmenu.h"
@@ -45,12 +44,11 @@ void VisualMenu::updateActions()
}
}
-VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) :
- QAction(factory->properties().name, parent)
+VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) : QAction(factory->properties().name, parent),
+ m_factory(factory)
{
setCheckable (true);
setChecked (Visual::isEnabled(factory));
- m_factory = factory;
connect(this, SIGNAL(triggered(bool)), SLOT(select(bool)));
}
diff --git a/src/plugins/Ui/qsui/visualmenu.h b/src/plugins/Ui/qsui/visualmenu.h
index 2994e40dd..24d8e5e9a 100644
--- a/src/plugins/Ui/qsui/visualmenu.h
+++ b/src/plugins/Ui/qsui/visualmenu.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007-2012 by Ilya Kotov *
+ * Copyright (C) 2007-2020 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -32,7 +32,7 @@ class VisualMenu : public QMenu
{
Q_OBJECT
public:
- VisualMenu(QWidget *parent = nullptr);
+ explicit VisualMenu(QWidget *parent = nullptr);
~VisualMenu();
@@ -44,7 +44,7 @@ class VisualAction : public QAction
{
Q_OBJECT
public:
- VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
+ explicit VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
private slots:
void select(bool);
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 21:50:38 +0000