diff options
Diffstat (limited to 'src/plugins')
20 files changed, 97 insertions, 126 deletions
diff --git a/src/plugins/Input/archive/archivetagreader.cpp b/src/plugins/Input/archive/archivetagreader.cpp index 2ec7fe524..8e9118ba8 100644 --- a/src/plugins/Input/archive/archivetagreader.cpp +++ b/src/plugins/Input/archive/archivetagreader.cpp @@ -99,12 +99,12 @@ public: {} private: + QIODevice *m_input; #ifdef Q_OS_WIN QString m_fileName; #else QByteArray m_fileName; #endif - QIODevice *m_input; }; ArchiveTagReader::ArchiveTagReader(QIODevice *input, const QString &url) diff --git a/src/plugins/Transports/http/httpinputsource.cpp b/src/plugins/Transports/http/httpinputsource.cpp index 8f8940997..14870cbdf 100644 --- a/src/plugins/Transports/http/httpinputsource.cpp +++ b/src/plugins/Transports/http/httpinputsource.cpp @@ -28,7 +28,7 @@ HTTPInputSource::HTTPInputSource(const QString &url, QObject *parent) : InputSou connect(m_reader, SIGNAL(error()),SIGNAL(error())); } -QIODevice *HTTPInputSource::ioDevice() +QIODevice *HTTPInputSource::ioDevice() const { return m_reader; } @@ -39,12 +39,12 @@ bool HTTPInputSource::initialize() return true; } -bool HTTPInputSource::isReady() +bool HTTPInputSource::isReady() const { return m_reader->isOpen(); } -bool HTTPInputSource::isWaiting() +bool HTTPInputSource::isWaiting() const { return (!m_reader->bytesAvailable() && m_reader->isOpen()); } diff --git a/src/plugins/Transports/http/httpinputsource.h b/src/plugins/Transports/http/httpinputsource.h index 515e7306b..0d5fa12ad 100644 --- a/src/plugins/Transports/http/httpinputsource.h +++ b/src/plugins/Transports/http/httpinputsource.h @@ -34,10 +34,10 @@ Q_OBJECT public: explicit HTTPInputSource(const QString &path, QObject *parent = nullptr); - QIODevice *ioDevice() override; + QIODevice *ioDevice() const override; bool initialize() override; - bool isReady() override; - bool isWaiting() override; + bool isReady() const override; + bool isWaiting() const override; QString contentType() const override; private: diff --git a/src/plugins/Transports/mms/mmsinputsource.cpp b/src/plugins/Transports/mms/mmsinputsource.cpp index dbc1075c3..2a021f405 100644 --- a/src/plugins/Transports/mms/mmsinputsource.cpp +++ b/src/plugins/Transports/mms/mmsinputsource.cpp @@ -28,7 +28,7 @@ MMSInputSource::MMSInputSource(const QString &url, QObject *parent) : InputSourc connect(m_reader, SIGNAL(error()),SIGNAL(error())); } -QIODevice *MMSInputSource::ioDevice() +QIODevice *MMSInputSource::ioDevice() const { return m_reader; } @@ -39,12 +39,12 @@ bool MMSInputSource::initialize() return true; } -bool MMSInputSource::isReady() +bool MMSInputSource::isReady() const { return m_reader->isOpen(); } -bool MMSInputSource::isWaiting() +bool MMSInputSource::isWaiting() const { return (!m_reader->bytesAvailable() && m_reader->isOpen()); } diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h index afe8aaa61..df0bd637d 100644 --- a/src/plugins/Transports/mms/mmsinputsource.h +++ b/src/plugins/Transports/mms/mmsinputsource.h @@ -34,10 +34,10 @@ Q_OBJECT public: explicit MMSInputSource(const QString &path, QObject *parent = nullptr); - QIODevice *ioDevice() override; + QIODevice *ioDevice() const override; bool initialize() override; - bool isReady() override; - bool isWaiting() override; + bool isReady() const override; + bool isWaiting() const override; QString contentType() const override; private: diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp index 979484495..33d3e1018 100644 --- a/src/plugins/Ui/skinned/skin.cpp +++ b/src/plugins/Ui/skinned/skin.cpp @@ -918,7 +918,7 @@ QRegion Skin::createRegion(const QString &path, const QString &group) for (int j = 0; j < numPoints.at(i).toInt() * 2 && n != numbers.constEnd(); j++) { lp << n->toInt(); - n ++; + ++n; } QVector<QPoint> points; diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 12fb7c52d..1da0b8718 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -201,7 +201,7 @@ void SkinnedSettings::loadSkins() #endif for(const QString &path : m_reader->skins()) { - QListWidgetItem *item = new QListWidgetItem (path.section('/', -1)); + item = new QListWidgetItem (path.section('/', -1)); item->setIcon (m_reader->getPreview(path)); item->setToolTip(tr("Archived skin") + " " + path); m_ui.listWidget->addItem (item); diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp index b3b63d898..52127c7e0 100644 --- a/src/plugins/Ui/skinned/skinreader.cpp +++ b/src/plugins/Ui/skinned/skinreader.cpp @@ -25,6 +25,7 @@ #include <QByteArray> #include <QApplication> #include <QFile> +#include <algorithm> #include <qmmp/qmmp.h> #include "skinreader.h" @@ -62,15 +63,9 @@ void SkinReader::generateThumbs() //clear removed skins from cache for(const QFileInfo &thumbFile : qAsConst(d)) { - bool del = true; - for(const QFileInfo &fileInfo : qAsConst(f)) - { - if (fileInfo.baseName () == thumbFile.baseName ()) - { - del = false; - break; - } - } + bool del = std::none_of(f.cbegin(), f.cend(), + [thumbFile](const QFileInfo &fileInfo){ return fileInfo.baseName() == thumbFile.baseName(); }); + if (del) { qDebug("SkinReader: deleting %s from cache", @@ -82,15 +77,9 @@ void SkinReader::generateThumbs() //add new skins to cache for(const QFileInfo &fileInfo : qAsConst(f)) { - bool create = true; - for(const QFileInfo &thumbInfo : qAsConst(d)) - { - if (fileInfo.baseName () == thumbInfo.baseName ()) - { - create = false; - break; - } - } + bool create = std::none_of(d.cbegin(), d.cend(), + [fileInfo](const QFileInfo &thumbInfo){ return fileInfo.baseName() == thumbInfo.baseName(); }); + if (create) { qDebug("SkinReader: adding %s to cache", @@ -108,15 +97,13 @@ void SkinReader::generateThumbs() d = cache_dir.entryInfoList(); for(const QFileInfo &fileInfo : qAsConst(f)) { - for(const QFileInfo &thumbInfo : qAsConst(d)) - { - if (fileInfo.baseName () == thumbInfo.baseName ()) - { - m_previewMap.insert(fileInfo.absoluteFilePath (), - thumbInfo.absoluteFilePath ()); - break; - } - } + auto it = std::find_if(d.cbegin(), d.cend(), + [fileInfo](const QFileInfo &thumbInfo){ return fileInfo.baseName() == thumbInfo.baseName(); }); + + if(it != d.cend()) + { + m_previewMap.insert(fileInfo.absoluteFilePath (), (*it).absoluteFilePath()); + } } } @@ -153,8 +140,7 @@ void SkinReader::untar(const QString &from, const QString &to, bool preview) m_process->start("tar", args); m_process->waitForFinished(); array = m_process->readAllStandardOutput (); - QString str = QString(array); - const QStringList outputList = str.split("\n", QString::SkipEmptyParts); + const QStringList outputList = QString(array).split("\n", QString::SkipEmptyParts); for(QString str : qAsConst(outputList)) { str = str.trimmed(); diff --git a/src/plugins/Ui/skinned/skinreader.h b/src/plugins/Ui/skinned/skinreader.h index cebda0cb7..e74f1afb4 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 = nullptr); + explicit SkinReader(QObject *parent = nullptr); ~SkinReader(); diff --git a/src/plugins/Ui/skinned/symboldisplay.cpp b/src/plugins/Ui/skinned/symboldisplay.cpp index 28608b9de..a3f1436d4 100644 --- a/src/plugins/Ui/skinned/symboldisplay.cpp +++ b/src/plugins/Ui/skinned/symboldisplay.cpp @@ -22,13 +22,10 @@ #include "skin.h" #include "symboldisplay.h" -SymbolDisplay::SymbolDisplay (QWidget *parent, int digits) - : PixmapWidget (parent) +SymbolDisplay::SymbolDisplay (QWidget *parent, int digits) : PixmapWidget (parent), + m_digits(digits) { - m_alignment = Qt::AlignRight; m_skin = Skin::instance(); - m_digits = digits; - m_max = 0; connect (m_skin, SIGNAL (skinChanged()), this, SLOT (draw())); draw(); for (int i = 0; i < m_digits; ++i) diff --git a/src/plugins/Ui/skinned/symboldisplay.h b/src/plugins/Ui/skinned/symboldisplay.h index 4f232ae01..34dc7cac8 100644 --- a/src/plugins/Ui/skinned/symboldisplay.h +++ b/src/plugins/Ui/skinned/symboldisplay.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2013 by Ilya Kotov * + * Copyright (C) 2006-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,7 +32,7 @@ class SymbolDisplay : public PixmapWidget { Q_OBJECT public: - SymbolDisplay(QWidget *parent = nullptr, int digits = 3); + explicit SymbolDisplay(QWidget *parent = nullptr, int digits = 3); virtual ~SymbolDisplay(); @@ -49,9 +49,9 @@ private slots: private: Skin* m_skin; QString m_text; - Qt::Alignment m_alignment; + Qt::Alignment m_alignment = Qt::AlignRight; int m_digits; - int m_max; + int m_max = 0; }; #endif diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp index f2fb7cbda..ec479bb1b 100644 --- a/src/plugins/Ui/skinned/textscroller.cpp +++ b/src/plugins/Ui/skinned/textscroller.cpp @@ -42,9 +42,9 @@ #define SCROLL_SEP " *** " #define TITLE_FORMAT "%p%if(%p&%t, - ,)%t%if(%p,,%if(%t,,%f))%if(%l, - %l,)" -TextScroller::TextScroller (QWidget *parent) : QWidget (parent) +TextScroller::TextScroller (QWidget *parent) : QWidget (parent), + m_defautText(QString("Qmmp ") + Qmmp::strVersion()) { - m_defautText = QString("Qmmp ") + Qmmp::strVersion(); m_formater.setPattern(TITLE_FORMAT); m_core = SoundCore::instance(); m_skin = Skin::instance(); diff --git a/src/plugins/Ui/skinned/textscroller.h b/src/plugins/Ui/skinned/textscroller.h index 9b46adafd..d0bd7092b 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 = nullptr); + explicit TextScroller(QWidget *parent = nullptr); virtual ~TextScroller(); void setText(const QString &text); diff --git a/src/plugins/Ui/skinned/togglebutton.cpp b/src/plugins/Ui/skinned/togglebutton.cpp index 3e20cf18b..805a8319a 100644 --- a/src/plugins/Ui/skinned/togglebutton.cpp +++ b/src/plugins/Ui/skinned/togglebutton.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Ilya Kotov * + * Copyright (C) 2007-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * Based on Promoe, an XMMS2 Client * @@ -25,32 +25,29 @@ #include "togglebutton.h" #include <QMouseEvent> -ToggleButton::ToggleButton ( QWidget *parent,uint on_n,uint on_p,uint off_n,uint off_p ) - : PixmapWidget ( parent ) +ToggleButton::ToggleButton(QWidget *parent,uint on_n,uint on_p,uint off_n,uint off_p) : PixmapWidget(parent), + m_on_n(on_n), + m_on_p(on_p), + m_off_n(off_n), + m_off_p(off_p) { - m_on_n = on_n; - m_on_p = on_p; - m_off_n = off_n; - m_off_p = off_p; - m_on = false; - skin = Skin::instance(); - setChecked ( false ); - connect ( skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) ); + m_skin = Skin::instance(); + setChecked(false); + connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); } - ToggleButton::~ToggleButton() {} -bool ToggleButton::isChecked() +bool ToggleButton::isChecked() const { return m_on; } void ToggleButton::updateSkin() { - //setPixmap ( skin->getButton ( name_normal ) ); - setChecked ( m_on ); + //setPixmap(skin->getButton(name_normal)); + setChecked(m_on); } void ToggleButton::click() @@ -60,49 +57,49 @@ void ToggleButton::click() emit clicked(m_on); } -void ToggleButton::setChecked ( bool on ) +void ToggleButton::setChecked(bool on) { m_on = on; - if ( on ) - setPixmap ( skin->getButton ( m_on_n ) ); + if(on) + setPixmap(m_skin->getButton(m_on_n)); else - setPixmap ( skin->getButton ( m_off_n ) ); + setPixmap(m_skin->getButton(m_off_n)); } -void ToggleButton::mousePressEvent ( QMouseEvent* ) +void ToggleButton::mousePressEvent(QMouseEvent*) { m_cursorin = true; m_old_on = m_on; - if ( m_on ) - setPixmap ( skin->getButton ( m_off_p ) ); + if(m_on) + setPixmap(m_skin->getButton(m_off_p)); else - setPixmap ( skin->getButton ( m_on_p ) ); + setPixmap(m_skin->getButton(m_on_p)); } -void ToggleButton::mouseReleaseEvent ( QMouseEvent* ) +void ToggleButton::mouseReleaseEvent(QMouseEvent*) { - if ( m_cursorin ) { + if(m_cursorin) { m_on = !m_old_on; - setChecked ( m_on ); - emit clicked( m_on ); + setChecked(m_on); + emit clicked( m_on); } else { m_on = m_old_on; - setChecked ( m_on ); + setChecked(m_on); } } void ToggleButton::mouseMoveEvent (QMouseEvent *e) { - if ( !m_cursorin && rect().contains(e->pos()) ) { + if(!m_cursorin && rect().contains(e->pos())) { m_cursorin = true; - if ( m_old_on ) - setPixmap ( skin->getButton ( m_off_p ) ); + if(m_old_on) + setPixmap(m_skin->getButton(m_off_p)); else - setPixmap ( skin->getButton ( m_on_p ) ); - } else if ( m_cursorin && !rect().contains(e->pos()) ) { + setPixmap(m_skin->getButton(m_on_p)); + } else if(m_cursorin && !rect().contains(e->pos())) { m_cursorin = false; - if ( m_old_on ) - setPixmap ( skin->getButton ( m_on_n ) ); + if(m_old_on) + setPixmap(m_skin->getButton(m_on_n)); else - setPixmap ( skin->getButton ( m_off_n ) ); + setPixmap(m_skin->getButton(m_off_n)); } } diff --git a/src/plugins/Ui/skinned/togglebutton.h b/src/plugins/Ui/skinned/togglebutton.h index b46fd4fbc..0ddca9308 100644 --- a/src/plugins/Ui/skinned/togglebutton.h +++ b/src/plugins/Ui/skinned/togglebutton.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -31,10 +31,10 @@ class ToggleButton : public PixmapWidget { Q_OBJECT public: - ToggleButton( QWidget *parent, uint on_n, uint on_p, uint off_n, uint off_p ); + ToggleButton(QWidget *parent, uint on_n, uint on_p, uint off_n, uint off_p); ~ToggleButton(); - bool isChecked(); + bool isChecked() const; public slots: void setChecked(bool); @@ -47,10 +47,10 @@ private slots: void updateSkin(); private: - Skin *skin; + Skin *m_skin; bool m_cursorin, m_old_on; uint m_on_n, m_on_p, m_off_n, m_off_p; - bool m_on; + bool m_on = false; protected: void mousePressEvent(QMouseEvent*) override; diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp index 30708f676..75b305a86 100644 --- a/src/plugins/Visual/analyzer/analyzer.cpp +++ b/src/plugins/Visual/analyzer/analyzer.cpp @@ -33,14 +33,6 @@ Analyzer::Analyzer (QWidget *parent) : Visual (parent) { - m_intern_vis_data = nullptr; - m_peaks = nullptr; - m_x_scale = nullptr; - m_rows = 0; - m_cols = 0; - m_update = false; - m_running = false; - setWindowTitle (tr("Qmmp Analyzer")); setMinimumSize(2*300-30,105); m_timer = new QTimer (this); @@ -234,8 +226,6 @@ void Analyzer::process() short dest_l[256]; short dest_r[256]; - short yl, yr; - int j, k, magnitude_l, magnitude_r; calc_freq (dest_l, m_left_buffer); calc_freq (dest_r, m_right_buffer); @@ -244,16 +234,18 @@ void Analyzer::process() for (int i = 0; i < m_cols; i++) { - j = m_cols * 2 - i - 1; //mirror index - yl = yr = 0; - magnitude_l = magnitude_r = 0; + int j = m_cols * 2 - i - 1; //mirror index + short yl = 0; + short yr = 0; + int magnitude_l = 0; + int magnitude_r = 0; if(m_x_scale[i] == m_x_scale[i + 1]) { yl = dest_l[i]; yr = dest_r[i]; } - for (k = m_x_scale[i]; k < m_x_scale[i + 1]; k++) + for (int k = m_x_scale[i]; k < m_x_scale[i + 1]; k++) { yl = qMax(dest_l[k], yl); yr = qMax(dest_r[k], yr); @@ -293,12 +285,11 @@ void Analyzer::process() void Analyzer::draw(QPainter *p) { QBrush brush(Qt::SolidPattern); - int x = 0; int rdx = qMax(0, width() - 2 * m_cell_size.width() * m_cols); for (int j = 0; j < m_cols * 2; ++j) { - x = j * m_cell_size.width() + 1; + int x = j * m_cell_size.width() + 1; if(j >= m_cols) x += rdx; //correct right part position diff --git a/src/plugins/Visual/analyzer/analyzer.h b/src/plugins/Visual/analyzer/analyzer.h index 076948adb..3d77d30f1 100644 --- a/src/plugins/Visual/analyzer/analyzer.h +++ b/src/plugins/Visual/analyzer/analyzer.h @@ -37,7 +37,7 @@ class Analyzer : public Visual Q_OBJECT public: - Analyzer( QWidget *parent = nullptr); + explicit Analyzer( QWidget *parent = nullptr); virtual ~Analyzer(); public slots: @@ -61,17 +61,17 @@ private: void draw(QPainter *p); void createMenu(); QTimer *m_timer; - double *m_intern_vis_data; - double *m_peaks; - int *m_x_scale; + double *m_intern_vis_data = nullptr; + double *m_peaks = nullptr; + int *m_x_scale = nullptr; double m_peaks_falloff; double m_analyzer_falloff; bool m_show_peaks; float m_left_buffer[QMMP_VISUAL_NODE_SIZE]; float m_right_buffer[QMMP_VISUAL_NODE_SIZE]; - int m_cols, m_rows; - bool m_update; - bool m_running; + int m_cols = 0, m_rows = 0; + bool m_update = false; + bool m_running = false; //colors QColor m_color1; QColor m_color2; diff --git a/src/plugins/Visual/projectm/projectmwidget.h b/src/plugins/Visual/projectm/projectmwidget.h index 7dbdc2594..d67742a07 100644 --- a/src/plugins/Visual/projectm/projectmwidget.h +++ b/src/plugins/Visual/projectm/projectmwidget.h @@ -35,7 +35,7 @@ class ProjectMWidget : public QOpenGLWidget { Q_OBJECT public: - ProjectMWidget(QListWidget *listWidget, QWidget *parent = nullptr); + explicit ProjectMWidget(QListWidget *listWidget, QWidget *parent = nullptr); ~ProjectMWidget(); diff --git a/src/plugins/Visual/projectm/projectmwrapper.cpp b/src/plugins/Visual/projectm/projectmwrapper.cpp index 5078cffe2..16449a432 100644 --- a/src/plugins/Visual/projectm/projectmwrapper.cpp +++ b/src/plugins/Visual/projectm/projectmwrapper.cpp @@ -20,12 +20,12 @@ #include "projectmwrapper.h" -ProjectMWrapper::ProjectMWrapper(std::string config_file, int flags, QObject *parent) : +ProjectMWrapper::ProjectMWrapper(const std::string &config_file, int flags, QObject *parent) : QObject(parent), projectM(config_file, flags) { } -ProjectMWrapper::ProjectMWrapper(projectM::Settings settings, int flags, QObject *parent) : +ProjectMWrapper::ProjectMWrapper(const projectM::Settings &settings, int flags, QObject *parent) : QObject(parent), projectM(settings, flags) { } diff --git a/src/plugins/Visual/projectm/projectmwrapper.h b/src/plugins/Visual/projectm/projectmwrapper.h index 99b226ac7..fead927ed 100644 --- a/src/plugins/Visual/projectm/projectmwrapper.h +++ b/src/plugins/Visual/projectm/projectmwrapper.h @@ -28,8 +28,8 @@ class ProjectMWrapper : public QObject, public projectM { Q_OBJECT public: - explicit ProjectMWrapper(std::string config_file, int flags, QObject *parent = nullptr); - explicit ProjectMWrapper(Settings settings, int flags, QObject *parent = nullptr); + explicit ProjectMWrapper(const std::string &config_file, int flags, QObject *parent = nullptr); + explicit ProjectMWrapper(const Settings &settings, int flags, QObject *parent = nullptr); virtual ~ProjectMWrapper(); |