From 5fcb71d08fb94ca020a14de0ba3955cd538f53b6 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 9 Dec 2025 01:16:41 +0100 Subject: [PATCH] Formatting --- src/analyzer/analyzercontainer.cpp | 2 +- src/analyzer/analyzercontainer.h | 3 +- src/analyzer/blockanalyzer.cpp | 8 ----- src/analyzer/blockanalyzer.h | 6 ++-- src/analyzer/boomanalyzer.h | 3 +- src/analyzer/fht.h | 16 +++++----- src/collection/collectionbackend.h | 1 - src/collection/collectionfilteroptions.h | 1 - src/collection/collectionmodel.cpp | 4 +-- src/collection/collectionwatcher.h | 3 +- src/constants/appearancesettings.h | 2 +- src/constants/backendsettings.h | 2 +- src/constants/behavioursettings.h | 2 +- src/constants/collectionsettings.h | 2 +- src/constants/contextsettings.h | 2 +- src/constants/coverssettings.h | 2 +- src/constants/globalshortcutssettings.h | 2 +- src/constants/lyricssettings.h | 2 +- src/constants/mainwindowsettings.h | 4 +-- src/constants/moodbarsettings.h | 2 +- src/constants/networkproxysettings.h | 2 +- src/constants/notificationssettings.h | 6 ++-- src/constants/playlistsettings.h | 2 +- src/constants/qobuzsettings.h | 2 +- src/constants/scrobblersettings.h | 2 +- src/constants/spotifysettings.h | 2 +- src/constants/subsonicsettings.h | 2 +- src/constants/tidalsettings.h | 2 +- src/context/contextalbum.h | 1 - src/context/contextview.h | 6 ++-- src/core/application.cpp | 2 +- src/core/commandlineoptions.cpp | 2 +- src/core/database.cpp | 4 ++- src/core/database.h | 1 - src/core/iconloader.h | 1 + src/core/mainwindow.cpp | 8 ++--- src/core/mainwindow.h | 2 -- src/core/player.h | 4 +-- src/core/qtfslistener.h | 1 - src/core/scoped_nsautorelease_pool.h | 3 +- src/core/songloader.h | 1 - src/core/temporaryfile.h | 2 +- src/core/urlhandler.h | 1 - src/covermanager/albumcoverfetchersearch.h | 1 - src/covermanager/albumcoverloaderoptions.cpp | 1 - src/covermanager/albumcovermanager.cpp | 2 +- src/covermanager/albumcoversearcher.h | 2 +- src/device/cddalister.h | 10 +++---- src/device/devicedatabasebackend.h | 1 - src/device/devicelister.cpp | 4 +-- src/device/deviceview.h | 3 +- src/device/filesystemdevice.h | 8 ++--- src/device/giolister.cpp | 17 ++++++----- src/device/giolister.h | 4 +-- src/device/mtpconnection.cpp | 8 ++--- src/device/mtpdevice.cpp | 8 ++--- src/device/mtploader.h | 1 - src/dialogs/saveplaylistsdialog.cpp | 2 +- src/engine/gstfastspectrum.cpp | 30 +++++++++---------- src/engine/gststartup.h | 2 +- src/equalizer/equalizer.cpp | 6 ++-- src/fileview/fileview.h | 2 +- .../filterparserfloateqcomparator.h | 1 + .../filterparserfloatgecomparator.h | 1 + .../filterparserfloatgtcomparator.h | 1 + .../filterparserfloatlecomparator.h | 1 + .../filterparserfloatltcomparator.h | 1 + .../filterparserfloatnecomparator.h | 1 + .../filterparserint64eqcomparator.h | 1 + .../filterparserint64gecomparator.h | 1 + .../filterparserint64gtcomparator.h | 1 + .../filterparserint64lecomparator.h | 1 + .../filterparserint64ltcomparator.h | 1 + .../filterparserint64necomparator.h | 1 + .../filterparserinteqcomparator.h | 1 + .../filterparserintgecomparator.h | 1 + .../filterparserintgtcomparator.h | 1 + .../filterparserintlecomparator.h | 1 + .../filterparserintltcomparator.h | 1 + .../filterparserintnecomparator.h | 1 + .../filterparsersearchtermcomparator.h | 1 + .../filterparsertextcontainscomparator.h | 1 + .../filterparsertexteqcomparator.h | 1 + .../filterparsertextnecomparator.h | 1 + .../filterparseruinteqcomparator.h | 1 + .../filterparseruintgecomparator.h | 1 + .../filterparseruintgtcomparator.h | 1 + .../filterparseruintlecomparator.h | 1 + .../filterparseruintltcomparator.h | 1 + .../filterparseruintnecomparator.h | 1 + src/globalshortcuts/globalshortcut.h | 1 - .../globalshortcutsbackend-kglobalaccel.cpp | 2 +- .../globalshortcutsmanager.cpp | 2 +- src/includes/lazy.h | 2 +- src/includes/scopedgobject.h | 2 +- src/lyrics/jsonlyricsprovider.h | 1 - src/main.cpp | 10 +++---- src/mpris2/mpris2.cpp | 6 ++-- src/mpris2/mpris2.h | 7 ++--- src/organize/organize.h | 2 +- src/organize/organizedialog.cpp | 2 +- src/osd/osdbase.cpp | 2 +- src/osd/osdpretty.h | 4 +-- src/playlist/playlist.cpp | 2 +- src/playlist/playlistcontainer.h | 2 +- src/playlist/playlistheader.h | 3 +- src/playlist/playlistlistview.h | 2 +- src/playlist/playlistundocommandbase.h | 2 +- src/playlist/playlistundocommandinsertitems.h | 2 +- src/playlist/playlistundocommandmoveitems.h | 2 +- src/playlist/playlistundocommandremoveitems.h | 2 +- .../playlistundocommandreorderitems.h | 2 +- .../playlistundocommandshuffleitems.h | 2 +- src/playlist/playlistundocommandsortitems.h | 2 +- src/playlist/playlistview.h | 2 +- src/playlistparsers/m3uparser.h | 1 - src/scrobbler/listenbrainzscrobbler.cpp | 2 +- src/scrobbler/scrobblemetadata.h | 1 - src/scrobbler/scrobblerservice.cpp | 2 +- src/settings/backendsettingspage.cpp | 4 +-- src/settings/globalshortcutssettingspage.h | 2 +- src/settings/moodbarsettingspage.cpp | 2 +- .../playlistgeneratorinserter.h | 1 - .../smartplaylistsearchpreview.h | 2 +- src/smartplaylists/smartplaylistsview.h | 1 - src/spotify/spotifyrequest.cpp | 2 +- .../streamingcollectionviewcontainer.h | 1 - src/streaming/streamingsearchview.h | 2 +- src/subsonic/subsonicrequest.cpp | 2 +- src/subsonic/subsonicrequest.h | 1 - src/subsonic/subsonicscrobblerequest.h | 1 - src/systemtrayicon/qtsystemtrayicon.h | 1 - src/tagreader/savetagcoverdata.h | 2 +- src/tagreader/tagreaderresult.h | 2 +- src/tagreader/tagreadersavecoverrequest.h | 1 - src/tagreader/tagreadertaglib.cpp | 2 +- src/transcoder/transcodedialog.cpp | 8 ++--- src/transcoder/transcoder.h | 2 ++ src/utilities/coverutils.h | 1 - src/utilities/mimeutils.h | 2 +- src/utilities/musixmatchprovider.cpp | 2 +- src/utilities/musixmatchprovider.h | 2 +- src/utilities/screenutils.h | 2 +- src/utilities/textencodingutils.h | 2 +- src/widgets/fancytabwidget.cpp | 4 +-- src/widgets/fancytabwidget.h | 2 +- src/widgets/groupediconview.cpp | 2 +- src/widgets/lineedit.h | 1 - src/widgets/multiloadingindicator.cpp | 2 +- src/widgets/playingwidget.h | 5 ++-- src/widgets/prettyslider.h | 4 +-- src/widgets/ratingwidget.h | 2 +- src/widgets/searchfield.h | 2 +- src/widgets/sliderslider.h | 12 ++++---- src/widgets/trackslider.h | 2 +- src/widgets/tracksliderpopup.h | 2 +- src/widgets/volumeslider.h | 2 +- tests/src/gmock_include.h | 6 ++-- tests/src/gtest_include.h | 6 ++-- tests/src/logging_env.h | 1 + tests/src/metatypes_env.h | 1 + tests/src/playlist_test.cpp | 2 +- tests/src/resources_env.h | 1 + tests/src/test_utils.h | 6 ++-- 164 files changed, 228 insertions(+), 229 deletions(-) diff --git a/src/analyzer/analyzercontainer.cpp b/src/analyzer/analyzercontainer.cpp index bd4fbff99..abe8bc3e5 100644 --- a/src/analyzer/analyzercontainer.cpp +++ b/src/analyzer/analyzercontainer.cpp @@ -61,7 +61,7 @@ constexpr int kLowFramerate = 20; constexpr int kMediumFramerate = 25; constexpr int kHighFramerate = 30; constexpr int kSuperHighFramerate = 60; -} // namespace +} // namespace AnalyzerContainer::AnalyzerContainer(QWidget *parent) : QWidget(parent), diff --git a/src/analyzer/analyzercontainer.h b/src/analyzer/analyzercontainer.h index 342b0ab1f..ef7af2fdc 100644 --- a/src/analyzer/analyzercontainer.h +++ b/src/analyzer/analyzercontainer.h @@ -101,8 +101,7 @@ void AnalyzerContainer::AddAnalyzerType() { group_->addAction(action); action->setCheckable(true); actions_ << action; - QObject::connect(action, &QAction::triggered, [this, id]() { ChangeAnalyzer(id); } ); - + QObject::connect(action, &QAction::triggered, [this, id]() { ChangeAnalyzer(id); }); } #endif // ANALYZERCONTAINER_H diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index 55c7c409d..c7d0d3f5d 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -107,7 +107,6 @@ void BlockAnalyzer::resizeEvent(QResizeEvent *e) { } drawBackground(); - } void BlockAnalyzer::determineStep() { @@ -119,7 +118,6 @@ void BlockAnalyzer::determineStep() { const double fallTime = static_cast(timeout() < 20 ? 20 * rows_ : 30 * rows_); step_ = static_cast(rows_ * timeout()) / fallTime; - } void BlockAnalyzer::framerateChanged() { @@ -135,7 +133,6 @@ void BlockAnalyzer::transform(Scope &s) { // the second half is pretty dull, so only show it if the user has a large analyzer by setting to scope_.size() if large we prevent interpolation of large analyzers, this is good! s.resize(scope_.size() <= kMaxColumns / 2 ? kMaxColumns / 2 : scope_.size()); - } void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) { @@ -203,7 +200,6 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) { } p.drawPixmap(0, 0, canvas_); - } static inline void adjustToLimits(const int b, int &f, int &amount) { @@ -230,7 +226,6 @@ static inline void adjustToLimits(const int b, int &f, int &amount) { f = 255; } } - } /** @@ -337,7 +332,6 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) { } return Qt::blue; - } void BlockAnalyzer::paletteChange(const QPalette &_palette) { @@ -388,7 +382,6 @@ void BlockAnalyzer::paletteChange(const QPalette &_palette) { } drawBackground(); - } void BlockAnalyzer::drawBackground() { @@ -411,5 +404,4 @@ void BlockAnalyzer::drawBackground() { p.fillRect(x * (kWidth + 1), y * (kHeight + 1) + y_, kWidth, kHeight, bgdark); } } - } diff --git a/src/analyzer/blockanalyzer.h b/src/analyzer/blockanalyzer.h index e6cb2f501..db6e43264 100644 --- a/src/analyzer/blockanalyzer.h +++ b/src/analyzer/blockanalyzer.h @@ -41,14 +41,14 @@ class BlockAnalyzer : public AnalyzerBase { Q_OBJECT public: - Q_INVOKABLE explicit BlockAnalyzer(QWidget*); + Q_INVOKABLE explicit BlockAnalyzer(QWidget *parent); static const char *kName; protected: - void transform(Scope&) override; + void transform(Scope &s) override; void analyze(QPainter &p, const Scope &s, const bool new_frame) override; - void resizeEvent(QResizeEvent*) override; + void resizeEvent(QResizeEvent *e) override; virtual void paletteChange(const QPalette &_palette); void framerateChanged() override; diff --git a/src/analyzer/boomanalyzer.h b/src/analyzer/boomanalyzer.h index 631e048ea..07cd5f8e7 100644 --- a/src/analyzer/boomanalyzer.h +++ b/src/analyzer/boomanalyzer.h @@ -40,7 +40,7 @@ class BoomAnalyzer : public AnalyzerBase { Q_OBJECT public: - Q_INVOKABLE explicit BoomAnalyzer(QWidget*); + Q_INVOKABLE explicit BoomAnalyzer(QWidget *parent); static const char *kName; @@ -70,7 +70,6 @@ class BoomAnalyzer : public AnalyzerBase { QPixmap barPixmap_; QPixmap canvas_; - }; #endif // BOOMANALYZER_H diff --git a/src/analyzer/fht.h b/src/analyzer/fht.h index b0da944bc..6a37f0ad2 100644 --- a/src/analyzer/fht.h +++ b/src/analyzer/fht.h @@ -55,7 +55,7 @@ class FHT { /** * Recursive in-place Hartley transform. For internal use only! */ - void _transform(float*, int, int); + void _transform(float *p, int n, int k); public: /** @@ -68,7 +68,7 @@ class FHT { ~FHT(); int sizeExp() const; int size() const; - void scale(float*, float) const; + void scale(float *p, float d) const; /** * Exponentially Weighted Moving Average (EWMA) filter. @@ -90,12 +90,12 @@ class FHT { /** * Semi-logarithmic audio spectrum. */ - void semiLogSpectrum(float*); + void semiLogSpectrum(float *p); /** * Fourier spectrum. */ - void spectrum(float*); + void spectrum(float *p); /** * Calculates a mathematically correct FFT power spectrum. @@ -103,7 +103,7 @@ class FHT { * and factor the 0.5 in the final scaling factor. * @see FHT::power2() */ - void power(float*); + void power(float *p); /** * Calculates an FFT power spectrum with doubled values as a @@ -112,14 +112,14 @@ class FHT { * of @f$2^n@f$ input values. This is the fastest transform. * @see FHT::power() */ - void power2(float*); + void power2(float *p); /** * Discrete Hartley transform of data sets with 8 values. */ - static void transform8(float*); + static void transform8(float *p); - void transform(float*); + void transform(float *p); }; #endif // FHT_H diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h index 7f9e24a19..c1bbb294a 100644 --- a/src/collection/collectionbackend.h +++ b/src/collection/collectionbackend.h @@ -140,7 +140,6 @@ class CollectionBackend : public CollectionBackendInterface { Q_OBJECT public: - Q_INVOKABLE explicit CollectionBackend(QObject *parent = nullptr); ~CollectionBackend(); diff --git a/src/collection/collectionfilteroptions.h b/src/collection/collectionfilteroptions.h index 9960907cb..cd0a2a0f8 100644 --- a/src/collection/collectionfilteroptions.h +++ b/src/collection/collectionfilteroptions.h @@ -26,7 +26,6 @@ class CollectionFilterOptions { public: - explicit CollectionFilterOptions(); // Filter mode: diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index 2ce762911..63a92de05 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -686,8 +686,8 @@ void CollectionModel::RemoveSongsInternal(const SongList &songs) { if (!divider_nodes_.contains(divider_key)) continue; // Look to see if there are any other items still under this divider - QList container_nodes = container_nodes_[0].values(); - if (std::any_of(container_nodes.begin(), container_nodes.end(), [this, divider_key](CollectionItem *node){ return DividerKey(options_active_.group_by[0], node->metadata, node->sort_text) == divider_key; })) { + QList container_nodes = container_nodes_[0].values(); + if (std::any_of(container_nodes.begin(), container_nodes.end(), [this, divider_key](CollectionItem *node) { return DividerKey(options_active_.group_by[0], node->metadata, node->sort_text) == divider_key; })) { continue; } diff --git a/src/collection/collectionwatcher.h b/src/collection/collectionwatcher.h index e5983fabe..fa8f857bd 100644 --- a/src/collection/collectionwatcher.h +++ b/src/collection/collectionwatcher.h @@ -137,7 +137,7 @@ class CollectionWatcher : public QObject { QStringList files_changed_path_; private: - ScanTransaction &operator=(const ScanTransaction&) { return *this; } + ScanTransaction &operator=(const ScanTransaction &transaction) { Q_UNUSED(transaction); return *this; } int task_id_; quint64 progress_; @@ -261,7 +261,6 @@ class CollectionWatcher : public QObject { static QStringList sValidImages; qint64 last_scan_time_; - }; inline QString CollectionWatcher::NoExtensionPart(const QString &fileName) { diff --git a/src/constants/appearancesettings.h b/src/constants/appearancesettings.h index b275646f9..26a6fb151 100644 --- a/src/constants/appearancesettings.h +++ b/src/constants/appearancesettings.h @@ -70,6 +70,6 @@ enum class BackgroundImagePosition { BottomRight = 5 }; -} // namespace +} // namespace AppearanceSettings #endif // APPEARANCESETTINGS_H diff --git a/src/constants/backendsettings.h b/src/constants/backendsettings.h index 314ae0a4a..3b38b3bbc 100644 --- a/src/constants/backendsettings.h +++ b/src/constants/backendsettings.h @@ -63,6 +63,6 @@ constexpr qint64 kDefaultBufferDuration = 4000; constexpr double kDefaultBufferLowWatermark = 0.33; constexpr double kDefaultBufferHighWatermark = 0.99; -} // namespace +} // namespace BackendSettings #endif // BACKENDSETTINGS_H diff --git a/src/constants/behavioursettings.h b/src/constants/behavioursettings.h index f24a03d03..22ccfc8c4 100644 --- a/src/constants/behavioursettings.h +++ b/src/constants/behavioursettings.h @@ -71,6 +71,6 @@ constexpr char kDoubleClickPlaylistAddMode[] = "doubleclick_playlist_addmode"; constexpr char kSeekStepSec[] = "seek_step_sec"; constexpr char kVolumeIncrement[] = "volume_increment"; -} // namespace +} // namespace BehaviourSettings #endif // BEHAVIOURSETTINGS_H diff --git a/src/constants/collectionsettings.h b/src/constants/collectionsettings.h index 60cc847bd..23e502a7f 100644 --- a/src/constants/collectionsettings.h +++ b/src/constants/collectionsettings.h @@ -59,6 +59,6 @@ enum class CacheSizeUnit { TB }; -} // namespace +} // namespace CollectionSettings #endif // COLLECTIONSETTINGS_H diff --git a/src/constants/contextsettings.h b/src/constants/contextsettings.h index 2987494ee..2ec96bf8b 100644 --- a/src/constants/contextsettings.h +++ b/src/constants/contextsettings.h @@ -43,6 +43,6 @@ constexpr char kSettingsSummaryFmt[] = "SummaryFmt"; constexpr char kDefaultFontFamily[] = "Noto Sans"; constexpr qreal kDefaultFontSizeHeadline = 11; -} // namespace +} // namespace ContextSettings #endif // CONTEXTSETTINGS_H diff --git a/src/constants/coverssettings.h b/src/constants/coverssettings.h index 28565008e..a33f21a32 100644 --- a/src/constants/coverssettings.h +++ b/src/constants/coverssettings.h @@ -32,6 +32,6 @@ constexpr char kSaveOverwrite[] = "save_overwrite"; constexpr char kSaveLowercase[] = "save_lowercase"; constexpr char kSaveReplaceSpaces[] = "save_replace_spaces"; -} // namespace +} // namespace CoversSettings #endif // COVERSSETTINGS_H diff --git a/src/constants/globalshortcutssettings.h b/src/constants/globalshortcutssettings.h index 5f932580c..e4813a966 100644 --- a/src/constants/globalshortcutssettings.h +++ b/src/constants/globalshortcutssettings.h @@ -26,6 +26,6 @@ constexpr char kSettingsGroup[] = "GlobalShortcuts"; constexpr char kUseKGlobalAccel[] = "use_kglobalaccel"; constexpr char kUseX11[] = "use_x11"; -} // namespace +} // namespace GlobalShortcutsSettings #endif // GLOBALSHORTCUTSSETTINGS_H diff --git a/src/constants/lyricssettings.h b/src/constants/lyricssettings.h index a90eeed51..6102fec45 100644 --- a/src/constants/lyricssettings.h +++ b/src/constants/lyricssettings.h @@ -25,6 +25,6 @@ namespace LyricsSettings { constexpr char kSettingsGroup[] = "Lyrics"; constexpr char kProviders[] = "providers"; -} // namespace +} // namespace LyricsSettings #endif // LYRICSSETTINGS_H diff --git a/src/constants/mainwindowsettings.h b/src/constants/mainwindowsettings.h index 9afdb6a4c..76974a05c 100644 --- a/src/constants/mainwindowsettings.h +++ b/src/constants/mainwindowsettings.h @@ -32,6 +32,6 @@ constexpr char kGeometry[] = "geometry"; constexpr char kSplitterState[] = "splitter_state"; constexpr char kDoNotShowSponsorMessage[] = "do_not_show_sponsor_message"; -} // namespace +} // namespace MainWindowSettings -#endif // MAINWINDOWSETTINGS_H +#endif // MAINWINDOWSETTINGS_H diff --git a/src/constants/moodbarsettings.h b/src/constants/moodbarsettings.h index 10b22325a..4bdd88f5d 100644 --- a/src/constants/moodbarsettings.h +++ b/src/constants/moodbarsettings.h @@ -38,6 +38,6 @@ constexpr char kShow[] = "show"; constexpr char kStyle[] = "style"; constexpr char kSave[] = "save"; -} // namespace +} // namespace MoodbarSettings #endif // MOODBARSETTINGS_H diff --git a/src/constants/networkproxysettings.h b/src/constants/networkproxysettings.h index 54afff020..e85e1b9cd 100644 --- a/src/constants/networkproxysettings.h +++ b/src/constants/networkproxysettings.h @@ -32,6 +32,6 @@ constexpr char kUsername[] = "username"; constexpr char kPassword[] = "password"; constexpr char kEngine[] = "engine"; -} // namespace +} // namespace NetworkProxySettings #endif // NETWORKPROXYSETTINGS_H diff --git a/src/constants/notificationssettings.h b/src/constants/notificationssettings.h index a073bdccb..e68af9820 100644 --- a/src/constants/notificationssettings.h +++ b/src/constants/notificationssettings.h @@ -45,7 +45,7 @@ constexpr char kCustomTextEnabled[] = "CustomTextEnabled"; constexpr char kCustomText1[] = "CustomText1"; constexpr char kCustomText2[] = "CustomText2"; -} // namespace +} // namespace OSDSettings namespace OSDPrettySettings { @@ -63,7 +63,7 @@ constexpr char kFading[] = "fading"; constexpr QRgb kPresetBlue = qRgb(102, 150, 227); constexpr QRgb kPresetRed = qRgb(202, 22, 16); -} // namespace +} // namespace OSDPrettySettings namespace DiscordRPCSettings { @@ -79,6 +79,6 @@ enum class StatusDisplayType { Song }; -} // namespace +} // namespace DiscordRPCSettings #endif // NOTIFICATIONSSETTINGS_H diff --git a/src/constants/playlistsettings.h b/src/constants/playlistsettings.h index d90ade63e..1af614829 100644 --- a/src/constants/playlistsettings.h +++ b/src/constants/playlistsettings.h @@ -63,7 +63,7 @@ constexpr char kLastSaveExtension[] = "last_save_extension"; constexpr char kLastSaveAllPath[] = "last_save_all_path"; constexpr char kLastSaveAllExtension[] = "last_save_all_extension"; -} // namespace +} // namespace PlaylistSettings Q_DECLARE_METATYPE(PlaylistSettings::PathType) diff --git a/src/constants/qobuzsettings.h b/src/constants/qobuzsettings.h index 5d0d66e05..b09117e78 100644 --- a/src/constants/qobuzsettings.h +++ b/src/constants/qobuzsettings.h @@ -43,6 +43,6 @@ constexpr char kCredentialsId[] = "credentials_id"; constexpr char kDeviceId[] = "device_id"; constexpr char kUserAuthToken[] = "user_auth_token"; -} // namespace +} // namespace QobuzSettings #endif // QOBUZSETTINGS_H diff --git a/src/constants/scrobblersettings.h b/src/constants/scrobblersettings.h index 13c040f49..6e6a45abe 100644 --- a/src/constants/scrobblersettings.h +++ b/src/constants/scrobblersettings.h @@ -35,6 +35,6 @@ constexpr char kStripRemastered[] = "strip_remastered"; constexpr char kSources[] = "sources"; constexpr char kUserToken[] = "user_token"; -} // namespace +} // namespace ScrobblerSettings #endif // SCROBBLERSETTINGS_H diff --git a/src/constants/spotifysettings.h b/src/constants/spotifysettings.h index 81e003535..ec6b7198f 100644 --- a/src/constants/spotifysettings.h +++ b/src/constants/spotifysettings.h @@ -38,6 +38,6 @@ constexpr char kRefreshToken[] = "refresh_token"; constexpr char kExpiresIn[] = "expires_in"; constexpr char kLoginTime[] = "login_time"; -} // namespace +} // namespace SpotifySettings #endif // SPOTIFYSETTINGS_H diff --git a/src/constants/subsonicsettings.h b/src/constants/subsonicsettings.h index d1718ff6f..53c55c208 100644 --- a/src/constants/subsonicsettings.h +++ b/src/constants/subsonicsettings.h @@ -41,6 +41,6 @@ constexpr char kUseAlbumIdForAlbumCovers[] = "usealbumidforalbumcovers"; constexpr char kServerSideScrobbling[] = "serversidescrobbling"; constexpr char kAuthMethod[] = "authmethod"; -} // namespace +} // namespace SubsonicSettings #endif // SUBSONICETTINGS_H diff --git a/src/constants/tidalsettings.h b/src/constants/tidalsettings.h index 2b18cb87c..863cb8d68 100644 --- a/src/constants/tidalsettings.h +++ b/src/constants/tidalsettings.h @@ -48,6 +48,6 @@ enum class StreamUrlMethod { PlaybackInfoPostPaywall }; -} +} // namespace TidalSettings #endif // TIDALSETTINGS_H diff --git a/src/context/contextalbum.h b/src/context/contextalbum.h index e7ead2496..6b862af8b 100644 --- a/src/context/contextalbum.h +++ b/src/context/contextalbum.h @@ -61,7 +61,6 @@ class ContextAlbum : public QWidget { void contextMenuEvent(QContextMenuEvent *e) override; private: - struct PreviousCover { explicit PreviousCover() : opacity(0.0) {} QImage image; diff --git a/src/context/contextview.h b/src/context/contextview.h index 800a5d683..68580462a 100644 --- a/src/context/contextview.h +++ b/src/context/contextview.h @@ -65,9 +65,9 @@ class ContextView : public QWidget { protected: void resizeEvent(QResizeEvent *e) override; - void contextMenuEvent(QContextMenuEvent*) override; - void dragEnterEvent(QDragEnterEvent*) override; - void dropEvent(QDropEvent*) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void dragEnterEvent(QDragEnterEvent *e) override; + void dropEvent(QDropEvent *e) override; private: void AddActions(); diff --git a/src/core/application.cpp b/src/core/application.cpp index c034e9249..86108be2b 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -118,7 +118,7 @@ using namespace std::chrono_literals; class ApplicationImpl { public: explicit ApplicationImpl(Application *app) - : tagreader_client_([app](){ + : tagreader_client_([app]() { TagReaderClient *client = new TagReaderClient(); app->MoveToNewThread(client); return client; diff --git a/src/core/commandlineoptions.cpp b/src/core/commandlineoptions.cpp index 07f5d78e1..77763d8b8 100644 --- a/src/core/commandlineoptions.cpp +++ b/src/core/commandlineoptions.cpp @@ -204,7 +204,7 @@ bool CommandlineOptions::Parse() { { "version", no_argument, nullptr, LongOptions::Version }, { nullptr, 0, nullptr, 0 } #endif -}; + }; // Parse the arguments bool ok = false; diff --git a/src/core/database.cpp b/src/core/database.cpp index 213f6f575..92266547d 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -503,7 +503,9 @@ bool Database::IntegrityCheck(const QSqlDatabase &db) { break; } else { - if (!error_reported) { Q_EMIT Error(tr("Database corruption detected.")); } + if (!error_reported) { + Q_EMIT Error(tr("Database corruption detected.")); + } Q_EMIT Error(u"Database: "_s + message); error_reported = true; } diff --git a/src/core/database.h b/src/core/database.h index fdb65a970..a26b8d49f 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -128,7 +128,6 @@ class Database : public QObject { int startup_schema_version_; QThread *original_thread_; - }; #endif // DATABASE_H diff --git a/src/core/iconloader.h b/src/core/iconloader.h index 61db4cc5f..6d7d6132f 100644 --- a/src/core/iconloader.h +++ b/src/core/iconloader.h @@ -27,6 +27,7 @@ class IconLoader { public: static void Init(); static QIcon Load(const QString &name, const bool system_icon = true, const int fixed_size = 0, const int min_size = 0, const int max_size = 0); + private: explicit IconLoader() {} static bool system_icons_; diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 756b45eba..cae02ec3d 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -220,7 +220,7 @@ #endif #ifdef HAVE_SPARKLE - #include "core/sparkleupdater.h" +# include "core/sparkleupdater.h" #endif #ifdef HAVE_QTSPARKLE @@ -228,7 +228,7 @@ #endif // HAVE_QTSPARKLE #ifdef HAVE_DISCORD_RPC - #include "discord/richpresence.h" +# include "discord/richpresence.h" #endif using std::make_unique; @@ -272,8 +272,8 @@ constexpr char QTSPARKLE_URL[] = "https://www.strawberrymusicplayer.org/sparkle- # endif # else -# error "Unsupported OS for QtSparkle" -# endif // OS +# error "Unsupported OS for QtSparkle" +# endif // OS } // namespace #endif // HAVE_QTSPARKLE diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h index b3d83ef4b..dd295ebac 100644 --- a/src/core/mainwindow.h +++ b/src/core/mainwindow.h @@ -285,7 +285,6 @@ class MainWindow : public QMainWindow, public PlatformInterface { void Raise(); private: - void SaveSettings(); static void ApplyAddBehaviour(const BehaviourSettings::AddBehaviour b, MimeData *mimedata); @@ -415,7 +414,6 @@ class MainWindow : public QMainWindow, public PlatformInterface { bool playlists_loaded_; bool delete_files_; std::optional options_; - }; #endif // MAINWINDOW_H diff --git a/src/core/player.h b/src/core/player.h index 801f07dd1..037650276 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -121,8 +121,8 @@ class Player : public PlayerInterface { void PlayPlaylistInternal(const EngineBase::TrackChangeFlags, const Playlist::AutoScroll autoscroll, const QString &playlist_name); void FatalError(); - void ValidSongRequested(const QUrl&); - void InvalidSongRequested(const QUrl&); + void ValidSongRequested(const QUrl &url); + void InvalidSongRequested(const QUrl &url); void HandleLoadResult(const UrlHandler::LoadResult &result); diff --git a/src/core/qtfslistener.h b/src/core/qtfslistener.h index dea4b79c4..8161e7434 100644 --- a/src/core/qtfslistener.h +++ b/src/core/qtfslistener.h @@ -40,7 +40,6 @@ class QtFSListener : public FileSystemWatcherInterface { private: QFileSystemWatcher watcher_; - }; #endif // QTFSLISTENER_H diff --git a/src/core/scoped_nsautorelease_pool.h b/src/core/scoped_nsautorelease_pool.h index 53da5b721..250f9fe4b 100644 --- a/src/core/scoped_nsautorelease_pool.h +++ b/src/core/scoped_nsautorelease_pool.h @@ -9,7 +9,7 @@ #if defined(__OBJC__) @class NSAutoreleasePool; -#else // __OBJC__ +#else // __OBJC__ class NSAutoreleasePool; #endif // __OBJC__ @@ -28,6 +28,7 @@ class ScopedNSAutoreleasePool { // Only use then when you're certain the items currently in the pool are // no longer needed. void Recycle(); + private: NSAutoreleasePool *autorelease_pool_; diff --git a/src/core/songloader.h b/src/core/songloader.h index 9e8ac4b90..ccc163dcc 100644 --- a/src/core/songloader.h +++ b/src/core/songloader.h @@ -171,7 +171,6 @@ class SongLoader : public QObject { QStringList errors_; bool success_; - }; #endif // SONGLOADER_H diff --git a/src/core/temporaryfile.h b/src/core/temporaryfile.h index a599e7e6e..4bc936d1e 100644 --- a/src/core/temporaryfile.h +++ b/src/core/temporaryfile.h @@ -36,4 +36,4 @@ class TemporaryFile { QString filename_; }; -#endif // TEMPORARYFILE_H +#endif // TEMPORARYFILE_H diff --git a/src/core/urlhandler.h b/src/core/urlhandler.h index 1ee41af02..f7f0c9ec2 100644 --- a/src/core/urlhandler.h +++ b/src/core/urlhandler.h @@ -89,7 +89,6 @@ class UrlHandler : public QObject { Q_SIGNALS: void AsyncLoadComplete(const UrlHandler::LoadResult &result); - }; #endif // URLHANDLER_H diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h index b8d9bf60b..a1af85183 100644 --- a/src/covermanager/albumcoverfetchersearch.h +++ b/src/covermanager/albumcoverfetchersearch.h @@ -113,7 +113,6 @@ class AlbumCoverFetcherSearch : public QObject { SharedPtr network_; bool cancel_requested_; - }; #endif // ALBUMCOVERFETCHERSEARCH_H diff --git a/src/covermanager/albumcoverloaderoptions.cpp b/src/covermanager/albumcoverloaderoptions.cpp index 7bc9b8b9e..3f02ddf3a 100644 --- a/src/covermanager/albumcoverloaderoptions.cpp +++ b/src/covermanager/albumcoverloaderoptions.cpp @@ -58,5 +58,4 @@ AlbumCoverLoaderOptions::Types AlbumCoverLoaderOptions::LoadTypes() { s.endGroup(); return cover_types; - } diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp index 1b5753c08..9420ca0d9 100644 --- a/src/covermanager/albumcovermanager.cpp +++ b/src/covermanager/albumcovermanager.cpp @@ -102,7 +102,7 @@ using std::make_shared; namespace { constexpr char kSettingsGroup[] = "CoverManager"; constexpr int kThumbnailSize = 120; -} +} // namespace AlbumCoverManager::AlbumCoverManager(const SharedPtr network, const SharedPtr collection_backend, diff --git a/src/covermanager/albumcoversearcher.h b/src/covermanager/albumcoversearcher.h index 8e7c82e0f..f7e0140ec 100644 --- a/src/covermanager/albumcoversearcher.h +++ b/src/covermanager/albumcoversearcher.h @@ -83,7 +83,7 @@ class AlbumCoverSearcher : public QDialog { AlbumCoverImageResult Exec(const QString &artist, const QString &album); protected: - void keyPressEvent(QKeyEvent*) override; + void keyPressEvent(QKeyEvent *e) override; private Q_SLOTS: void Search(); diff --git a/src/device/cddalister.h b/src/device/cddalister.h index dfaa11acf..a6fe0eec4 100644 --- a/src/device/cddalister.h +++ b/src/device/cddalister.h @@ -47,11 +47,11 @@ class CDDALister : public DeviceLister { quint64 DeviceCapacity(const QString &id) override; quint64 DeviceFreeSpace(const QString &id) override; QVariantMap DeviceHardwareInfo(const QString &id) override; - bool AskForScan(const QString&) const override { return false; } - QString MakeFriendlyName(const QString&) override; - QList MakeDeviceUrls(const QString&) override; - void UnmountDevice(const QString&) override; - void UpdateDeviceFreeSpace(const QString&) override; + bool AskForScan(const QString &id) const override { return false; } + QString MakeFriendlyName(const QString &id) override; + QList MakeDeviceUrls(const QString &id) override; + void UnmountDevice(const QString &id) override; + void UpdateDeviceFreeSpace(const QString &id) override; bool Init() override; bool CopyMusic() override { return false; } diff --git a/src/device/devicedatabasebackend.h b/src/device/devicedatabasebackend.h index 4c1f11f93..ec3b4db93 100644 --- a/src/device/devicedatabasebackend.h +++ b/src/device/devicedatabasebackend.h @@ -77,7 +77,6 @@ class DeviceDatabaseBackend : public QObject { private: SharedPtr db_; QThread *original_thread_; - }; #endif // DEVICEDATABASEBACKEND_H diff --git a/src/device/devicelister.cpp b/src/device/devicelister.cpp index 28db24b8f..958537405 100644 --- a/src/device/devicelister.cpp +++ b/src/device/devicelister.cpp @@ -229,8 +229,8 @@ QUrl DeviceLister::MakeUrlFromLocalPath(const QString &path) const { bool DeviceLister::IsIpod(const QString &path) { return QFile::exists(path + "/iTunes_Control"_L1) || - QFile::exists(path + "/iPod_Control"_L1) || - QFile::exists(path + "/iTunes/iTunes_Control"_L1); + QFile::exists(path + "/iPod_Control"_L1) || + QFile::exists(path + "/iTunes/iTunes_Control"_L1); } QVariantList DeviceLister::GuessIconForPath(const QString &path) { diff --git a/src/device/deviceview.h b/src/device/deviceview.h index fcd7ea774..6a7726c4b 100644 --- a/src/device/deviceview.h +++ b/src/device/deviceview.h @@ -61,7 +61,6 @@ class DeviceItemDelegate : public CollectionItemDelegate { static const int kIconPadding; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const override; - }; class DeviceView : public AutoExpandingTreeView { @@ -80,7 +79,7 @@ class DeviceView : public AutoExpandingTreeView { bool CanRecursivelyExpand(const QModelIndex &idx) const override; protected: - void contextMenuEvent(QContextMenuEvent*) override; + void contextMenuEvent(QContextMenuEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *e) override; private Q_SLOTS: diff --git a/src/device/filesystemdevice.h b/src/device/filesystemdevice.h index ae4848078..f5e6881f6 100644 --- a/src/device/filesystemdevice.h +++ b/src/device/filesystemdevice.h @@ -22,9 +22,9 @@ #ifndef FILESYSTEMDEVICE_H #define FILESYSTEMDEVICE_H -#ifdef _MSC_VER // FIXME -#pragma warning(push) -#pragma warning(disable : 4250) +#ifdef _MSC_VER // FIXME +# pragma warning(push) +# pragma warning(disable : 4250) #endif #include "config.h" @@ -84,7 +84,7 @@ class FilesystemDevice : public ConnectedDevice, public virtual FilesystemMusicS }; #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif #endif // FILESYSTEMDEVICE_H diff --git a/src/device/giolister.cpp b/src/device/giolister.cpp index c3009b0c2..c92f93c5f 100644 --- a/src/device/giolister.cpp +++ b/src/device/giolister.cpp @@ -160,7 +160,10 @@ QVariantList GioLister::DeviceIcons(const QString &id) { } -QString GioLister::DeviceManufacturer(const QString &id) { Q_UNUSED(id); return QString(); } +QString GioLister::DeviceManufacturer(const QString &id) { + Q_UNUSED(id); + return QString(); +} QString GioLister::DeviceModel(const QString &id) { @@ -484,21 +487,21 @@ void GioLister::DeviceInfo::ReadMountInfo(GMount *mount) { } #ifdef HAVE_GIO_UNIX -#ifdef GLIB_VERSION_2_84 +# ifdef GLIB_VERSION_2_84 GUnixMountEntry *unix_mount = g_unix_mount_entry_for(g_file_get_path(root), nullptr); -#else +# else GUnixMountEntry *unix_mount = g_unix_mount_for(g_file_get_path(root), nullptr); -#endif +# endif if (unix_mount) { // The GIO's definition of system internal mounts include filesystems like autofs, tmpfs, sysfs, etc, // and various system directories, including the root, /boot, /var, /home, etc. -#ifdef GLIB_VERSION_2_84 +# ifdef GLIB_VERSION_2_84 is_system_internal = g_unix_mount_entry_is_system_internal(unix_mount); g_unix_mount_entry_free(unix_mount); -#else +# else is_system_internal = g_unix_mount_is_system_internal(unix_mount); g_unix_mount_free(unix_mount); -#endif +# endif // Although checking most of the internal mounts is safe, we really don't want to touch autofs filesystems, as that would trigger automounting. if (is_system_internal) return; } diff --git a/src/device/giolister.h b/src/device/giolister.h index 4fa574e17..dd6512a03 100644 --- a/src/device/giolister.h +++ b/src/device/giolister.h @@ -119,8 +119,8 @@ class GioLister : public DeviceLister { static void VolumeAddedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance); static void VolumeRemovedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance); - static void MountAddedCallback(GVolumeMonitor *volume_monitor, GMount*, gpointer instance); - static void MountChangedCallback(GVolumeMonitor *volume_monitor, GMount*, gpointer instance); + static void MountAddedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance); + static void MountChangedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance); static void MountRemovedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance); static void VolumeMountFinished(GObject *object, GAsyncResult *result, gpointer instance); diff --git a/src/device/mtpconnection.cpp b/src/device/mtpconnection.cpp index e5a4bd403..bc122f9e7 100644 --- a/src/device/mtpconnection.cpp +++ b/src/device/mtpconnection.cpp @@ -151,13 +151,13 @@ bool MtpConnection::GetSupportedFiletypes(QList *ret) { for (int i = 0; i < length; ++i) { switch (static_cast(list[i])) { - case LIBMTP_FILETYPE_WAV: *ret << Song::FileType::WAV; break; + case LIBMTP_FILETYPE_WAV: *ret << Song::FileType::WAV; break; case LIBMTP_FILETYPE_MP2: - case LIBMTP_FILETYPE_MP3: *ret << Song::FileType::MPEG; break; - case LIBMTP_FILETYPE_WMA: *ret << Song::FileType::ASF; break; + case LIBMTP_FILETYPE_MP3: *ret << Song::FileType::MPEG; break; + case LIBMTP_FILETYPE_WMA: *ret << Song::FileType::ASF; break; case LIBMTP_FILETYPE_MP4: case LIBMTP_FILETYPE_M4A: - case LIBMTP_FILETYPE_AAC: *ret << Song::FileType::MP4; break; + case LIBMTP_FILETYPE_AAC: *ret << Song::FileType::MP4; break; case LIBMTP_FILETYPE_FLAC: *ret << Song::FileType::FLAC; *ret << Song::FileType::OggFlac; diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp index 19b752b04..ef6ad7c69 100644 --- a/src/device/mtpdevice.cpp +++ b/src/device/mtpdevice.cpp @@ -285,13 +285,13 @@ bool MtpDevice::GetSupportedFiletypes(QList *ret, LIBMTP_mtpdevi for (int i = 0; i < length; ++i) { switch (static_cast(list[i])) { - case LIBMTP_FILETYPE_WAV: *ret << Song::FileType::WAV; break; + case LIBMTP_FILETYPE_WAV: *ret << Song::FileType::WAV; break; case LIBMTP_FILETYPE_MP2: - case LIBMTP_FILETYPE_MP3: *ret << Song::FileType::MPEG; break; - case LIBMTP_FILETYPE_WMA: *ret << Song::FileType::ASF; break; + case LIBMTP_FILETYPE_MP3: *ret << Song::FileType::MPEG; break; + case LIBMTP_FILETYPE_WMA: *ret << Song::FileType::ASF; break; case LIBMTP_FILETYPE_MP4: case LIBMTP_FILETYPE_M4A: - case LIBMTP_FILETYPE_AAC: *ret << Song::FileType::MP4; break; + case LIBMTP_FILETYPE_AAC: *ret << Song::FileType::MP4; break; case LIBMTP_FILETYPE_FLAC: *ret << Song::FileType::FLAC; *ret << Song::FileType::OggFlac; diff --git a/src/device/mtploader.h b/src/device/mtploader.h index 77e945f51..c74b7a173 100644 --- a/src/device/mtploader.h +++ b/src/device/mtploader.h @@ -64,7 +64,6 @@ class MtpLoader : public QObject { ScopedPtr connection_; QThread *original_thread_; bool abort_; - }; #endif // MTPLOADER_H diff --git a/src/dialogs/saveplaylistsdialog.cpp b/src/dialogs/saveplaylistsdialog.cpp index 3fc80d792..51f6dc5f2 100644 --- a/src/dialogs/saveplaylistsdialog.cpp +++ b/src/dialogs/saveplaylistsdialog.cpp @@ -60,7 +60,7 @@ SavePlaylistsDialog::~SavePlaylistsDialog() { void SavePlaylistsDialog::SelectPath() { - const QString path = QFileDialog::getExistingDirectory(nullptr, tr("Select directory for the playlists"), ui_->lineedit_path->text(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); + const QString path = QFileDialog::getExistingDirectory(nullptr, tr("Select directory for the playlists"), ui_->lineedit_path->text(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); if (path.isEmpty()) return; diff --git a/src/engine/gstfastspectrum.cpp b/src/engine/gstfastspectrum.cpp index 963db436d..71bb7b7f6 100644 --- a/src/engine/gstfastspectrum.cpp +++ b/src/engine/gstfastspectrum.cpp @@ -49,19 +49,19 @@ enum { } // namespace #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wold-style-cast" #endif #ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4514) +# pragma warning(push) +# pragma warning(disable : 4514) #endif G_DEFINE_TYPE(GstStrawberryFastSpectrum, gst_strawberry_fastspectrum, GST_TYPE_AUDIO_FILTER) #ifdef __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif static void gst_strawberry_fastspectrum_finalize(GObject *object); @@ -97,13 +97,13 @@ static void gst_strawberry_fastspectrum_class_init(GstStrawberryFastSpectrumClas GST_DEBUG_CATEGORY_INIT(gst_strawberry_fastspectrum_debug, "spectrum", 0, "audio spectrum analyser element"); gst_element_class_set_static_metadata(element_class, - "Fast spectrum analyzer using FFTW", - "Filter/Analyzer/Audio", - "Run an FFT on the audio signal, output spectrum data", - "Erik Walthinsen , " - "Stefan Kost , " - "Sebastian Dröge , " - "Jonas Kvinge "); + "Fast spectrum analyzer using FFTW", + "Filter/Analyzer/Audio", + "Run an FFT on the audio signal, output spectrum data", + "Erik Walthinsen , " + "Stefan Kost , " + "Sebastian Dröge , " + "Jonas Kvinge "); #if G_BYTE_ORDER == G_LITTLE_ENDIAN GstCaps *caps = gst_caps_from_string(GST_AUDIO_CAPS_MAKE("{ S16LE, S24LE, S32LE, F32LE, F64LE }") ", layout = (string) interleaved, channels = 1"); @@ -272,7 +272,7 @@ static gboolean gst_strawberry_fastspectrum_stop(GstBaseTransform *transform) { static void gst_strawberry_fastspectrum_input_data_mixed_float(const guint8 *_in, double *out, const guint64 len, const double max_value, guint op, const guint nfft) { - (void) max_value; + (void)max_value; const gfloat *in = reinterpret_cast(_in); guint ip = 0; @@ -286,7 +286,7 @@ static void gst_strawberry_fastspectrum_input_data_mixed_float(const guint8 *_in static void gst_strawberry_fastspectrum_input_data_mixed_double(const guint8 *_in, double *out, const guint64 len, const double max_value, guint op, const guint nfft) { - (void) max_value; + (void)max_value; const gdouble *in = reinterpret_cast(_in); guint ip = 0; diff --git a/src/engine/gststartup.h b/src/engine/gststartup.h index 5d132d7d4..181f3802d 100644 --- a/src/engine/gststartup.h +++ b/src/engine/gststartup.h @@ -23,6 +23,6 @@ namespace GstStartup { void Initialize(); void SetEnvironment(); -} // namespace +} // namespace GstStartup #endif // GSTSTARTUP_H diff --git a/src/equalizer/equalizer.cpp b/src/equalizer/equalizer.cpp index 13759a587..e1b7039fc 100644 --- a/src/equalizer/equalizer.cpp +++ b/src/equalizer/equalizer.cpp @@ -110,12 +110,12 @@ void Equalizer::ReloadSettings() { for (int i = 0; i < count; ++i) { s.setArrayIndex(i); #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Warray-bounds" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Warray-bounds" #endif AddPreset(s.value("name").toString(), s.value("params").value()); #ifdef __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } s.endArray(); diff --git a/src/fileview/fileview.h b/src/fileview/fileview.h index 645286b55..81beabd7c 100644 --- a/src/fileview/fileview.h +++ b/src/fileview/fileview.h @@ -58,7 +58,7 @@ class FileView : public QWidget { void SetTaskManager(SharedPtr task_manager); protected: - void showEvent(QShowEvent*) override; + void showEvent(QShowEvent *e) override; void keyPressEvent(QKeyEvent *e) override; Q_SIGNALS: diff --git a/src/filterparser/filterparserfloateqcomparator.h b/src/filterparser/filterparserfloateqcomparator.h index 166264c82..a1ff031b0 100644 --- a/src/filterparser/filterparserfloateqcomparator.h +++ b/src/filterparser/filterparserfloateqcomparator.h @@ -28,6 +28,7 @@ class FilterParserFloatEqComparator : public FilterParserSearchTermComparator { public: explicit FilterParserFloatEqComparator(const float search_term); bool Matches(const QVariant &value) const override; + private: float search_term_; Q_DISABLE_COPY(FilterParserFloatEqComparator) diff --git a/src/filterparser/filterparserfloatgecomparator.h b/src/filterparser/filterparserfloatgecomparator.h index 8f12116ee..0e5efc315 100644 --- a/src/filterparser/filterparserfloatgecomparator.h +++ b/src/filterparser/filterparserfloatgecomparator.h @@ -28,6 +28,7 @@ class FilterParserFloatGeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserFloatGeComparator(const float search_term); bool Matches(const QVariant &value) const override; + private: float search_term_; Q_DISABLE_COPY(FilterParserFloatGeComparator) diff --git a/src/filterparser/filterparserfloatgtcomparator.h b/src/filterparser/filterparserfloatgtcomparator.h index 7d2892444..0678a5e8c 100644 --- a/src/filterparser/filterparserfloatgtcomparator.h +++ b/src/filterparser/filterparserfloatgtcomparator.h @@ -28,6 +28,7 @@ class FilterParserFloatGtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserFloatGtComparator(const float search_term); bool Matches(const QVariant &value) const override; + private: float search_term_; Q_DISABLE_COPY(FilterParserFloatGtComparator) diff --git a/src/filterparser/filterparserfloatlecomparator.h b/src/filterparser/filterparserfloatlecomparator.h index f8fe59d4e..2621d6980 100644 --- a/src/filterparser/filterparserfloatlecomparator.h +++ b/src/filterparser/filterparserfloatlecomparator.h @@ -28,6 +28,7 @@ class FilterParserFloatLeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserFloatLeComparator(const float search_term); bool Matches(const QVariant &value) const override; + private: float search_term_; Q_DISABLE_COPY(FilterParserFloatLeComparator) diff --git a/src/filterparser/filterparserfloatltcomparator.h b/src/filterparser/filterparserfloatltcomparator.h index c61277372..ff7872b7e 100644 --- a/src/filterparser/filterparserfloatltcomparator.h +++ b/src/filterparser/filterparserfloatltcomparator.h @@ -28,6 +28,7 @@ class FilterParserFloatLtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserFloatLtComparator(const float search_term); bool Matches(const QVariant &value) const override; + private: float search_term_; Q_DISABLE_COPY(FilterParserFloatLtComparator) diff --git a/src/filterparser/filterparserfloatnecomparator.h b/src/filterparser/filterparserfloatnecomparator.h index efa55641b..61c114b2f 100644 --- a/src/filterparser/filterparserfloatnecomparator.h +++ b/src/filterparser/filterparserfloatnecomparator.h @@ -28,6 +28,7 @@ class FilterParserFloatNeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserFloatNeComparator(const float value); bool Matches(const QVariant &value) const override; + private: float search_term_; Q_DISABLE_COPY(FilterParserFloatNeComparator) diff --git a/src/filterparser/filterparserint64eqcomparator.h b/src/filterparser/filterparserint64eqcomparator.h index fc8ca593c..7c11019a5 100644 --- a/src/filterparser/filterparserint64eqcomparator.h +++ b/src/filterparser/filterparserint64eqcomparator.h @@ -28,6 +28,7 @@ class FilterParserInt64EqComparator : public FilterParserSearchTermComparator { public: explicit FilterParserInt64EqComparator(const qint64 search_term); bool Matches(const QVariant &value) const override; + private: qint64 search_term_; Q_DISABLE_COPY(FilterParserInt64EqComparator) diff --git a/src/filterparser/filterparserint64gecomparator.h b/src/filterparser/filterparserint64gecomparator.h index 27869becd..a98430d63 100644 --- a/src/filterparser/filterparserint64gecomparator.h +++ b/src/filterparser/filterparserint64gecomparator.h @@ -28,6 +28,7 @@ class FilterParserInt64GeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserInt64GeComparator(const qint64 search_term); bool Matches(const QVariant &value) const override; + private: qint64 search_term_; Q_DISABLE_COPY(FilterParserInt64GeComparator) diff --git a/src/filterparser/filterparserint64gtcomparator.h b/src/filterparser/filterparserint64gtcomparator.h index 8aeaac099..82519d645 100644 --- a/src/filterparser/filterparserint64gtcomparator.h +++ b/src/filterparser/filterparserint64gtcomparator.h @@ -28,6 +28,7 @@ class FilterParserInt64GtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserInt64GtComparator(const qint64 search_term); bool Matches(const QVariant &value) const override; + private: qint64 search_term_; Q_DISABLE_COPY(FilterParserInt64GtComparator) diff --git a/src/filterparser/filterparserint64lecomparator.h b/src/filterparser/filterparserint64lecomparator.h index 22792d7a0..e9ed6bee8 100644 --- a/src/filterparser/filterparserint64lecomparator.h +++ b/src/filterparser/filterparserint64lecomparator.h @@ -28,6 +28,7 @@ class FilterParserInt64LeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserInt64LeComparator(const qint64 search_term); bool Matches(const QVariant &value) const override; + private: qint64 search_term_; Q_DISABLE_COPY(FilterParserInt64LeComparator) diff --git a/src/filterparser/filterparserint64ltcomparator.h b/src/filterparser/filterparserint64ltcomparator.h index 0fe8c16f4..9f94d2180 100644 --- a/src/filterparser/filterparserint64ltcomparator.h +++ b/src/filterparser/filterparserint64ltcomparator.h @@ -28,6 +28,7 @@ class FilterParserInt64LtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserInt64LtComparator(const qint64 search_term); bool Matches(const QVariant &value) const override; + private: qint64 search_term_; Q_DISABLE_COPY(FilterParserInt64LtComparator) diff --git a/src/filterparser/filterparserint64necomparator.h b/src/filterparser/filterparserint64necomparator.h index 3f9d6bebc..984d588bd 100644 --- a/src/filterparser/filterparserint64necomparator.h +++ b/src/filterparser/filterparserint64necomparator.h @@ -28,6 +28,7 @@ class FilterParserInt64NeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserInt64NeComparator(const qint64 search_term); bool Matches(const QVariant &value) const override; + private: qint64 search_term_; Q_DISABLE_COPY(FilterParserInt64NeComparator) diff --git a/src/filterparser/filterparserinteqcomparator.h b/src/filterparser/filterparserinteqcomparator.h index 1bd6f685f..50e90fa26 100644 --- a/src/filterparser/filterparserinteqcomparator.h +++ b/src/filterparser/filterparserinteqcomparator.h @@ -28,6 +28,7 @@ class FilterParserIntEqComparator : public FilterParserSearchTermComparator { public: explicit FilterParserIntEqComparator(const int search_term); bool Matches(const QVariant &value) const override; + private: int search_term_; Q_DISABLE_COPY(FilterParserIntEqComparator) diff --git a/src/filterparser/filterparserintgecomparator.h b/src/filterparser/filterparserintgecomparator.h index d6becb152..03290657c 100644 --- a/src/filterparser/filterparserintgecomparator.h +++ b/src/filterparser/filterparserintgecomparator.h @@ -28,6 +28,7 @@ class FilterParserIntGeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserIntGeComparator(const int search_term); bool Matches(const QVariant &value) const override; + private: int search_term_; Q_DISABLE_COPY(FilterParserIntGeComparator) diff --git a/src/filterparser/filterparserintgtcomparator.h b/src/filterparser/filterparserintgtcomparator.h index 9e993136b..435b9df59 100644 --- a/src/filterparser/filterparserintgtcomparator.h +++ b/src/filterparser/filterparserintgtcomparator.h @@ -28,6 +28,7 @@ class FilterParserIntGtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserIntGtComparator(const int search_term); bool Matches(const QVariant &value) const override; + private: int search_term_; Q_DISABLE_COPY(FilterParserIntGtComparator) diff --git a/src/filterparser/filterparserintlecomparator.h b/src/filterparser/filterparserintlecomparator.h index d39b1f2ab..b0fe2a1ce 100644 --- a/src/filterparser/filterparserintlecomparator.h +++ b/src/filterparser/filterparserintlecomparator.h @@ -28,6 +28,7 @@ class FilterParserIntLeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserIntLeComparator(const int search_term); bool Matches(const QVariant &value) const override; + private: int search_term_; Q_DISABLE_COPY(FilterParserIntLeComparator) diff --git a/src/filterparser/filterparserintltcomparator.h b/src/filterparser/filterparserintltcomparator.h index f972046e8..09638182a 100644 --- a/src/filterparser/filterparserintltcomparator.h +++ b/src/filterparser/filterparserintltcomparator.h @@ -28,6 +28,7 @@ class FilterParserIntLtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserIntLtComparator(const int search_term); bool Matches(const QVariant &value) const override; + private: int search_term_; Q_DISABLE_COPY(FilterParserIntLtComparator) diff --git a/src/filterparser/filterparserintnecomparator.h b/src/filterparser/filterparserintnecomparator.h index cc6aaa11c..c29acf52c 100644 --- a/src/filterparser/filterparserintnecomparator.h +++ b/src/filterparser/filterparserintnecomparator.h @@ -28,6 +28,7 @@ class FilterParserIntNeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserIntNeComparator(const int search_term); bool Matches(const QVariant &value) const override; + private: int search_term_; Q_DISABLE_COPY(FilterParserIntNeComparator) diff --git a/src/filterparser/filterparsersearchtermcomparator.h b/src/filterparser/filterparsersearchtermcomparator.h index 72bbf9e4f..abeefe3c2 100644 --- a/src/filterparser/filterparsersearchtermcomparator.h +++ b/src/filterparser/filterparsersearchtermcomparator.h @@ -27,6 +27,7 @@ class FilterParserSearchTermComparator { explicit FilterParserSearchTermComparator(); virtual ~FilterParserSearchTermComparator(); virtual bool Matches(const QVariant &value) const = 0; + private: Q_DISABLE_COPY(FilterParserSearchTermComparator) }; diff --git a/src/filterparser/filterparsertextcontainscomparator.h b/src/filterparser/filterparsertextcontainscomparator.h index 1a18709f7..94d433d43 100644 --- a/src/filterparser/filterparsertextcontainscomparator.h +++ b/src/filterparser/filterparsertextcontainscomparator.h @@ -28,6 +28,7 @@ class FilterParserTextContainsComparator : public FilterParserSearchTermComparat public: explicit FilterParserTextContainsComparator(const QString &search_term); bool Matches(const QVariant &value) const override; + private: QString search_term_; Q_DISABLE_COPY(FilterParserTextContainsComparator) diff --git a/src/filterparser/filterparsertexteqcomparator.h b/src/filterparser/filterparsertexteqcomparator.h index 07f9eabae..926a22dc6 100644 --- a/src/filterparser/filterparsertexteqcomparator.h +++ b/src/filterparser/filterparsertexteqcomparator.h @@ -29,6 +29,7 @@ class FilterParserTextEqComparator : public FilterParserSearchTermComparator { public: explicit FilterParserTextEqComparator(const QString &search_term); bool Matches(const QVariant &value) const override; + private: QString search_term_; Q_DISABLE_COPY(FilterParserTextEqComparator) diff --git a/src/filterparser/filterparsertextnecomparator.h b/src/filterparser/filterparsertextnecomparator.h index db286c757..df2f661a3 100644 --- a/src/filterparser/filterparsertextnecomparator.h +++ b/src/filterparser/filterparsertextnecomparator.h @@ -29,6 +29,7 @@ class FilterParserTextNeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserTextNeComparator(const QString &search_term); bool Matches(const QVariant &value) const override; + private: QString search_term_; Q_DISABLE_COPY(FilterParserTextNeComparator) diff --git a/src/filterparser/filterparseruinteqcomparator.h b/src/filterparser/filterparseruinteqcomparator.h index 30a618701..3e3a3bbaa 100644 --- a/src/filterparser/filterparseruinteqcomparator.h +++ b/src/filterparser/filterparseruinteqcomparator.h @@ -28,6 +28,7 @@ class FilterParserUIntEqComparator : public FilterParserSearchTermComparator { public: explicit FilterParserUIntEqComparator(const uint search_term); bool Matches(const QVariant &value) const override; + private: uint search_term_; Q_DISABLE_COPY(FilterParserUIntEqComparator) diff --git a/src/filterparser/filterparseruintgecomparator.h b/src/filterparser/filterparseruintgecomparator.h index 02543b508..68fcf2bcf 100644 --- a/src/filterparser/filterparseruintgecomparator.h +++ b/src/filterparser/filterparseruintgecomparator.h @@ -28,6 +28,7 @@ class FilterParserUIntGeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserUIntGeComparator(const uint search_term); bool Matches(const QVariant &value) const override; + private: uint search_term_; Q_DISABLE_COPY(FilterParserUIntGeComparator) diff --git a/src/filterparser/filterparseruintgtcomparator.h b/src/filterparser/filterparseruintgtcomparator.h index fe8441d47..bbc23a11a 100644 --- a/src/filterparser/filterparseruintgtcomparator.h +++ b/src/filterparser/filterparseruintgtcomparator.h @@ -28,6 +28,7 @@ class FilterParserUIntGtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserUIntGtComparator(const uint search_term); bool Matches(const QVariant &value) const override; + private: uint search_term_; Q_DISABLE_COPY(FilterParserUIntGtComparator) diff --git a/src/filterparser/filterparseruintlecomparator.h b/src/filterparser/filterparseruintlecomparator.h index b6390a547..c583750bd 100644 --- a/src/filterparser/filterparseruintlecomparator.h +++ b/src/filterparser/filterparseruintlecomparator.h @@ -28,6 +28,7 @@ class FilterParserUIntLeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserUIntLeComparator(const uint search_term); bool Matches(const QVariant &value) const override; + private: uint search_term_; Q_DISABLE_COPY(FilterParserUIntLeComparator) diff --git a/src/filterparser/filterparseruintltcomparator.h b/src/filterparser/filterparseruintltcomparator.h index f31c53632..c48cadd27 100644 --- a/src/filterparser/filterparseruintltcomparator.h +++ b/src/filterparser/filterparseruintltcomparator.h @@ -28,6 +28,7 @@ class FilterParserUIntLtComparator : public FilterParserSearchTermComparator { public: explicit FilterParserUIntLtComparator(const uint search_term); bool Matches(const QVariant &value) const override; + private: uint search_term_; Q_DISABLE_COPY(FilterParserUIntLtComparator) diff --git a/src/filterparser/filterparseruintnecomparator.h b/src/filterparser/filterparseruintnecomparator.h index a000d040d..6f8e7eec5 100644 --- a/src/filterparser/filterparseruintnecomparator.h +++ b/src/filterparser/filterparseruintnecomparator.h @@ -28,6 +28,7 @@ class FilterParserUIntNeComparator : public FilterParserSearchTermComparator { public: explicit FilterParserUIntNeComparator(const uint search_term); bool Matches(const QVariant &value) const override; + private: uint search_term_; Q_DISABLE_COPY(FilterParserUIntNeComparator) diff --git a/src/globalshortcuts/globalshortcut.h b/src/globalshortcuts/globalshortcut.h index 0d93eef75..b8388c1d1 100644 --- a/src/globalshortcuts/globalshortcut.h +++ b/src/globalshortcuts/globalshortcut.h @@ -54,7 +54,6 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter { void activated(); private: - static void activateShortcut(const quint32 native_key, const quint32 native_mods); static int nativeModifiers(const Qt::KeyboardModifiers qt_mods); diff --git a/src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp b/src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp index 31cddb12e..221fb1599 100644 --- a/src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp @@ -43,7 +43,7 @@ using namespace Qt::Literals::StringLiterals; namespace { constexpr char kKGlobalAccelService[] = "org.kde.kglobalaccel"; constexpr char kKGlobalAccelPath[] = "/kglobalaccel"; -} +} // namespace GlobalShortcutsBackendKGlobalAccel::GlobalShortcutsBackendKGlobalAccel(GlobalShortcutsManager *manager, QObject *parent) : GlobalShortcutsBackend(manager, GlobalShortcutsBackend::Type::KGlobalAccel, parent), diff --git a/src/globalshortcuts/globalshortcutsmanager.cpp b/src/globalshortcuts/globalshortcutsmanager.cpp index 8d257b9ab..22a66d929 100644 --- a/src/globalshortcuts/globalshortcutsmanager.cpp +++ b/src/globalshortcuts/globalshortcutsmanager.cpp @@ -37,7 +37,7 @@ #include "globalshortcutsbackend.h" #ifdef HAVE_KGLOBALACCEL_GLOBALSHORTCUTS -#include "globalshortcutsbackend-kglobalaccel.h" +# include "globalshortcutsbackend-kglobalaccel.h" #endif #ifdef HAVE_X11_GLOBALSHORTCUTS diff --git a/src/includes/lazy.h b/src/includes/lazy.h index 9102fa41e..c88675f45 100644 --- a/src/includes/lazy.h +++ b/src/includes/lazy.h @@ -52,7 +52,7 @@ class Lazy { return *ptr_; } - T* operator->() const { return get(); } + T *operator->() const { return get(); } // Returns true if the object is initialized. explicit operator bool() const { return ptr_ != nullptr; } diff --git a/src/includes/scopedgobject.h b/src/includes/scopedgobject.h index c3dedfee5..b19902b7c 100644 --- a/src/includes/scopedgobject.h +++ b/src/includes/scopedgobject.h @@ -53,7 +53,7 @@ class ScopedGObject { } T *get() const { return object_; } - operator T*() const { return get(); } + operator T *() const { return get(); } T *operator*() const { return get(); } operator bool() const { return get(); } diff --git a/src/lyrics/jsonlyricsprovider.h b/src/lyrics/jsonlyricsprovider.h index 6f866e8c1..30a33618f 100644 --- a/src/lyrics/jsonlyricsprovider.h +++ b/src/lyrics/jsonlyricsprovider.h @@ -54,7 +54,6 @@ class JsonLyricsProvider : public LyricsProvider { virtual JsonObjectResult GetJsonObject(QNetworkReply *reply); virtual QJsonValue GetJsonValue(const QJsonObject &json_object, const QString &name); virtual QJsonArray GetJsonArray(const QJsonObject &json_object, const QString &name); - }; #endif // JSONLYRICSPROVIDER_H diff --git a/src/main.cpp b/src/main.cpp index e6ac8d42c..e13db3b62 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -281,16 +281,16 @@ int main(int argc, char *argv[]) { // Use system UI languages if (languages.isEmpty()) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) +# if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) languages = QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore); -#else +# else const QStringList system_languages = QLocale::system().uiLanguages(); for (const QString &language : system_languages) { QString language_underscore = language; language_underscore = language_underscore.replace(u'-', u'_'); languages << language_underscore; } -#endif +# endif } if (languages.isEmpty()) { @@ -323,13 +323,13 @@ int main(int argc, char *argv[]) { } } -#ifdef HAVE_QTSPARKLE +# ifdef HAVE_QTSPARKLE for (const QString &language : std::as_const(languages)) { if (qtsparkle::LoadTranslations(language)) { break; } } -#endif // HAVE_QTSPARKLE +# endif // HAVE_QTSPARKLE #endif // HAVE_TRANSLATIONS diff --git a/src/mpris2/mpris2.cpp b/src/mpris2/mpris2.cpp index 5aa6bbde5..e8abe9ae4 100644 --- a/src/mpris2/mpris2.cpp +++ b/src/mpris2/mpris2.cpp @@ -58,8 +58,8 @@ #include "covermanager/albumcoverloaderresult.h" #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Warray-bounds" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Warray-bounds" #endif #include "mpris2_player.h" @@ -68,7 +68,7 @@ #include "mpris2_tracklist.h" #ifdef __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif using namespace Qt::Literals::StringLiterals; diff --git a/src/mpris2/mpris2.h b/src/mpris2/mpris2.h index b3c69f030..27b6cb85f 100644 --- a/src/mpris2/mpris2.h +++ b/src/mpris2/mpris2.h @@ -61,8 +61,8 @@ Q_DECLARE_METATYPE(MprisPlaylist) Q_DECLARE_METATYPE(MprisPlaylistList) #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Warray-bounds" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Warray-bounds" #endif struct MaybePlaylist { @@ -72,7 +72,7 @@ struct MaybePlaylist { Q_DECLARE_METATYPE(MaybePlaylist) #ifdef __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif QDBusArgument &operator<<(QDBusArgument &arg, const MprisPlaylist &playlist); @@ -254,7 +254,6 @@ class Mpris2 : public QObject { QString desktopfilepath_; QVariantMap last_metadata_; - }; } // namespace mpris diff --git a/src/organize/organize.h b/src/organize/organize.h index 150fe0de8..aad14c32c 100644 --- a/src/organize/organize.h +++ b/src/organize/organize.h @@ -78,7 +78,7 @@ class Organize : public QObject { void Start(); Q_SIGNALS: - void Finished(const QStringList &files_with_errors, const QStringList&); + void Finished(const QStringList &files_with_errors, const QStringList &log); void FileCopied(const int database_id); void SongPathChanged(const Song &song, const QFileInfo &new_file, const std::optional new_collection_directory_id); diff --git a/src/organize/organizedialog.cpp b/src/organize/organizedialog.cpp index 93e056f90..f178686cb 100644 --- a/src/organize/organizedialog.cpp +++ b/src/organize/organizedialog.cpp @@ -80,7 +80,7 @@ using namespace Qt::Literals::StringLiterals; namespace { constexpr char kSettingsGroup[] = "OrganizeDialog"; constexpr char kDefaultFormat[] = "%albumartist/%album{ (Disc %disc)}/{%track - }{%albumartist - }%album{ (Disc %disc)} - %title.%extension"; -} +} // namespace OrganizeDialog::OrganizeDialog(const SharedPtr task_manager, const SharedPtr tagreader_client, diff --git a/src/osd/osdbase.cpp b/src/osd/osdbase.cpp index 0cef742d5..14bf6f79c 100644 --- a/src/osd/osdbase.cpp +++ b/src/osd/osdbase.cpp @@ -346,7 +346,7 @@ void OSDBase::ShowMessage(const QString &summary, const QString &message, const case OSDSettings::Type::Disabled: if (!force_show_next_) break; force_show_next_ = false; - [[fallthrough]]; + [[fallthrough]]; case OSDSettings::Type::Pretty: pretty_popup_->ShowMessage(summary, message, image); break; diff --git a/src/osd/osdpretty.h b/src/osd/osdpretty.h index 7e2ed1420..0bb5d5ca7 100644 --- a/src/osd/osdpretty.h +++ b/src/osd/osdpretty.h @@ -103,8 +103,8 @@ class OSDPretty : public QWidget { protected: void paintEvent(QPaintEvent *e) override; - void enterEvent(QEnterEvent*) override; - void leaveEvent(QEvent*) override; + void enterEvent(QEnterEvent *e) override; + void leaveEvent(QEvent *e) override; void mousePressEvent(QMouseEvent *e) override; void showEvent(QShowEvent *e) override; void mouseMoveEvent(QMouseEvent *e) override; diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index 2ee43615b..5b95d2bda 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -122,7 +122,7 @@ constexpr qint64 kMaxScrobblePointNsecs = 240LL * kNsecPerSec; constexpr int kMaxPlayedIndexes = 100; -} // namespace +} // namespace Playlist::Playlist(const SharedPtr task_manager, const SharedPtr url_handlers, diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h index 9842a0670..aed857262 100644 --- a/src/playlist/playlistcontainer.h +++ b/src/playlist/playlistcontainer.h @@ -71,7 +71,7 @@ class PlaylistContainer : public QWidget { protected: // QWidget - void resizeEvent(QResizeEvent*) override; + void resizeEvent(QResizeEvent *e) override; private Q_SLOTS: void NewPlaylist(); diff --git a/src/playlist/playlistheader.h b/src/playlist/playlistheader.h index 18080b67c..ca5be8e81 100644 --- a/src/playlist/playlistheader.h +++ b/src/playlist/playlistheader.h @@ -45,7 +45,7 @@ class PlaylistHeader : public StretchHeaderView { // QWidget void contextMenuEvent(QContextMenuEvent *e) override; - void enterEvent(QEnterEvent*) override; + void enterEvent(QEnterEvent *e) override; Q_SIGNALS: void SectionVisibilityChanged(const int logical_index, const bool visible); @@ -75,7 +75,6 @@ class PlaylistHeader : public StretchHeaderView { QAction *action_align_center_; QAction *action_align_right_; QList show_actions_; - }; #endif // PLAYLISTHEADER_H diff --git a/src/playlist/playlistlistview.h b/src/playlist/playlistlistview.h index 20f4b6b40..82e7a2dcf 100644 --- a/src/playlist/playlistlistview.h +++ b/src/playlist/playlistlistview.h @@ -53,7 +53,7 @@ class PlaylistListView : public AutoExpandingTreeView { protected: // QWidget void paintEvent(QPaintEvent *event) override; - void selectionChanged(const QItemSelection&, const QItemSelection&) override; + void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override; void dragEnterEvent(QDragEnterEvent *e) override; void dragMoveEvent(QDragMoveEvent *e) override; diff --git a/src/playlist/playlistundocommandbase.h b/src/playlist/playlistundocommandbase.h index f053cfc93..3861e72e2 100644 --- a/src/playlist/playlistundocommandbase.h +++ b/src/playlist/playlistundocommandbase.h @@ -36,4 +36,4 @@ class PlaylistUndoCommandBase : public QUndoCommand { Playlist *playlist_; }; -#endif // PLAYLISTUNDOCOMMANDBASE_H +#endif // PLAYLISTUNDOCOMMANDBASE_H diff --git a/src/playlist/playlistundocommandinsertitems.h b/src/playlist/playlistundocommandinsertitems.h index d09a88d81..8550d4c4b 100644 --- a/src/playlist/playlistundocommandinsertitems.h +++ b/src/playlist/playlistundocommandinsertitems.h @@ -41,4 +41,4 @@ class PlaylistUndoCommandInsertItems : public PlaylistUndoCommandBase { bool enqueue_next_; }; -#endif // PLAYLISTUNDOCOMMANDINSERTITEMS_H +#endif // PLAYLISTUNDOCOMMANDINSERTITEMS_H diff --git a/src/playlist/playlistundocommandmoveitems.h b/src/playlist/playlistundocommandmoveitems.h index e5013bc6d..4c3aa4de1 100644 --- a/src/playlist/playlistundocommandmoveitems.h +++ b/src/playlist/playlistundocommandmoveitems.h @@ -38,4 +38,4 @@ class PlaylistUndoCommandMoveItems : public PlaylistUndoCommandBase { int pos_; }; -#endif // PLAYLISTUNDOCOMMANDMOVEITEMS_H +#endif // PLAYLISTUNDOCOMMANDMOVEITEMS_H diff --git a/src/playlist/playlistundocommandremoveitems.h b/src/playlist/playlistundocommandremoveitems.h index 662f0684d..0eadf5c68 100644 --- a/src/playlist/playlistundocommandremoveitems.h +++ b/src/playlist/playlistundocommandremoveitems.h @@ -46,4 +46,4 @@ class PlaylistUndoCommandRemoveItems : public PlaylistUndoCommandBase { QList ranges_; }; -#endif // PLAYLISTUNDOCOMMANDREMOVEITEMS_H +#endif // PLAYLISTUNDOCOMMANDREMOVEITEMS_H diff --git a/src/playlist/playlistundocommandreorderitems.h b/src/playlist/playlistundocommandreorderitems.h index 46eba84f2..e625a4d34 100644 --- a/src/playlist/playlistundocommandreorderitems.h +++ b/src/playlist/playlistundocommandreorderitems.h @@ -37,4 +37,4 @@ class PlaylistUndoCommandReOrderItems : public PlaylistUndoCommandBase { PlaylistItemPtrList new_items_; }; -#endif // PLAYLISTUNDOCOMMANDREORDERITEMS_H +#endif // PLAYLISTUNDOCOMMANDREORDERITEMS_H diff --git a/src/playlist/playlistundocommandshuffleitems.h b/src/playlist/playlistundocommandshuffleitems.h index 7ef0e61f8..ea471db40 100644 --- a/src/playlist/playlistundocommandshuffleitems.h +++ b/src/playlist/playlistundocommandshuffleitems.h @@ -30,4 +30,4 @@ class PlaylistUndoCommandShuffleItems : public PlaylistUndoCommandReOrderItems { explicit PlaylistUndoCommandShuffleItems(Playlist *playlist, const PlaylistItemPtrList &new_items); }; -#endif // PLAYLISTUNDOCOMMANDSHUFFLEITEMS_H +#endif // PLAYLISTUNDOCOMMANDSHUFFLEITEMS_H diff --git a/src/playlist/playlistundocommandsortitems.h b/src/playlist/playlistundocommandsortitems.h index 13e7168fe..3bddb67ab 100644 --- a/src/playlist/playlistundocommandsortitems.h +++ b/src/playlist/playlistundocommandsortitems.h @@ -29,4 +29,4 @@ class PlaylistUndoCommandSortItems : public PlaylistUndoCommandReOrderItems { explicit PlaylistUndoCommandSortItems(Playlist *playlist, const Playlist::Column column, const Qt::SortOrder order, const PlaylistItemPtrList &new_items); }; -#endif // PLAYLISTUNDOCOMMANDSORTITEMS_H +#endif // PLAYLISTUNDOCOMMANDSORTITEMS_H diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index 601959c15..6785a6b29 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -136,7 +136,7 @@ class PlaylistView : public QTreeView { void timerEvent(QTimerEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; void mousePressEvent(QMouseEvent *event) override; - void leaveEvent(QEvent*) override; + void leaveEvent(QEvent *e) override; void paintEvent(QPaintEvent *event) override; void dragMoveEvent(QDragMoveEvent *event) override; void dragEnterEvent(QDragEnterEvent *event) override; diff --git a/src/playlistparsers/m3uparser.h b/src/playlistparsers/m3uparser.h index f3e9282f4..471131af4 100644 --- a/src/playlistparsers/m3uparser.h +++ b/src/playlistparsers/m3uparser.h @@ -71,7 +71,6 @@ class M3UParser : public ParserBase { }; static bool ParseMetadata(const QString &line, Metadata *metadata); - }; #endif // M3UPARSER_H diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp index 131a06826..bb1a6ef12 100644 --- a/src/scrobbler/listenbrainzscrobbler.cpp +++ b/src/scrobbler/listenbrainzscrobbler.cpp @@ -243,7 +243,7 @@ QJsonObject ListenBrainzScrobbler::JsonTrackMetadata(const ScrobbleMetadata &met } if (!metadata.share_url.isEmpty()) { - object_additional_info.insert("origin_url"_L1, metadata.share_url); + object_additional_info.insert("origin_url"_L1, metadata.share_url); } if (!metadata.spotify_id.isEmpty()) { diff --git a/src/scrobbler/scrobblemetadata.h b/src/scrobbler/scrobblemetadata.h index e8e978c02..f64f3afc1 100644 --- a/src/scrobbler/scrobblemetadata.h +++ b/src/scrobbler/scrobblemetadata.h @@ -52,7 +52,6 @@ class ScrobbleMetadata { qint64 length_nanosec; QString effective_albumartist() const { return albumartist.isEmpty() ? artist : albumartist; } - }; #endif // SCROBBLEMETADATA_H diff --git a/src/scrobbler/scrobblerservice.cpp b/src/scrobbler/scrobblerservice.cpp index 1893f788f..cd11e1cf8 100644 --- a/src/scrobbler/scrobblerservice.cpp +++ b/src/scrobbler/scrobblerservice.cpp @@ -34,7 +34,7 @@ QString ScrobblerService::StripAlbum(const QString &album) const { return Song::AlbumRemoveDiscMisc(album); } - return Song::AlbumRemoveDisc(album);; + return Song::AlbumRemoveDisc(album); } diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp index 565766af8..c6d9f6dfa 100644 --- a/src/settings/backendsettingspage.cpp +++ b/src/settings/backendsettingspage.cpp @@ -73,8 +73,8 @@ static const QRegularExpression kRegex_ALSA_PCM_Dev(u"^.*:.*DEV=.*"_s); } // namespace #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Warray-bounds" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Warray-bounds" #endif BackendSettingsPage::BackendSettingsPage(SettingsDialog *dialog, const SharedPtr player, const SharedPtr device_finders, QWidget *parent) diff --git a/src/settings/globalshortcutssettingspage.h b/src/settings/globalshortcutssettingspage.h index 9a31e4771..8891a3321 100644 --- a/src/settings/globalshortcutssettingspage.h +++ b/src/settings/globalshortcutssettingspage.h @@ -51,7 +51,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage { private Q_SLOTS: void ShortcutOptionsChanged(); - void ItemClicked(QTreeWidgetItem*); + void ItemClicked(QTreeWidgetItem *item); void NoneClicked(); void DefaultClicked(); void ChangeClicked(); diff --git a/src/settings/moodbarsettingspage.cpp b/src/settings/moodbarsettingspage.cpp index 3ed9aaa54..f795fcf29 100644 --- a/src/settings/moodbarsettingspage.cpp +++ b/src/settings/moodbarsettingspage.cpp @@ -52,7 +52,7 @@ using namespace MoodbarSettings; namespace { constexpr int kMoodbarPreviewWidth = 150; constexpr int kMoodbarPreviewHeight = 18; -} +} // namespace MoodbarSettingsPage::MoodbarSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), diff --git a/src/smartplaylists/playlistgeneratorinserter.h b/src/smartplaylists/playlistgeneratorinserter.h index 636b6e29f..4f1b54b6a 100644 --- a/src/smartplaylists/playlistgeneratorinserter.h +++ b/src/smartplaylists/playlistgeneratorinserter.h @@ -66,7 +66,6 @@ class PlaylistGeneratorInserter : public QObject { bool enqueue_; bool enqueue_next_; bool is_dynamic_; - }; #endif // PLAYLISTGENERATORINSERTER_H diff --git a/src/smartplaylists/smartplaylistsearchpreview.h b/src/smartplaylists/smartplaylistsearchpreview.h index 9db9f4d18..afcb23845 100644 --- a/src/smartplaylists/smartplaylistsearchpreview.h +++ b/src/smartplaylists/smartplaylistsearchpreview.h @@ -62,7 +62,7 @@ class SmartPlaylistSearchPreview : public QWidget { void Update(const SmartPlaylistSearch &search); protected: - void showEvent(QShowEvent*) override; + void showEvent(QShowEvent *e) override; private: void RunSearch(const SmartPlaylistSearch &search); diff --git a/src/smartplaylists/smartplaylistsview.h b/src/smartplaylists/smartplaylistsview.h index cc60901c5..5884646ec 100644 --- a/src/smartplaylists/smartplaylistsview.h +++ b/src/smartplaylists/smartplaylistsview.h @@ -41,7 +41,6 @@ class SmartPlaylistsView : public QListView { Q_SIGNALS: void ItemsSelectedChanged(); void RightClicked(const QPoint global_pos, const QModelIndex idx); - }; #endif // SMARTPLAYLISTSVIEW_H diff --git a/src/spotify/spotifyrequest.cpp b/src/spotify/spotifyrequest.cpp index 8c76821ed..acb7b5ba6 100644 --- a/src/spotify/spotifyrequest.cpp +++ b/src/spotify/spotifyrequest.cpp @@ -825,7 +825,7 @@ void SpotifyRequest::AlbumsFinishCheck(const Artist &artist, const int limit, co // Get songs for all the albums. - for (QMap ::const_iterator it = album_songs_requests_pending_.constBegin(); it != album_songs_requests_pending_.constEnd(); ++it) { + for (QMap::const_iterator it = album_songs_requests_pending_.constBegin(); it != album_songs_requests_pending_.constEnd(); ++it) { AlbumSongsRequest request = it.value(); AddAlbumSongsRequest(request.artist, request.album); } diff --git a/src/streaming/streamingcollectionviewcontainer.h b/src/streaming/streamingcollectionviewcontainer.h index 57fe28a37..12da5bfc9 100644 --- a/src/streaming/streamingcollectionviewcontainer.h +++ b/src/streaming/streamingcollectionviewcontainer.h @@ -64,7 +64,6 @@ class StreamingCollectionViewContainer : public QWidget { private: Ui_StreamingCollectionViewContainer *ui_; - }; #endif // STREAMINGCOLLECTIONVIEWCONTAINER_H diff --git a/src/streaming/streamingsearchview.h b/src/streaming/streamingsearchview.h index 13ffeb2b4..92b6cfd06 100644 --- a/src/streaming/streamingsearchview.h +++ b/src/streaming/streamingsearchview.h @@ -129,7 +129,7 @@ class StreamingSearchView : public QWidget { int LoadAlbumCoverAsync(const Result &result); Q_SIGNALS: - void AddToPlaylist(QMimeData*); + void AddToPlaylist(QMimeData *mimedata); void AddArtistsSignal(const SongList &songs); void AddAlbumsSignal(const SongList &songs); void AddSongsSignal(const SongList &songs); diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp index 05c2e788a..961c85af5 100644 --- a/src/subsonic/subsonicrequest.cpp +++ b/src/subsonic/subsonicrequest.cpp @@ -554,7 +554,7 @@ QString SubsonicRequest::ParseSong(Song &song, const QJsonObject &json_object, c if (json_object.contains("genre"_L1)) genre = json_object["genre"_L1].toString(); QString cover_id; - if (use_album_id_for_album_covers() && !album_cover_id.isEmpty()) { + if (use_album_id_for_album_covers() && !album_cover_id.isEmpty()) { cover_id = album_cover_id; } else { diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h index 44f19f2d2..c71acec8d 100644 --- a/src/subsonic/subsonicrequest.h +++ b/src/subsonic/subsonicrequest.h @@ -88,7 +88,6 @@ class SubsonicRequest : public SubsonicBaseRequest { void AlbumCoverReceived(QNetworkReply *reply, const SubsonicRequest::AlbumCoverRequest &request); private: - void AddAlbumsRequest(const int offset = 0, const int size = 500); void FlushAlbumsRequests(); diff --git a/src/subsonic/subsonicscrobblerequest.h b/src/subsonic/subsonicscrobblerequest.h index 1b718dafb..6f3f6e714 100644 --- a/src/subsonic/subsonicscrobblerequest.h +++ b/src/subsonic/subsonicscrobblerequest.h @@ -50,7 +50,6 @@ class SubsonicScrobbleRequest : public SubsonicBaseRequest { void ScrobbleReplyReceived(QNetworkReply *reply); private: - struct Request { explicit Request() : submission(false) {} // subsonic song id diff --git a/src/systemtrayicon/qtsystemtrayicon.h b/src/systemtrayicon/qtsystemtrayicon.h index 4a78eb053..cb5604439 100644 --- a/src/systemtrayicon/qtsystemtrayicon.h +++ b/src/systemtrayicon/qtsystemtrayicon.h @@ -108,7 +108,6 @@ class SystemTrayIcon : public QSystemTrayIcon { int song_progress_; QPixmap current_state_icon_; - }; #endif // QTSYSTEMTRAYICON_H diff --git a/src/tagreader/savetagcoverdata.h b/src/tagreader/savetagcoverdata.h index 69e964027..7a1917830 100644 --- a/src/tagreader/savetagcoverdata.h +++ b/src/tagreader/savetagcoverdata.h @@ -32,4 +32,4 @@ class SaveTagCoverData { QString cover_mimetype; }; -#endif // SAVETAGCOVERDATA_H +#endif // SAVETAGCOVERDATA_H diff --git a/src/tagreader/tagreaderresult.h b/src/tagreader/tagreaderresult.h index c15c64e23..23c617fd8 100644 --- a/src/tagreader/tagreaderresult.h +++ b/src/tagreader/tagreaderresult.h @@ -41,4 +41,4 @@ class TagReaderResult { QString error_string() const; }; -#endif // TAGREADERRESULT_H +#endif // TAGREADERRESULT_H diff --git a/src/tagreader/tagreadersavecoverrequest.h b/src/tagreader/tagreadersavecoverrequest.h index 667b62225..5dadda1af 100644 --- a/src/tagreader/tagreadersavecoverrequest.h +++ b/src/tagreader/tagreadersavecoverrequest.h @@ -30,7 +30,6 @@ using std::make_shared; class TagReaderSaveCoverRequest : public TagReaderRequest { public: - explicit TagReaderSaveCoverRequest(const QString &_filename); static SharedPtr Create(const QString &filename) { return make_shared(filename); } diff --git a/src/tagreader/tagreadertaglib.cpp b/src/tagreader/tagreadertaglib.cpp index d46d5a938..63442c130 100644 --- a/src/tagreader/tagreadertaglib.cpp +++ b/src/tagreader/tagreadertaglib.cpp @@ -2077,7 +2077,7 @@ TagReaderResult TagReaderTagLib::SaveSongRating(const QString &filename, const f TagLib::String TagReaderTagLib::TagLibStringListToSlashSeparatedString(const TagLib::StringList &taglib_string_list, const uint begin_index) { TagLib::String result_string; - for (uint i = begin_index ; i < taglib_string_list.size(); ++i) { + for (uint i = begin_index; i < taglib_string_list.size(); ++i) { const TagLib::String &taglib_string = taglib_string_list[i]; if (!result_string.isEmpty()) { result_string += '/'; diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp index b00b6e7c0..99ee539e5 100644 --- a/src/transcoder/transcodedialog.cpp +++ b/src/transcoder/transcodedialog.cpp @@ -72,11 +72,11 @@ using namespace Qt::Literals::StringLiterals; namespace { constexpr int kProgressInterval = 500; constexpr int kMaxDestinationItems = 10; -} +} // namespace #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Warray-bounds" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Warray-bounds" #endif static bool ComparePresetsByName(const TranscoderPreset &left, const TranscoderPreset &right) { @@ -500,5 +500,5 @@ QString TranscodeDialog::GetOutputFileName(const QString &input_filepath, const } #ifdef __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif diff --git a/src/transcoder/transcoder.h b/src/transcoder/transcoder.h index e90463194..fa0dab834 100644 --- a/src/transcoder/transcoder.h +++ b/src/transcoder/transcoder.h @@ -106,6 +106,7 @@ class Transcoder : public QObject { Transcoder *parent_; GstElement *pipeline_; GstElement *convert_element_; + private: Q_DISABLE_COPY(JobState) }; @@ -118,6 +119,7 @@ class Transcoder : public QObject { JobState *state_; bool success_; + private: Q_DISABLE_COPY(JobFinishedEvent) }; diff --git a/src/utilities/coverutils.h b/src/utilities/coverutils.h index 1ad47dc7b..5390d8cd7 100644 --- a/src/utilities/coverutils.h +++ b/src/utilities/coverutils.h @@ -36,7 +36,6 @@ class CoverUtils { static QString CoverFilenameFromVariable(const CoverOptions &options, const QString &artist, QString album, const QString &extension = QString()); static QString CoverFilePath(const CoverOptions &options, const Song &song, const QString &album_dir, const QUrl &cover_url, const QString &extension = QString()); static QString CoverFilePath(const CoverOptions &options, const Song::Source source, const QString &artist, const QString &album, const QString &album_id, const QString &album_dir, const QUrl &cover_url, const QString &extension = QString()); - }; #endif // COVERUTILS_H diff --git a/src/utilities/mimeutils.h b/src/utilities/mimeutils.h index f20c1ae42..2d5546c16 100644 --- a/src/utilities/mimeutils.h +++ b/src/utilities/mimeutils.h @@ -27,6 +27,6 @@ namespace Utilities { QString MimeTypeFromData(const QByteArray &data); -} // namespace Utilities +} // namespace Utilities #endif // MIMEUTILS_H diff --git a/src/utilities/musixmatchprovider.cpp b/src/utilities/musixmatchprovider.cpp index 7356242b5..ab5436aac 100644 --- a/src/utilities/musixmatchprovider.cpp +++ b/src/utilities/musixmatchprovider.cpp @@ -43,4 +43,4 @@ QString StringFixup(QString text) { } -} // namespace +} // namespace MusixmatchProvider diff --git a/src/utilities/musixmatchprovider.h b/src/utilities/musixmatchprovider.h index e18235abc..39deae737 100644 --- a/src/utilities/musixmatchprovider.h +++ b/src/utilities/musixmatchprovider.h @@ -26,6 +26,6 @@ namespace MusixmatchProvider { QString StringFixup(QString text); -} // namespace +} // namespace MusixmatchProvider #endif // MUSIXMATCHPROVIDER_H diff --git a/src/utilities/screenutils.h b/src/utilities/screenutils.h index 10770cf82..a4458fc39 100644 --- a/src/utilities/screenutils.h +++ b/src/utilities/screenutils.h @@ -28,6 +28,6 @@ namespace Utilities { QScreen *GetScreen(QWidget *widget); void CenterWidgetOnScreen(QScreen *screen, QWidget *widget); -} // namespace Utilities +} // namespace Utilities #endif // SCREENUTILS_H diff --git a/src/utilities/textencodingutils.h b/src/utilities/textencodingutils.h index 5786b136d..1be3491cd 100644 --- a/src/utilities/textencodingutils.h +++ b/src/utilities/textencodingutils.h @@ -27,4 +27,4 @@ namespace Utilities { QByteArray TextEncodingFromData(const QByteArray &data); } // namespace Utilities -#endif // TEXTENCODINGUTILS_H +#endif // TEXTENCODINGUTILS_H diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp index 4df931102..e6b9ee368 100644 --- a/src/widgets/fancytabwidget.cpp +++ b/src/widgets/fancytabwidget.cpp @@ -55,7 +55,7 @@ using namespace Qt::Literals::StringLiterals; namespace { constexpr int IconSize_LargeSidebar = 40; constexpr int IconSize_SmallSidebar = 32; -} // namespace +} // namespace FancyTabWidget::FancyTabWidget(QWidget *parent) : QTabWidget(parent), @@ -99,7 +99,7 @@ void FancyTabWidget::LoadSettings(const QString &settings_group) { } s.endGroup(); - for (QMultiMap ::iterator it = tabs.begin(); it != tabs.end(); ++it) { + for (QMultiMap::iterator it = tabs.begin(); it != tabs.end(); ++it) { (void)InsertTab(it.key(), it.value()); } diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h index 44a784fbb..ec788986e 100644 --- a/src/widgets/fancytabwidget.h +++ b/src/widgets/fancytabwidget.h @@ -84,7 +84,7 @@ class FancyTabWidget : public QTabWidget { void CurrentTabChangedSlot(const int idx); protected: - void paintEvent(QPaintEvent*) override; + void paintEvent(QPaintEvent *e) override; void contextMenuEvent(QContextMenuEvent *e) override; private: diff --git a/src/widgets/groupediconview.cpp b/src/widgets/groupediconview.cpp index 42be3e03d..0263e5a00 100644 --- a/src/widgets/groupediconview.cpp +++ b/src/widgets/groupediconview.cpp @@ -265,7 +265,7 @@ void GroupedIconView::paintEvent(QPaintEvent *e) { const QItemSelectionModel *selections = selectionModel(); const bool focus = (hasFocus() || viewport()->hasFocus()) && current.isValid(); const QStyle::State opt_state = option.state; - const bool enabled = (opt_state &QStyle::State_Enabled) != 0; + const bool enabled = (opt_state & QStyle::State_Enabled) != 0; int maxSize = (flow() == TopToBottom) ? viewport()->size().width() - 2 * spacing() : viewport()->size().height() - 2 * spacing(); diff --git a/src/widgets/lineedit.h b/src/widgets/lineedit.h index 62284e822..9b6348774 100644 --- a/src/widgets/lineedit.h +++ b/src/widgets/lineedit.h @@ -268,7 +268,6 @@ class RatingBox : public RatingWidget, public ExtendedEditor { Q_SIGNALS: void Reset(); - }; #endif // LINEEDIT_H diff --git a/src/widgets/multiloadingindicator.cpp b/src/widgets/multiloadingindicator.cpp index 1f8175241..e6914a381 100644 --- a/src/widgets/multiloadingindicator.cpp +++ b/src/widgets/multiloadingindicator.cpp @@ -41,7 +41,7 @@ namespace { constexpr int kVerticalPadding = 4; constexpr int kHorizontalPadding = 6; constexpr int kSpacing = 6; -} +} // namespace MultiLoadingIndicator::MultiLoadingIndicator(QWidget *parent) : QWidget(parent), diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h index 4d789b906..7850acfa2 100644 --- a/src/widgets/playingwidget.h +++ b/src/widgets/playingwidget.h @@ -77,9 +77,9 @@ class PlayingWidget : public QWidget { protected: void paintEvent(QPaintEvent *e) override; - void resizeEvent(QResizeEvent*) override; + void resizeEvent(QResizeEvent *e) override; void contextMenuEvent(QContextMenuEvent *e) override; - void mouseDoubleClickEvent(QMouseEvent*) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; void dragEnterEvent(QDragEnterEvent *e) override; void dropEvent(QDropEvent *e) override; @@ -136,7 +136,6 @@ class PlayingWidget : public QWidget { void DrawContents(QPainter *p); void ScaleCover(); void GetCoverAutomatically(); - }; #endif // PLAYINGWIDGET_H diff --git a/src/widgets/prettyslider.h b/src/widgets/prettyslider.h index f7e007ea2..4b3a65427 100644 --- a/src/widgets/prettyslider.h +++ b/src/widgets/prettyslider.h @@ -40,8 +40,8 @@ class PrettySlider : public SliderSlider { explicit PrettySlider(const Qt::Orientation orientation, const SliderMode mode, QWidget *parent, const uint max = 0); protected: - void slideEvent(QMouseEvent*) override; - void mousePressEvent(QMouseEvent*) override; + void slideEvent(QMouseEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; private: PrettySlider(const PrettySlider&); // undefined diff --git a/src/widgets/ratingwidget.h b/src/widgets/ratingwidget.h index 192def571..0385c875e 100644 --- a/src/widgets/ratingwidget.h +++ b/src/widgets/ratingwidget.h @@ -59,7 +59,7 @@ class RatingWidget : public QWidget { void RatingChanged(const float rating); protected: - void paintEvent(QPaintEvent*) override; + void paintEvent(QPaintEvent *e) override; void mousePressEvent(QMouseEvent *e) override; void mouseMoveEvent(QMouseEvent *e) override; void leaveEvent(QEvent *e) override; diff --git a/src/widgets/searchfield.h b/src/widgets/searchfield.h index 4b00f4f87..92df6c116 100644 --- a/src/widgets/searchfield.h +++ b/src/widgets/searchfield.h @@ -63,7 +63,7 @@ class SearchField : public QWidget { void returnPressed(); protected: - void resizeEvent(QResizeEvent*) override; + void resizeEvent(QResizeEvent *e) override; bool eventFilter(QObject *o, QEvent *e) override; private: diff --git a/src/widgets/sliderslider.h b/src/widgets/sliderslider.h index 60d5a27dc..fe259894b 100644 --- a/src/widgets/sliderslider.h +++ b/src/widgets/sliderslider.h @@ -32,7 +32,7 @@ class SliderSlider : public QSlider { Q_OBJECT public: - explicit SliderSlider(const Qt::Orientation, QWidget*, const int max = 0); + explicit SliderSlider(const Qt::Orientation, QWidget *parent, const int max = 0); // WARNING non-virtual - and thus only really intended for internal use this is a major flaw in the class presently, however it suits our current needs fine int value() const { return adjustValue(QSlider::value()); } @@ -45,11 +45,11 @@ class SliderSlider : public QSlider { void SliderReleased(const int); protected: - virtual void slideEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*) override; - void mousePressEvent(QMouseEvent*) override; - void mouseReleaseEvent(QMouseEvent*) override; - void wheelEvent(QWheelEvent*) override; + virtual void slideEvent(QMouseEvent *e); + void mouseMoveEvent(QMouseEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void wheelEvent(QWheelEvent *e) override; bool sliding_; bool wheeling_; diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h index 542ef0195..24e62268b 100644 --- a/src/widgets/trackslider.h +++ b/src/widgets/trackslider.h @@ -49,7 +49,7 @@ class TrackSlider : public QWidget { QSize sizeHint() const override; // QObject - bool event(QEvent*) override; + bool event(QEvent *e) override; #ifdef HAVE_MOODBAR MoodbarProxyStyle *moodbar_proxy_style() const { return moodbar_proxy_style_; } diff --git a/src/widgets/tracksliderpopup.h b/src/widgets/tracksliderpopup.h index bfada70c4..7ff20126a 100644 --- a/src/widgets/tracksliderpopup.h +++ b/src/widgets/tracksliderpopup.h @@ -45,7 +45,7 @@ class TrackSliderPopup : public QWidget { void SetPopupPosition(const QPoint pos); protected: - void paintEvent(QPaintEvent*) override; + void paintEvent(QPaintEvent *e) override; private: void UpdatePixmap(); diff --git a/src/widgets/volumeslider.h b/src/widgets/volumeslider.h index 8b7d9b134..6624effc1 100644 --- a/src/widgets/volumeslider.h +++ b/src/widgets/volumeslider.h @@ -54,7 +54,7 @@ class VolumeSlider : public SliderSlider { virtual void paletteChange(const QPalette &palette); void slideEvent(QMouseEvent *e) override; void contextMenuEvent(QContextMenuEvent *e) override; - void mousePressEvent(QMouseEvent*) override; + void mousePressEvent(QMouseEvent *e) override; void wheelEvent(QWheelEvent *e) override; private Q_SLOTS: diff --git a/tests/src/gmock_include.h b/tests/src/gmock_include.h index 98ddda8f6..e4ea0106e 100644 --- a/tests/src/gmock_include.h +++ b/tests/src/gmock_include.h @@ -1,8 +1,8 @@ #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcpp" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wcpp" #endif #include #ifdef __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif diff --git a/tests/src/gtest_include.h b/tests/src/gtest_include.h index cc14bd548..ce9218ba8 100644 --- a/tests/src/gtest_include.h +++ b/tests/src/gtest_include.h @@ -1,8 +1,8 @@ #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcpp" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wcpp" #endif #include #ifdef __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif diff --git a/tests/src/logging_env.h b/tests/src/logging_env.h index 0d1f8d165..04f3ba034 100644 --- a/tests/src/logging_env.h +++ b/tests/src/logging_env.h @@ -34,6 +34,7 @@ class LoggingEnvironment : public ::testing::Environment { logging::Init(); logging::SetLevels(u"*:4"_s); } + private: Q_DISABLE_COPY(LoggingEnvironment) }; diff --git a/tests/src/metatypes_env.h b/tests/src/metatypes_env.h index ef83fe822..43664238d 100644 --- a/tests/src/metatypes_env.h +++ b/tests/src/metatypes_env.h @@ -42,6 +42,7 @@ class MetatypesEnvironment : public ::testing::Environment { qRegisterMetaType("QModelIndex"); qRegisterMetaType("SongLoader::Result"); } + private: Q_DISABLE_COPY(MetatypesEnvironment) }; diff --git a/tests/src/playlist_test.cpp b/tests/src/playlist_test.cpp index 26dd201d0..bb972ab12 100644 --- a/tests/src/playlist_test.cpp +++ b/tests/src/playlist_test.cpp @@ -439,7 +439,7 @@ TEST_F(PlaylistTest, ShuffleThenNext) { // Add 100 items PlaylistItemPtrList items; items.reserve(100); - for (int i = 0 ; i < 100 ; ++i) + for (int i = 0; i < 100; ++i) items << MakeMockItemP(u"Item "_s + QString::number(i)); playlist_.InsertItems(items); diff --git a/tests/src/resources_env.h b/tests/src/resources_env.h index 6411a4314..021c6d15e 100644 --- a/tests/src/resources_env.h +++ b/tests/src/resources_env.h @@ -35,6 +35,7 @@ class ResourcesEnvironment : public ::testing::Environment { Q_INIT_RESOURCE(icons); Q_INIT_RESOURCE(testdata); } + private: Q_DISABLE_COPY(ResourcesEnvironment) }; diff --git a/tests/src/test_utils.h b/tests/src/test_utils.h index 2880dabe1..6319783d7 100644 --- a/tests/src/test_utils.h +++ b/tests/src/test_utils.h @@ -52,11 +52,11 @@ void PrintTo(const ::QVariant &var, std::ostream &os); void PrintTo(const ::QUrl &url, std::ostream &os); #define EXPOSE_SIGNAL0(n) \ - void Emit##n() { emit n(); } + void Emit##n() { emit n(); } #define EXPOSE_SIGNAL1(n, t1) \ - void Emit##n(const t1& a1) { emit n(a1); } + void Emit##n(const t1 &a1) { emit n(a1); } #define EXPOSE_SIGNAL2(n, t1, t2) \ - void Emit##n(const t1& a1, const t2& a2) { emit n(a1, a2); } + void Emit##n(const t1 &a1, const t2 &a2) { emit n(a1, a2); } Q_DECLARE_METATYPE(QModelIndex)