From a6742d401ccd18f47e04ccf3e6011b42156c80e2 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 11 Jul 2021 07:40:57 +0200 Subject: [PATCH] Formatting --- src/analyzer/blockanalyzer.cpp | 3 +- src/analyzer/boomanalyzer.cpp | 6 +- src/analyzer/rainbowanalyzer.cpp | 3 +- src/analyzer/rainbowanalyzer.h | 8 +- src/collection/collectionquery.cpp | 16 +-- src/collection/collectionview.cpp | 3 +- src/context/contextalbum.cpp | 22 +-- src/context/contextalbumsmodel.cpp | 4 +- src/context/contextalbumsview.cpp | 3 +- src/context/contextview.cpp | 125 +++++++++--------- src/core/imageutils.h | 2 +- src/core/mainwindow.cpp | 4 +- src/core/mpris2.cpp | 5 +- src/core/networktimeouts.cpp | 3 +- src/core/player.cpp | 35 +++-- src/core/songloader.cpp | 4 +- src/core/standarditemiconloader.cpp | 6 +- src/core/stylesheetloader.cpp | 4 +- .../albumcoverchoicecontroller.cpp | 49 ++++--- src/covermanager/albumcoverloader.cpp | 3 +- src/covermanager/coverexportrunnable.cpp | 8 +- src/covermanager/currentalbumcoverloader.cpp | 3 +- src/covermanager/deezercoverprovider.cpp | 6 +- src/covermanager/discogscoverprovider.cpp | 7 +- src/covermanager/jsoncoverprovider.cpp | 3 +- src/covermanager/lastfmcoverprovider.cpp | 4 +- src/covermanager/musicbrainzcoverprovider.cpp | 5 +- src/covermanager/musixmatchcoverprovider.cpp | 4 +- src/covermanager/qobuzcoverprovider.cpp | 7 +- src/covermanager/spotifycoverprovider.cpp | 10 +- src/covermanager/tidalcoverprovider.cpp | 10 +- src/device/cddadevice.cpp | 3 +- src/device/cddasongloader.cpp | 8 +- src/device/devicedatabasebackend.cpp | 9 +- src/device/devicelister.cpp | 10 +- src/device/devicemanager.cpp | 4 +- src/device/devicestatefiltermodel.cpp | 4 +- src/device/filesystemdevice.cpp | 3 +- src/device/gpoddevice.cpp | 2 +- src/device/mtpconnection.cpp | 1 - src/device/mtpdevice.cpp | 8 +- src/dialogs/deleteconfirmationdialog.cpp | 4 +- src/dialogs/edittagdialog.cpp | 3 +- src/dialogs/errordialog.cpp | 5 +- src/dialogs/lastfmimportdialog.cpp | 13 +- src/dialogs/trackselectiondialog.cpp | 6 +- src/engine/alsadevicefinder.cpp | 3 +- src/engine/alsapcmdevicefinder.cpp | 3 +- src/engine/devicefinder.cpp | 3 +- src/engine/directsounddevicefinder.cpp | 4 +- src/engine/gstengine.cpp | 3 +- src/engine/gstenginepipeline.cpp | 3 +- src/engine/macosdevicefinder.cpp | 4 +- src/engine/vlcengine.cpp | 8 +- src/equalizer/equalizer.cpp | 4 +- src/equalizer/equalizerslider.cpp | 4 +- src/globalshortcuts/globalshortcut.cpp | 28 ++-- src/globalshortcuts/globalshortcutgrabber.cpp | 4 +- .../globalshortcutsbackend-kde.cpp | 5 +- .../globalshortcutsbackend-system.cpp | 4 +- .../globalshortcutsbackend.cpp | 4 +- .../globalshortcutsmanager.cpp | 3 +- src/globalshortcuts/keymapper_x11.h | 8 +- src/internet/internetcollectionview.cpp | 3 +- .../internetcollectionviewcontainer.cpp | 6 +- src/internet/internetplaylistitem.cpp | 3 +- src/internet/internetsearchitemdelegate.cpp | 3 +- src/internet/internetservice.cpp | 16 +-- src/internet/internetsongsview.cpp | 3 +- src/internet/internettabsview.cpp | 3 +- src/internet/localredirectserver.cpp | 3 +- src/moodbar/moodbarcontroller.cpp | 4 +- src/moodbar/moodbarpipeline.cpp | 2 +- src/organize/organizedialog.h | 2 +- src/osd/osddbus.cpp | 7 +- src/playlist/dynamicplaylistcontrols.cpp | 3 +- src/playlist/playlist.cpp | 3 +- src/playlist/playlistbackend.cpp | 5 +- src/playlist/playlistdelegates.cpp | 3 +- src/playlist/playlistheader.cpp | 3 +- src/playlist/playlistlistcontainer.cpp | 3 +- src/playlist/playlistlistview.cpp | 3 +- src/playlist/playlistsequence.cpp | 3 +- src/playlist/playlistundocommands.cpp | 29 ++-- src/playlist/playlistview.cpp | 12 +- src/playlistparsers/playlistparser.cpp | 3 +- src/qobuz/qobuzbaserequest.cpp | 7 +- src/qobuz/qobuzrequest.cpp | 6 +- src/qobuz/qobuzstreamurlrequest.cpp | 14 +- src/qobuz/qobuzurlhandler.cpp | 11 +- src/radios/radioparadiseservice.cpp | 3 +- src/radios/somafmservice.cpp | 3 +- src/scrobbler/audioscrobbler.cpp | 23 ++-- src/scrobbler/lastfmimport.cpp | 20 +-- src/scrobbler/lastfmscrobbler.cpp | 21 +-- src/scrobbler/librefmscrobbler.cpp | 21 +-- src/scrobbler/listenbrainzscrobbler.cpp | 27 ++-- src/scrobbler/scrobblercache.cpp | 10 +- src/scrobbler/scrobblercacheitem.cpp | 20 +-- src/scrobbler/scrobblingapi20.cpp | 38 +++--- src/scrobbler/scrobblingapi20.h | 2 +- src/scrobbler/subsonicscrobbler.cpp | 11 +- src/settings/backendsettingspage.cpp | 12 +- src/settings/behavioursettingspage.cpp | 5 +- src/settings/collectionsettingspage.cpp | 3 +- src/settings/contextsettingspage.cpp | 4 +- src/settings/coverssettingspage.cpp | 5 +- src/settings/lyricssettingspage.cpp | 5 +- src/settings/moodbarsettingspage.cpp | 5 +- src/settings/networkproxysettingspage.cpp | 3 +- src/settings/notificationssettingspage.cpp | 4 +- src/settings/playlistsettingspage.cpp | 4 +- src/settings/scrobblersettingspage.cpp | 3 +- src/settings/settingsdialog.cpp | 3 +- src/settings/settingspage.cpp | 6 +- src/settings/transcodersettingspage.cpp | 3 +- .../playlistgeneratorinserter.cpp | 3 +- src/smartplaylists/playlistquerygenerator.cpp | 5 +- .../smartplaylistsviewcontainer.cpp | 27 ++-- .../smartplaylistwizardplugin.cpp | 6 +- src/subsonic/subsonicbaserequest.cpp | 4 +- src/subsonic/subsonicrequest.cpp | 3 +- src/subsonic/subsonicscrobblerequest.cpp | 3 +- src/tidal/tidalbaserequest.cpp | 3 +- src/tidal/tidalfavoriterequest.cpp | 6 +- src/tidal/tidalstreamurlrequest.cpp | 14 +- src/tidal/tidalurlhandler.cpp | 11 +- src/transcoder/transcoderoptionsasf.cpp | 3 +- src/transcoder/transcoderoptionsdialog.cpp | 4 +- src/transcoder/transcoderoptionsflac.cpp | 3 +- src/transcoder/transcoderoptionsmp3.cpp | 4 +- src/transcoder/transcoderoptionsspeex.cpp | 3 +- src/transcoder/transcoderoptionsvorbis.cpp | 3 +- src/transcoder/transcoderoptionswavpack.cpp | 3 +- src/widgets/autoexpandingtreeview.cpp | 11 +- src/widgets/busyindicator.cpp | 6 +- src/widgets/clickablelabel.cpp | 5 +- src/widgets/fancytabwidget.cpp | 6 +- src/widgets/forcescrollperpixel.cpp | 5 +- src/widgets/freespacebar.cpp | 5 +- src/widgets/groupediconview.cpp | 4 +- src/widgets/linetextedit.cpp | 3 +- src/widgets/loginstatewidget.cpp | 4 +- src/widgets/multiloadingindicator.cpp | 6 +- src/widgets/renametablineedit.cpp | 3 +- src/widgets/stickyslider.cpp | 8 +- src/widgets/stretchheaderview.cpp | 2 +- src/widgets/tracksliderpopup.cpp | 2 +- src/widgets/volumeslider.cpp | 2 + 149 files changed, 595 insertions(+), 565 deletions(-) diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index 17cf7b12e..b31a2dffb 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -56,8 +56,7 @@ BlockAnalyzer::BlockAnalyzer(QWidget *parent) fade_bars_(kFadeSize), fade_pos_(1 << 8, 50), fade_intensity_(1 << 8, 32), - step_(0) - { + step_(0) { setMinimumSize(kMinColumns * (kWidth + 1) - 1, kMinRows * (kHeight + 1) - 1); //-1 is padding, no drawing takes place there setMaximumWidth(kMaxColumns * (kWidth + 1) - 1); diff --git a/src/analyzer/boomanalyzer.cpp b/src/analyzer/boomanalyzer.cpp index d4b2ca621..892e72042 100644 --- a/src/analyzer/boomanalyzer.cpp +++ b/src/analyzer/boomanalyzer.cpp @@ -50,10 +50,8 @@ BoomAnalyzer::BoomAnalyzer(QWidget *parent) bands_(0), scope_(kMinBandCount), fg_(palette().color(QPalette::Highlight)), - K_barHeight_(1.271) // 1.471 - , - F_peakSpeed_(1.103) // 1.122 - , + K_barHeight_(1.271), // 1.471 + F_peakSpeed_(1.103), // 1.122 F_(1.0), bar_height_(kMaxBandCount, 0), peak_height_(kMaxBandCount, 0), diff --git a/src/analyzer/rainbowanalyzer.cpp b/src/analyzer/rainbowanalyzer.cpp index 9a1a0161d..b13c144bb 100644 --- a/src/analyzer/rainbowanalyzer.cpp +++ b/src/analyzer/rainbowanalyzer.cpp @@ -64,8 +64,7 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *par available_rainbow_width_(0), px_per_frame_(0), x_offset_(0), - background_brush_(QColor(0x0f, 0x43, 0x73)) - { + background_brush_(QColor(0x0f, 0x43, 0x73)) { rainbowtype = rbtype; cat_dash_[0] = QPixmap(":/pictures/nyancat.png"); diff --git a/src/analyzer/rainbowanalyzer.h b/src/analyzer/rainbowanalyzer.h index 686cfbd86..f4f7d9cda 100644 --- a/src/analyzer/rainbowanalyzer.h +++ b/src/analyzer/rainbowanalyzer.h @@ -47,7 +47,7 @@ class RainbowAnalyzer : public Analyzer::Base { public: enum RainbowType { Nyancat = 0, - Dash = 1 + Dash = 1 }; RainbowAnalyzer(const RainbowType rbtype, QWidget *parent); @@ -106,7 +106,7 @@ class RainbowAnalyzer : public Analyzer::Base { // The y positions of each point on the rainbow. float history_[kHistorySize * kRainbowBands]{}; - // A cache of the last frame's rainbow, + // A cache of the last frame's rainbow, // so it can be used in the next frame. QPixmap buffer_[2]; int current_buffer_; @@ -118,7 +118,7 @@ class RainbowAnalyzer : public Analyzer::Base { // X spacing between each point in the polyline. int px_per_frame_; - // Amount the buffer_ is shifted to the left (off the edge of the widget) + // Amount the buffer_ is shifted to the left (off the edge of the widget) // to make the rainbow extend from 0 to available_rainbow_width_. int x_offset_; @@ -130,7 +130,7 @@ class NyanCatAnalyzer : public RainbowAnalyzer { public: Q_INVOKABLE explicit NyanCatAnalyzer(QWidget *parent); - + static const char *kName; }; diff --git a/src/collection/collectionquery.cpp b/src/collection/collectionquery.cpp index cf7bc3a5e..0255c9ea0 100644 --- a/src/collection/collectionquery.cpp +++ b/src/collection/collectionquery.cpp @@ -40,14 +40,14 @@ QueryOptions::QueryOptions() : max_age_(-1), query_mode_(QueryMode_All) {} -CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const QueryOptions &options) : - QSqlQuery(db), - songs_table_(songs_table), - fts_table_(fts_table), - include_unavailable_(false), - join_with_fts_(false), - duplicates_only_(false), - limit_(-1) { +CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const QueryOptions &options) + : QSqlQuery(db), + songs_table_(songs_table), + fts_table_(fts_table), + include_unavailable_(false), + join_with_fts_(false), + duplicates_only_(false), + limit_(-1) { if (!options.filter().isEmpty()) { // We need to munge the filter text a little bit to get it to work as expected with sqlite's FTS5: diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp index 7571d52b3..a511bdf50 100644 --- a/src/collection/collectionview.cpp +++ b/src/collection/collectionview.cpp @@ -97,8 +97,7 @@ CollectionView::CollectionView(QWidget *parent) action_no_show_in_various_(nullptr), action_delete_files_(nullptr), is_in_keyboard_search_(false), - delete_files_(false) - { + delete_files_(false) { setItemDelegate(new CollectionItemDelegate(this)); setAttribute(Qt::WA_MacShowFocusRect, false); diff --git a/src/context/contextalbum.cpp b/src/context/contextalbum.cpp index b5792f13c..f254b9862 100644 --- a/src/context/contextalbum.cpp +++ b/src/context/contextalbum.cpp @@ -45,17 +45,17 @@ const int ContextAlbum::kWidgetSpacing = 40; -ContextAlbum::ContextAlbum(QWidget *parent) : - QWidget(parent), - menu_(new QMenu(this)), - context_view_(nullptr), - album_cover_choice_controller_(nullptr), - downloading_covers_(false), - timeline_fade_(new QTimeLine(1000, this)), - image_strawberry_(":/pictures/strawberry.png"), - image_original_(image_strawberry_), - pixmap_previous_opacity_(0), - prev_width_(width()) { +ContextAlbum::ContextAlbum(QWidget *parent) + : QWidget(parent), + menu_(new QMenu(this)), + context_view_(nullptr), + album_cover_choice_controller_(nullptr), + downloading_covers_(false), + timeline_fade_(new QTimeLine(1000, this)), + image_strawberry_(":/pictures/strawberry.png"), + image_original_(image_strawberry_), + pixmap_previous_opacity_(0), + prev_width_(width()) { setObjectName("context-widget-album"); setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); diff --git a/src/context/contextalbumsmodel.cpp b/src/context/contextalbumsmodel.cpp index 5c5776d47..37d843c8d 100644 --- a/src/context/contextalbumsmodel.cpp +++ b/src/context/contextalbumsmodel.cpp @@ -57,8 +57,8 @@ const int ContextAlbumsModel::kPrettyCoverSize = 32; -ContextAlbumsModel::ContextAlbumsModel(CollectionBackend *backend, Application *app, QObject *parent) : - SimpleTreeModel(new CollectionItem(this), parent), +ContextAlbumsModel::ContextAlbumsModel(CollectionBackend *backend, Application *app, QObject *parent) + : SimpleTreeModel(new CollectionItem(this), parent), backend_(backend), app_(app), album_icon_(IconLoader::Load("cdcase")) { diff --git a/src/context/contextalbumsview.cpp b/src/context/contextalbumsview.cpp index 36fb20264..2daee6e1b 100644 --- a/src/context/contextalbumsview.cpp +++ b/src/context/contextalbumsview.cpp @@ -129,8 +129,7 @@ ContextAlbumsView::ContextAlbumsView(QWidget *parent) edit_tracks_(nullptr), show_in_browser_(nullptr), is_in_keyboard_search_(false), - model_(nullptr) - { + model_(nullptr) { setStyleSheet("border: none;"); diff --git a/src/context/contextview.cpp b/src/context/contextview.cpp index d1f170f1e..1189fc1ae 100644 --- a/src/context/contextview.cpp +++ b/src/context/contextview.cpp @@ -69,69 +69,68 @@ #include "contextalbumsmodel.h" #include "contextalbumsview.h" -ContextView::ContextView(QWidget *parent) : - QWidget(parent), - app_(nullptr), - collectionview_(nullptr), - album_cover_choice_controller_(nullptr), - lyrics_fetcher_(nullptr), - menu_(new QMenu(this)), - action_show_album_(nullptr), - action_show_data_(nullptr), - action_show_output_(nullptr), - action_show_albums_(nullptr), - action_show_lyrics_(nullptr), - action_search_lyrics_(nullptr), - layout_container_(new QVBoxLayout()), - widget_scrollarea_(new QWidget(this)), - layout_scrollarea_(new QVBoxLayout()), - scrollarea_(new QScrollArea(this)), - label_top_(new QLabel(this)), - widget_album_(new ContextAlbum(this)), - widget_stacked_(new QStackedWidget(this)), - widget_stop_(new QWidget(this)), - widget_play_(new QWidget(this)), - layout_stop_(new QVBoxLayout()), - layout_play_(new QVBoxLayout()), - label_stop_summary_(new QLabel(this)), - spacer_stop_bottom_(new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Expanding)), - widget_play_data_(new QWidget(this)), - widget_play_output_(new QWidget(this)), - layout_play_data_(new QGridLayout()), - layout_play_output_(new QGridLayout()), - label_play_albums_(new QLabel(this)), - label_play_lyrics_(new QLabel(this)), - widget_albums_(new ContextAlbumsView(this)), - //spacer_play_album_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), - spacer_play_output_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), - spacer_play_data_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), - spacer_play_albums_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), - spacer_play_bottom_(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding)), - label_filetype_title_(new QLabel(this)), - label_length_title_(new QLabel(this)), - label_samplerate_title_(new QLabel(this)), - label_bitdepth_title_(new QLabel(this)), - label_bitrate_title_(new QLabel(this)), - label_filetype_(new QLabel(this)), - label_length_(new QLabel(this)), - label_samplerate_(new QLabel(this)), - label_bitdepth_(new QLabel(this)), - label_bitrate_(new QLabel(this)), - label_device_title_(new QLabel(this)), - label_engine_title_(new QLabel(this)), - label_device_space_(new QLabel(this)), - label_engine_space_(new QLabel(this)), - label_device_(new QLabel(this)), - label_engine_(new QLabel(this)), - label_device_icon_(new QLabel(this)), - label_engine_icon_(new QLabel(this)), - spacer_bottom_(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding)), - lyrics_tried_(false), - lyrics_id_(-1), - font_size_headline_(0), - font_size_normal_(0), - prev_width_(0) - { +ContextView::ContextView(QWidget *parent) + : QWidget(parent), + app_(nullptr), + collectionview_(nullptr), + album_cover_choice_controller_(nullptr), + lyrics_fetcher_(nullptr), + menu_(new QMenu(this)), + action_show_album_(nullptr), + action_show_data_(nullptr), + action_show_output_(nullptr), + action_show_albums_(nullptr), + action_show_lyrics_(nullptr), + action_search_lyrics_(nullptr), + layout_container_(new QVBoxLayout()), + widget_scrollarea_(new QWidget(this)), + layout_scrollarea_(new QVBoxLayout()), + scrollarea_(new QScrollArea(this)), + label_top_(new QLabel(this)), + widget_album_(new ContextAlbum(this)), + widget_stacked_(new QStackedWidget(this)), + widget_stop_(new QWidget(this)), + widget_play_(new QWidget(this)), + layout_stop_(new QVBoxLayout()), + layout_play_(new QVBoxLayout()), + label_stop_summary_(new QLabel(this)), + spacer_stop_bottom_(new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Expanding)), + widget_play_data_(new QWidget(this)), + widget_play_output_(new QWidget(this)), + layout_play_data_(new QGridLayout()), + layout_play_output_(new QGridLayout()), + label_play_albums_(new QLabel(this)), + label_play_lyrics_(new QLabel(this)), + widget_albums_(new ContextAlbumsView(this)), + //spacer_play_album_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), + spacer_play_output_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), + spacer_play_data_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), + spacer_play_albums_(new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Fixed)), + spacer_play_bottom_(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding)), + label_filetype_title_(new QLabel(this)), + label_length_title_(new QLabel(this)), + label_samplerate_title_(new QLabel(this)), + label_bitdepth_title_(new QLabel(this)), + label_bitrate_title_(new QLabel(this)), + label_filetype_(new QLabel(this)), + label_length_(new QLabel(this)), + label_samplerate_(new QLabel(this)), + label_bitdepth_(new QLabel(this)), + label_bitrate_(new QLabel(this)), + label_device_title_(new QLabel(this)), + label_engine_title_(new QLabel(this)), + label_device_space_(new QLabel(this)), + label_engine_space_(new QLabel(this)), + label_device_(new QLabel(this)), + label_engine_(new QLabel(this)), + label_device_icon_(new QLabel(this)), + label_engine_icon_(new QLabel(this)), + spacer_bottom_(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding)), + lyrics_tried_(false), + lyrics_id_(-1), + font_size_headline_(0), + font_size_normal_(0), + prev_width_(0) { setLayout(layout_container_); diff --git a/src/core/imageutils.h b/src/core/imageutils.h index f0e8673c8..257f31782 100644 --- a/src/core/imageutils.h +++ b/src/core/imageutils.h @@ -32,7 +32,7 @@ class ImageUtils { - private: + private: static QStringList kSupportedImageMimeTypes; static QStringList kSupportedImageFormats; diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 148cf177b..cfaa52960 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -218,8 +218,8 @@ const int kTrackSliderUpdateTimeMs = 200; const int kTrackPositionUpdateTimeMs = 1000; } // namespace -MainWindow::MainWindow(Application *app, std::shared_ptr tray_icon, OSDBase *osd, const CommandlineOptions &options, QWidget *parent) : - QMainWindow(parent), +MainWindow::MainWindow(Application *app, std::shared_ptr tray_icon, OSDBase *osd, const CommandlineOptions &options, QWidget *parent) + : QMainWindow(parent), ui_(new Ui_MainWindow), #ifdef Q_OS_WIN thumbbar_(new Windows7ThumbBar(this)), diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp index daa1f3992..085ee1704 100644 --- a/src/core/mpris2.cpp +++ b/src/core/mpris2.cpp @@ -102,9 +102,8 @@ const char *Mpris2::kFreedesktopPath = "org.freedesktop.DBus.Properties"; Mpris2::Mpris2(Application *app, QObject *parent) : QObject(parent), - app_(app), - app_name_(QCoreApplication::applicationName()) - { + app_(app), + app_name_(QCoreApplication::applicationName()) { new Mpris2Root(this); new Mpris2TrackList(this); diff --git a/src/core/networktimeouts.cpp b/src/core/networktimeouts.cpp index 387794620..22f475e48 100644 --- a/src/core/networktimeouts.cpp +++ b/src/core/networktimeouts.cpp @@ -28,7 +28,8 @@ #include "networktimeouts.h" NetworkTimeouts::NetworkTimeouts(const int timeout_msec, QObject *parent) - : QObject(parent), timeout_msec_(timeout_msec) {} + : QObject(parent), + timeout_msec_(timeout_msec) {} void NetworkTimeouts::AddReply(QNetworkReply *reply) { diff --git a/src/core/player.cpp b/src/core/player.cpp index 302489885..9b0ba3a12 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -73,26 +73,25 @@ const char *Player::kSettingsGroup = "Player"; Player::Player(Application *app, QObject *parent) : PlayerInterface(parent), - app_(app), - engine_(nullptr), + app_(app), + engine_(nullptr), #ifdef HAVE_GSTREAMER - gst_startup_(new GstStartup(this)), + gst_startup_(new GstStartup(this)), #endif - analyzer_(nullptr), - equalizer_(nullptr), - stream_change_type_(Engine::First), - autoscroll_(Playlist::AutoScroll_Maybe), - last_state_(Engine::Empty), - nb_errors_received_(0), - volume_before_mute_(100), - last_pressed_previous_(QDateTime::currentDateTime()), - continue_on_error_(false), - greyout_(true), - menu_previousmode_(BehaviourSettingsPage::PreviousBehaviour_DontRestart), - seek_step_sec_(10), - volume_control_(true), - play_offset_nanosec_(0) - { + analyzer_(nullptr), + equalizer_(nullptr), + stream_change_type_(Engine::First), + autoscroll_(Playlist::AutoScroll_Maybe), + last_state_(Engine::Empty), + nb_errors_received_(0), + volume_before_mute_(100), + last_pressed_previous_(QDateTime::currentDateTime()), + continue_on_error_(false), + greyout_(true), + menu_previousmode_(BehaviourSettingsPage::PreviousBehaviour_DontRestart), + seek_step_sec_(10), + volume_control_(true), + play_offset_nanosec_(0) { settings_.beginGroup(kSettingsGroup); diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp index 110f3117d..43418f2e2 100644 --- a/src/core/songloader.cpp +++ b/src/core/songloader.cpp @@ -69,8 +69,8 @@ QSet SongLoader::sRawUriSchemes; const int SongLoader::kDefaultTimeout = 5000; -SongLoader::SongLoader(CollectionBackendInterface *collection, const Player *player, QObject *parent) : - QObject(parent), +SongLoader::SongLoader(CollectionBackendInterface *collection, const Player *player, QObject *parent) + : QObject(parent), timeout_timer_(new QTimer(this)), playlist_parser_(new PlaylistParser(collection, this)), cue_parser_(new CueParser(collection, this)), diff --git a/src/core/standarditemiconloader.cpp b/src/core/standarditemiconloader.cpp index 91e8b9dd8..cfec0a6e8 100644 --- a/src/core/standarditemiconloader.cpp +++ b/src/core/standarditemiconloader.cpp @@ -34,9 +34,9 @@ #include "standarditemiconloader.h" StandardItemIconLoader::StandardItemIconLoader(AlbumCoverLoader *cover_loader, QObject *parent) - : QObject(parent), - cover_loader_(cover_loader), - model_(nullptr) { + : QObject(parent), + cover_loader_(cover_loader), + model_(nullptr) { cover_options_.desired_height_ = 16; diff --git a/src/core/stylesheetloader.cpp b/src/core/stylesheetloader.cpp index 71e7ee1ad..1613b42db 100644 --- a/src/core/stylesheetloader.cpp +++ b/src/core/stylesheetloader.cpp @@ -41,7 +41,9 @@ using namespace std::chrono_literals; -StyleSheetLoader::StyleSheetLoader(QObject *parent) : QObject(parent), timer_reset_counter_(new QTimer(this)) { +StyleSheetLoader::StyleSheetLoader(QObject *parent) + : QObject(parent), + timer_reset_counter_(new QTimer(this)) { timer_reset_counter_->setSingleShot(true); timer_reset_counter_->setInterval(1s); diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index 7d894e7aa..6728f277f 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -78,31 +78,30 @@ const char *AlbumCoverChoiceController::kAllFilesFilter = QT_TR_NOOP("All files QSet *AlbumCoverChoiceController::sImageExtensions = nullptr; -AlbumCoverChoiceController::AlbumCoverChoiceController(QWidget *parent) : - QWidget(parent), - app_(nullptr), - cover_searcher_(nullptr), - cover_fetcher_(nullptr), - save_file_dialog_(nullptr), - cover_from_url_dialog_(nullptr), - cover_from_file_(nullptr), - cover_to_file_(nullptr), - cover_from_url_(nullptr), - search_for_cover_(nullptr), - separator1_(nullptr), - unset_cover_(nullptr), - delete_cover_(nullptr), - clear_cover_(nullptr), - separator2_(nullptr), - show_cover_(nullptr), - search_cover_auto_(nullptr), - save_cover_type_(CollectionSettingsPage::SaveCoverType_Cache), - save_cover_filename_(CollectionSettingsPage::SaveCoverFilename_Pattern), - cover_overwrite_(false), - cover_lowercase_(true), - cover_replace_spaces_(true), - save_embedded_cover_override_(false) - { +AlbumCoverChoiceController::AlbumCoverChoiceController(QWidget *parent) + : QWidget(parent), + app_(nullptr), + cover_searcher_(nullptr), + cover_fetcher_(nullptr), + save_file_dialog_(nullptr), + cover_from_url_dialog_(nullptr), + cover_from_file_(nullptr), + cover_to_file_(nullptr), + cover_from_url_(nullptr), + search_for_cover_(nullptr), + separator1_(nullptr), + unset_cover_(nullptr), + delete_cover_(nullptr), + clear_cover_(nullptr), + separator2_(nullptr), + show_cover_(nullptr), + search_cover_auto_(nullptr), + save_cover_type_(CollectionSettingsPage::SaveCoverType_Cache), + save_cover_filename_(CollectionSettingsPage::SaveCoverFilename_Pattern), + cover_overwrite_(false), + cover_lowercase_(true), + cover_replace_spaces_(true), + save_embedded_cover_override_(false) { cover_from_file_ = new QAction(IconLoader::Load("document-open"), tr("Load cover from disk..."), this); cover_to_file_ = new QAction(IconLoader::Load("document-save"), tr("Save cover to disk..."), this); diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp index fa54d9409..036afe579 100644 --- a/src/covermanager/albumcoverloader.cpp +++ b/src/covermanager/albumcoverloader.cpp @@ -68,8 +68,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject *parent) cover_overwrite_(false), cover_lowercase_(true), cover_replace_spaces_(true), - original_thread_(nullptr) - { + original_thread_(nullptr) { original_thread_ = thread(); ReloadSettings(); diff --git a/src/covermanager/coverexportrunnable.cpp b/src/covermanager/coverexportrunnable.cpp index 8bcee2244..808ae1891 100644 --- a/src/covermanager/coverexportrunnable.cpp +++ b/src/covermanager/coverexportrunnable.cpp @@ -33,10 +33,10 @@ #include "albumcoverexport.h" #include "coverexportrunnable.h" -CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song, QObject *parent) : - QObject(parent), - dialog_result_(dialog_result), - song_(song) {} +CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song, QObject *parent) + : QObject(parent), + dialog_result_(dialog_result), + song_(song) {} void CoverExportRunnable::run() { diff --git a/src/covermanager/currentalbumcoverloader.cpp b/src/covermanager/currentalbumcoverloader.cpp index f72399edc..8c34610f9 100644 --- a/src/covermanager/currentalbumcoverloader.cpp +++ b/src/covermanager/currentalbumcoverloader.cpp @@ -43,8 +43,7 @@ CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(Application *app, QObject *pare : QObject(parent), app_(app), temp_file_pattern_(QDir::tempPath() + "/strawberry-cover-XXXXXX.jpg"), - id_(0) - { + id_(0) { options_.get_image_data_ = true; options_.get_image_ = true; diff --git a/src/covermanager/deezercoverprovider.cpp b/src/covermanager/deezercoverprovider.cpp index 45f3ef5de..710382ee9 100644 --- a/src/covermanager/deezercoverprovider.cpp +++ b/src/covermanager/deezercoverprovider.cpp @@ -53,7 +53,9 @@ const char *DeezerCoverProvider::kApiUrl = "https://api.deezer.com"; const int DeezerCoverProvider::kLimit = 10; -DeezerCoverProvider::DeezerCoverProvider(Application *app, QObject *parent): JsonCoverProvider("Deezer", true, false, 2.0, true, true, app, parent), network_(new NetworkAccessManager(this)) {} +DeezerCoverProvider::DeezerCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("Deezer", true, false, 2.0, true, true, app, parent), + network_(new NetworkAccessManager(this)) {} DeezerCoverProvider::~DeezerCoverProvider() { @@ -160,7 +162,7 @@ QByteArray DeezerCoverProvider::GetReplyData(QNetworkReply *reply) { } return data; - + } QJsonValue DeezerCoverProvider::ExtractData(const QByteArray &data) { diff --git a/src/covermanager/discogscoverprovider.cpp b/src/covermanager/discogscoverprovider.cpp index c88451c8a..4e18c44df 100644 --- a/src/covermanager/discogscoverprovider.cpp +++ b/src/covermanager/discogscoverprovider.cpp @@ -61,9 +61,10 @@ const char *DiscogsCoverProvider::kAccessKeyB64 = "dGh6ZnljUGJlZ1NEeXBuSFFxSVk=" const char *DiscogsCoverProvider::kSecretKeyB64 = "ZkFIcmlaSER4aHhRSlF2U3d0bm5ZVmdxeXFLWUl0UXI="; const int DiscogsCoverProvider::kRequestsDelay = 1000; -DiscogsCoverProvider::DiscogsCoverProvider(Application *app, QObject *parent) : - JsonCoverProvider("Discogs", false, false, 0.0, false, false, app, parent), - network_(new NetworkAccessManager(this)), timer_flush_requests_(new QTimer(this)) { +DiscogsCoverProvider::DiscogsCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("Discogs", false, false, 0.0, false, false, app, parent), + network_(new NetworkAccessManager(this)), + timer_flush_requests_(new QTimer(this)) { timer_flush_requests_->setInterval(kRequestsDelay); timer_flush_requests_->setSingleShot(false); diff --git a/src/covermanager/jsoncoverprovider.cpp b/src/covermanager/jsoncoverprovider.cpp index b0a55cdee..1c0e4546e 100644 --- a/src/covermanager/jsoncoverprovider.cpp +++ b/src/covermanager/jsoncoverprovider.cpp @@ -31,7 +31,8 @@ #include "coverprovider.h" #include "jsoncoverprovider.h" -JsonCoverProvider::JsonCoverProvider(const QString &name, const bool enabled, const bool authentication_required, const float quality, const bool batch, const bool allow_missing_album, Application *app, QObject *parent) : CoverProvider(name, enabled, authentication_required, quality, batch, allow_missing_album, app, parent) {} +JsonCoverProvider::JsonCoverProvider(const QString &name, const bool enabled, const bool authentication_required, const float quality, const bool batch, const bool allow_missing_album, Application *app, QObject *parent) + : CoverProvider(name, enabled, authentication_required, quality, batch, allow_missing_album, app, parent) {} QJsonObject JsonCoverProvider::ExtractJsonObj(const QByteArray &data) { diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp index 68ce2e7a0..09f03bfd9 100644 --- a/src/covermanager/lastfmcoverprovider.cpp +++ b/src/covermanager/lastfmcoverprovider.cpp @@ -53,7 +53,9 @@ const char *LastFmCoverProvider::kUrl = "https://ws.audioscrobbler.com/2.0/"; const char *LastFmCoverProvider::kApiKey = "211990b4c96782c05d1536e7219eb56e"; const char *LastFmCoverProvider::kSecret = "80fd738f49596e9709b1bf9319c444a8"; -LastFmCoverProvider::LastFmCoverProvider(Application *app, QObject *parent) : JsonCoverProvider("Last.fm", true, false, 1.0, true, false, app, parent), network_(new NetworkAccessManager(this)) {} +LastFmCoverProvider::LastFmCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("Last.fm", true, false, 1.0, true, false, app, parent), + network_(new NetworkAccessManager(this)) {} LastFmCoverProvider::~LastFmCoverProvider() { diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp index 1a332d8bd..7cd18a05c 100644 --- a/src/covermanager/musicbrainzcoverprovider.cpp +++ b/src/covermanager/musicbrainzcoverprovider.cpp @@ -51,7 +51,10 @@ const char *MusicbrainzCoverProvider::kAlbumCoverUrl = "https://coverartarchive. const int MusicbrainzCoverProvider::kLimit = 8; const int MusicbrainzCoverProvider::kRequestsDelay = 1000; -MusicbrainzCoverProvider::MusicbrainzCoverProvider(Application *app, QObject *parent): JsonCoverProvider("MusicBrainz", true, false, 1.5, true, false, app, parent), network_(new NetworkAccessManager(this)), timer_flush_requests_(new QTimer(this)) { +MusicbrainzCoverProvider::MusicbrainzCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("MusicBrainz", true, false, 1.5, true, false, app, parent), + network_(new NetworkAccessManager(this)), + timer_flush_requests_(new QTimer(this)) { timer_flush_requests_->setInterval(kRequestsDelay); timer_flush_requests_->setSingleShot(false); diff --git a/src/covermanager/musixmatchcoverprovider.cpp b/src/covermanager/musixmatchcoverprovider.cpp index 7de4ef5b8..587348970 100644 --- a/src/covermanager/musixmatchcoverprovider.cpp +++ b/src/covermanager/musixmatchcoverprovider.cpp @@ -40,7 +40,9 @@ #include "jsoncoverprovider.h" #include "musixmatchcoverprovider.h" -MusixmatchCoverProvider::MusixmatchCoverProvider(Application *app, QObject *parent): JsonCoverProvider("Musixmatch", true, false, 1.0, true, false, app, parent), network_(new NetworkAccessManager(this)) {} +MusixmatchCoverProvider::MusixmatchCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("Musixmatch", true, false, 1.0, true, false, app, parent), + network_(new NetworkAccessManager(this)) {} MusixmatchCoverProvider::~MusixmatchCoverProvider() { diff --git a/src/covermanager/qobuzcoverprovider.cpp b/src/covermanager/qobuzcoverprovider.cpp index 758c45ed6..a4d785662 100644 --- a/src/covermanager/qobuzcoverprovider.cpp +++ b/src/covermanager/qobuzcoverprovider.cpp @@ -52,9 +52,10 @@ const int QobuzCoverProvider::kLimit = 10; -QobuzCoverProvider::QobuzCoverProvider(Application *app, QObject *parent) : JsonCoverProvider("Qobuz", true, true, 2.0, true, true, app, parent), - service_(app->internet_services()->Service()), - network_(new NetworkAccessManager(this)) {} +QobuzCoverProvider::QobuzCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("Qobuz", true, true, 2.0, true, true, app, parent), + service_(app->internet_services()->Service()), + network_(new NetworkAccessManager(this)) {} QobuzCoverProvider::~QobuzCoverProvider() { diff --git a/src/covermanager/spotifycoverprovider.cpp b/src/covermanager/spotifycoverprovider.cpp index dd4cd7b7e..05a8bc301 100644 --- a/src/covermanager/spotifycoverprovider.cpp +++ b/src/covermanager/spotifycoverprovider.cpp @@ -63,7 +63,12 @@ const char *SpotifyCoverProvider::kClientSecretB64 = "N2ZlMDMxODk1NTBlNDE3ZGI1ZW const char *SpotifyCoverProvider::kApiUrl = "https://api.spotify.com/v1"; const int SpotifyCoverProvider::kLimit = 10; -SpotifyCoverProvider::SpotifyCoverProvider(Application *app, QObject *parent) : JsonCoverProvider("Spotify", true, true, 2.5, true, true, app, parent), network_(new NetworkAccessManager(this)), server_(nullptr), expires_in_(0), login_time_(0) { +SpotifyCoverProvider::SpotifyCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("Spotify", true, true, 2.5, true, true, app, parent), + network_(new NetworkAccessManager(this)), + server_(nullptr), + expires_in_(0), + login_time_(0) { refresh_login_timer_.setSingleShot(true); QObject::connect(&refresh_login_timer_, &QTimer::timeout, this, &SpotifyCoverProvider::RequestNewAccessToken); @@ -128,10 +133,9 @@ void SpotifyCoverProvider::Authenticate() { } const ParamList params = ParamList() << Param("client_id", QByteArray::fromBase64(kClientIDB64)) - << Param("response_type", "code") + << Param("response_type", "code") << Param("redirect_uri", redirect_url.toString()) << Param("state", code_challenge_); - QUrlQuery url_query; for (const Param ¶m : params) { diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp index 33a649e55..cd40a3288 100644 --- a/src/covermanager/tidalcoverprovider.cpp +++ b/src/covermanager/tidalcoverprovider.cpp @@ -50,12 +50,10 @@ const int TidalCoverProvider::kLimit = 10; -TidalCoverProvider::TidalCoverProvider(Application *app, QObject *parent) : - JsonCoverProvider("Tidal", true, true, 2.5, true, true, app, parent), - service_(app->internet_services()->Service()), - network_(new NetworkAccessManager(this)) { - -} +TidalCoverProvider::TidalCoverProvider(Application *app, QObject *parent) + : JsonCoverProvider("Tidal", true, true, 2.5, true, true, app, parent), + service_(app->internet_services()->Service()), + network_(new NetworkAccessManager(this)) {} TidalCoverProvider::~TidalCoverProvider() { diff --git a/src/device/cddadevice.cpp b/src/device/cddadevice.cpp index 119555c52..b259953c0 100644 --- a/src/device/cddadevice.cpp +++ b/src/device/cddadevice.cpp @@ -34,7 +34,8 @@ class DeviceLister; class DeviceManager; CddaDevice::CddaDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time, QObject *parent) - : ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent), cdda_song_loader_(url) { + : ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent), + cdda_song_loader_(url) { QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongsLoaded, this, &CddaDevice::SongsLoaded); QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongsDurationLoaded, this, &CddaDevice::SongsLoaded); diff --git a/src/device/cddasongloader.cpp b/src/device/cddasongloader.cpp index cdc0670b7..bcffcc006 100644 --- a/src/device/cddasongloader.cpp +++ b/src/device/cddasongloader.cpp @@ -43,10 +43,10 @@ #include "core/timeconstants.h" CddaSongLoader::CddaSongLoader(const QUrl &url, QObject *parent) - : QObject(parent), - url_(url), - cdda_(nullptr), - cdio_(nullptr) {} + : QObject(parent), + url_(url), + cdda_(nullptr), + cdio_(nullptr) {} CddaSongLoader::~CddaSongLoader() { if (cdio_) cdio_destroy(cdio_); diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp index ae8683c91..1fbf0dc53 100644 --- a/src/device/devicedatabasebackend.cpp +++ b/src/device/devicedatabasebackend.cpp @@ -40,11 +40,10 @@ const int DeviceDatabaseBackend::kDeviceSchemaVersion = 2; -DeviceDatabaseBackend::DeviceDatabaseBackend(QObject *parent) : - QObject(parent), - db_(nullptr), - original_thread_(nullptr) - { +DeviceDatabaseBackend::DeviceDatabaseBackend(QObject *parent) + : QObject(parent), + db_(nullptr), + original_thread_(nullptr) { original_thread_ = thread(); diff --git a/src/device/devicelister.cpp b/src/device/devicelister.cpp index 2693c3865..64df33b31 100644 --- a/src/device/devicelister.cpp +++ b/src/device/devicelister.cpp @@ -37,11 +37,11 @@ #include "core/logging.h" -DeviceLister::DeviceLister(QObject *parent) : - QObject(parent), - thread_(nullptr), - original_thread_(nullptr), - next_mount_request_id_(0) { +DeviceLister::DeviceLister(QObject *parent) + : QObject(parent), + thread_(nullptr), + original_thread_(nullptr), + next_mount_request_id_(0) { original_thread_ = thread(); diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp index f2e5fd6fe..ae36780cb 100644 --- a/src/device/devicemanager.cpp +++ b/src/device/devicemanager.cpp @@ -88,8 +88,8 @@ const int DeviceManager::kDeviceIconOverlaySize = 16; DeviceManager::DeviceManager(Application *app, QObject *parent) : SimpleTreeModel(new DeviceInfo(this), parent), - app_(app), - not_connected_overlay_(IconLoader::Load("edit-delete")) { + app_(app), + not_connected_overlay_(IconLoader::Load("edit-delete")) { thread_pool_.setMaxThreadCount(1); QObject::connect(app_->task_manager(), &TaskManager::TasksChanged, this, &DeviceManager::TasksChanged); diff --git a/src/device/devicestatefiltermodel.cpp b/src/device/devicestatefiltermodel.cpp index 4743fd54b..b9e5eeb1f 100644 --- a/src/device/devicestatefiltermodel.cpp +++ b/src/device/devicestatefiltermodel.cpp @@ -31,8 +31,8 @@ #include "devicestatefiltermodel.h" DeviceStateFilterModel::DeviceStateFilterModel(QObject *parent, DeviceManager::State state) - : QSortFilterProxyModel(parent), - state_(state) { + : QSortFilterProxyModel(parent), + state_(state) { QObject::connect(this, &DeviceStateFilterModel::rowsInserted, this, &DeviceStateFilterModel::ProxyRowCountChanged); QObject::connect(this, &DeviceStateFilterModel::rowsRemoved, this, &DeviceStateFilterModel::ProxyRowCountChanged); diff --git a/src/device/filesystemdevice.cpp b/src/device/filesystemdevice.cpp index a16d1f0f2..b9917d1a0 100644 --- a/src/device/filesystemdevice.cpp +++ b/src/device/filesystemdevice.cpp @@ -44,8 +44,7 @@ class DeviceLister; FilesystemDevice::FilesystemDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, const int database_id, const bool first_time, QObject *parent) : FilesystemMusicStorage(url.toLocalFile()), ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent), - watcher_(new CollectionWatcher(Song::Source_Device)), watcher_thread_(new QThread(this)) - { + watcher_(new CollectionWatcher(Song::Source_Device)), watcher_thread_(new QThread(this)) { watcher_->moveToThread(watcher_thread_); watcher_thread_->start(QThread::IdlePriority); diff --git a/src/device/gpoddevice.cpp b/src/device/gpoddevice.cpp index cb943cb18..3b7af52d6 100644 --- a/src/device/gpoddevice.cpp +++ b/src/device/gpoddevice.cpp @@ -52,7 +52,7 @@ class DeviceLister; class DeviceManager; GPodDevice::GPodDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, const int database_id, const bool first_time, QObject *parent) - : ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent), + : ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent), loader_(nullptr), loader_thread_(nullptr), db_(nullptr), diff --git a/src/device/mtpconnection.cpp b/src/device/mtpconnection.cpp index 171f08841..1f3c76ff0 100644 --- a/src/device/mtpconnection.cpp +++ b/src/device/mtpconnection.cpp @@ -149,4 +149,3 @@ bool MtpConnection::GetSupportedFiletypes(QList *ret) { return true; } - diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp index 7b650ca1f..a299776a4 100644 --- a/src/device/mtpdevice.cpp +++ b/src/device/mtpdevice.cpp @@ -50,10 +50,10 @@ class DeviceManager; bool MtpDevice::sInitializedLibMTP = false; MtpDevice::MtpDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, const int database_id, const bool first_time, QObject *parent) - : ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent), - loader_(nullptr), - loader_thread_(nullptr), - closing_(false) { + : ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent), + loader_(nullptr), + loader_thread_(nullptr), + closing_(false) { if (!sInitializedLibMTP) { LIBMTP_Init(); diff --git a/src/dialogs/deleteconfirmationdialog.cpp b/src/dialogs/deleteconfirmationdialog.cpp index 63791dcb3..f12482ffe 100644 --- a/src/dialogs/deleteconfirmationdialog.cpp +++ b/src/dialogs/deleteconfirmationdialog.cpp @@ -36,7 +36,9 @@ #include "deleteconfirmationdialog.h" -DeleteConfirmationDialog::DeleteConfirmationDialog(const QStringList &files, QWidget *parent) : QDialog(parent, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint), button_box_(new QDialogButtonBox(this)) { +DeleteConfirmationDialog::DeleteConfirmationDialog(const QStringList &files, QWidget *parent) + : QDialog(parent, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint), + button_box_(new QDialogButtonBox(this)) { setModal(true); setWindowTitle(tr("Delete files")); diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp index dc641cea9..de59c2e94 100644 --- a/src/dialogs/edittagdialog.cpp +++ b/src/dialogs/edittagdialog.cpp @@ -116,8 +116,7 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent) tags_cover_art_id_(-1), cover_art_is_set_(false), save_tag_pending_(0), - save_art_pending_(0) - { + save_art_pending_(0) { QObject::connect(app_->album_cover_loader(), &AlbumCoverLoader::AlbumCoverLoaded, this, &EditTagDialog::AlbumCoverLoaded); diff --git a/src/dialogs/errordialog.cpp b/src/dialogs/errordialog.cpp index da2b2ad5e..64e83124d 100644 --- a/src/dialogs/errordialog.cpp +++ b/src/dialogs/errordialog.cpp @@ -35,9 +35,8 @@ class QHideEvent; ErrorDialog::ErrorDialog(QWidget *parent) - : QDialog(parent), - ui_(new Ui_ErrorDialog) -{ + : QDialog(parent), + ui_(new Ui_ErrorDialog) { ui_->setupUi(this); diff --git a/src/dialogs/lastfmimportdialog.cpp b/src/dialogs/lastfmimportdialog.cpp index 44657615e..5967851f3 100644 --- a/src/dialogs/lastfmimportdialog.cpp +++ b/src/dialogs/lastfmimportdialog.cpp @@ -30,12 +30,13 @@ #include "core/iconloader.h" #include "scrobbler/lastfmimport.h" -LastFMImportDialog::LastFMImportDialog(LastFMImport *lastfm_import, QWidget *parent) : QDialog(parent), - ui_(new Ui_LastFMImportDialog), - lastfm_import_(lastfm_import), - finished_(false), - playcount_total_(0), - lastplayed_total_(0) { +LastFMImportDialog::LastFMImportDialog(LastFMImport *lastfm_import, QWidget *parent) + : QDialog(parent), + ui_(new Ui_LastFMImportDialog), + lastfm_import_(lastfm_import), + finished_(false), + playcount_total_(0), + lastplayed_total_(0) { ui_->setupUi(this); diff --git a/src/dialogs/trackselectiondialog.cpp b/src/dialogs/trackselectiondialog.cpp index b7ede22a1..574fad8e0 100644 --- a/src/dialogs/trackselectiondialog.cpp +++ b/src/dialogs/trackselectiondialog.cpp @@ -55,9 +55,9 @@ #include "ui_trackselectiondialog.h" TrackSelectionDialog::TrackSelectionDialog(QWidget *parent) - : QDialog(parent), - ui_(new Ui_TrackSelectionDialog), - save_on_close_(false) { + : QDialog(parent), + ui_(new Ui_TrackSelectionDialog), + save_on_close_(false) { // Setup dialog window ui_->setupUi(this); diff --git a/src/engine/alsadevicefinder.cpp b/src/engine/alsadevicefinder.cpp index c68b7370a..0494b1904 100644 --- a/src/engine/alsadevicefinder.cpp +++ b/src/engine/alsadevicefinder.cpp @@ -34,8 +34,7 @@ #include "devicefinder.h" #include "alsadevicefinder.h" -AlsaDeviceFinder::AlsaDeviceFinder() - : DeviceFinder("alsa", {"alsa","alsasink"}) {} +AlsaDeviceFinder::AlsaDeviceFinder() : DeviceFinder("alsa", {"alsa","alsasink"}) {} QList AlsaDeviceFinder::ListDevices() { diff --git a/src/engine/alsapcmdevicefinder.cpp b/src/engine/alsapcmdevicefinder.cpp index 70c19e0e5..63f252ef0 100644 --- a/src/engine/alsapcmdevicefinder.cpp +++ b/src/engine/alsapcmdevicefinder.cpp @@ -33,8 +33,7 @@ #include "devicefinder.h" #include "alsapcmdevicefinder.h" -AlsaPCMDeviceFinder::AlsaPCMDeviceFinder() - : DeviceFinder("alsa", {"alsa","alsasink"}) {} +AlsaPCMDeviceFinder::AlsaPCMDeviceFinder() : DeviceFinder("alsa", {"alsa","alsasink"}) {} QList AlsaPCMDeviceFinder::ListDevices() { diff --git a/src/engine/devicefinder.cpp b/src/engine/devicefinder.cpp index 7a94444f7..5ada67272 100644 --- a/src/engine/devicefinder.cpp +++ b/src/engine/devicefinder.cpp @@ -23,8 +23,7 @@ #include "devicefinder.h" -DeviceFinder::DeviceFinder(const QString &name, const QStringList &outputs): name_(name), outputs_(outputs) { -} +DeviceFinder::DeviceFinder(const QString &name, const QStringList &outputs): name_(name), outputs_(outputs) {} QString DeviceFinder::GuessIconName(const QString &description) { diff --git a/src/engine/directsounddevicefinder.cpp b/src/engine/directsounddevicefinder.cpp index 6495a747a..08354f4a9 100644 --- a/src/engine/directsounddevicefinder.cpp +++ b/src/engine/directsounddevicefinder.cpp @@ -35,9 +35,7 @@ #include "directsounddevicefinder.h" #include "core/logging.h" -DirectSoundDeviceFinder::DirectSoundDeviceFinder() - : DeviceFinder("directsound", { "directsound", "dsound", "directsoundsink", "directx", "directx2" }) { -} +DirectSoundDeviceFinder::DirectSoundDeviceFinder() : DeviceFinder("directsound", { "directsound", "dsound", "directsoundsink", "directx", "directx2" }) {} QList DirectSoundDeviceFinder::ListDevices() { State state; diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp index c16bdccde..0b3758755 100644 --- a/src/engine/gstengine.cpp +++ b/src/engine/gstengine.cpp @@ -100,8 +100,7 @@ GstEngine::GstEngine(TaskManager *task_manager, QObject *parent) have_new_buffer_(false), scope_chunks_(0), discovery_finished_cb_id_(-1), - discovery_discovered_cb_id_(-1) - { + discovery_discovered_cb_id_(-1) { seek_timer_->setSingleShot(true); seek_timer_->setInterval(kSeekDelayNanosec / kNsecPerMsec); diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index 2d617066c..68ddf5407 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -115,8 +115,7 @@ GstEnginePipeline::GstEnginePipeline(GstEngine *engine, QObject *parent) notify_source_cb_id_(-1), about_to_finish_cb_id_(-1), bus_cb_id_(-1), - unsupported_analyzer_(false) - { + unsupported_analyzer_(false) { if (!sElementDeleter) { sElementDeleter = new GstElementDeleter(engine_); diff --git a/src/engine/macosdevicefinder.cpp b/src/engine/macosdevicefinder.cpp index a77a85d33..f13d394b0 100644 --- a/src/engine/macosdevicefinder.cpp +++ b/src/engine/macosdevicefinder.cpp @@ -62,9 +62,7 @@ std::unique_ptr GetProperty(const AudioDeviceID &device_id, const AudioObject } // namespace -MacOsDeviceFinder::MacOsDeviceFinder() - : DeviceFinder("osxaudio", { "osxaudio", "osx", "osxaudiosink"} ) { -} +MacOsDeviceFinder::MacOsDeviceFinder() : DeviceFinder("osxaudio", { "osxaudio", "osx", "osxaudiosink"} ) {} QList MacOsDeviceFinder::ListDevices() { diff --git a/src/engine/vlcengine.cpp b/src/engine/vlcengine.cpp index e4e0731cf..a7736207a 100644 --- a/src/engine/vlcengine.cpp +++ b/src/engine/vlcengine.cpp @@ -40,10 +40,10 @@ #include "vlcscopedref.h" VLCEngine::VLCEngine(TaskManager *task_manager, QObject *parent) - : Engine::Base(Engine::VLC, parent), - instance_(nullptr), - player_(nullptr), - state_(Engine::Empty) { + : Engine::Base(Engine::VLC, parent), + instance_(nullptr), + player_(nullptr), + state_(Engine::Empty) { Q_UNUSED(task_manager); diff --git a/src/equalizer/equalizer.cpp b/src/equalizer/equalizer.cpp index e35409ace..76cb14a0e 100644 --- a/src/equalizer/equalizer.cpp +++ b/src/equalizer/equalizer.cpp @@ -54,7 +54,9 @@ const char *Equalizer::kGainText[] = { "60", "170", "310", "600", "1k", "3k", "6 const char *Equalizer::kSettingsGroup = "Equalizer"; Equalizer::Equalizer(QWidget *parent) - : QDialog(parent), ui_(new Ui_Equalizer), loading_(false) { + : QDialog(parent), + ui_(new Ui_Equalizer), + loading_(false) { ui_->setupUi(this); diff --git a/src/equalizer/equalizerslider.cpp b/src/equalizer/equalizerslider.cpp index df936de01..bde955e40 100644 --- a/src/equalizer/equalizerslider.cpp +++ b/src/equalizer/equalizerslider.cpp @@ -32,8 +32,8 @@ EqualizerSlider::EqualizerSlider(const QString &label, QWidget *parent) : QWidget(parent), - ui_(new Ui_EqualizerSlider) -{ + ui_(new Ui_EqualizerSlider) { + ui_->setupUi(this); ui_->band->setText(label); diff --git a/src/globalshortcuts/globalshortcut.cpp b/src/globalshortcuts/globalshortcut.cpp index 081c82678..b660df1bb 100644 --- a/src/globalshortcuts/globalshortcut.cpp +++ b/src/globalshortcuts/globalshortcut.cpp @@ -38,12 +38,13 @@ GlobalShortcut *GlobalShortcut::initialized_ = nullptr; QHash, GlobalShortcut*> GlobalShortcut::internal_shortcuts_; -GlobalShortcut::GlobalShortcut(QObject *parent) : QObject(parent), - backend_(nullptr), - qt_key_(Qt::Key(0)), - qt_mods_(Qt::NoModifier), - native_key_(0), - native_mods_(0) { +GlobalShortcut::GlobalShortcut(QObject *parent) + : QObject(parent), + backend_(nullptr), + qt_key_(Qt::Key(0)), + qt_mods_(Qt::NoModifier), + native_key_(0), + native_mods_(0) { Q_ASSERT(!initialized_); @@ -52,13 +53,14 @@ GlobalShortcut::GlobalShortcut(QObject *parent) : QObject(parent), } -GlobalShortcut::GlobalShortcut(const QKeySequence &shortcut, GlobalShortcutsBackend *backend, QObject *parent) : QObject(parent), - backend_(backend), - shortcut_(shortcut), - qt_key_(Qt::Key(0)), - qt_mods_(Qt::NoModifier), - native_key_(0), - native_mods_(0) { +GlobalShortcut::GlobalShortcut(const QKeySequence &shortcut, GlobalShortcutsBackend *backend, QObject *parent) + : QObject(parent), + backend_(backend), + shortcut_(shortcut), + qt_key_(Qt::Key(0)), + qt_mods_(Qt::NoModifier), + native_key_(0), + native_mods_(0) { Q_ASSERT(initialized_); setShortcut(shortcut); diff --git a/src/globalshortcuts/globalshortcutgrabber.cpp b/src/globalshortcuts/globalshortcutgrabber.cpp index dc8ec6ca9..5f3ef5ab4 100644 --- a/src/globalshortcuts/globalshortcutgrabber.cpp +++ b/src/globalshortcuts/globalshortcutgrabber.cpp @@ -35,7 +35,9 @@ #include "ui_globalshortcutgrabber.h" GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent) - : QDialog(parent), ui_(new Ui::GlobalShortcutGrabber), wrapper_(nullptr) { + : QDialog(parent), + ui_(new Ui::GlobalShortcutGrabber), + wrapper_(nullptr) { ui_->setupUi(this); diff --git a/src/globalshortcuts/globalshortcutsbackend-kde.cpp b/src/globalshortcuts/globalshortcutsbackend-kde.cpp index b3e03ecc0..d3d543d4f 100644 --- a/src/globalshortcuts/globalshortcutsbackend-kde.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-kde.cpp @@ -41,7 +41,10 @@ const char *GlobalShortcutsBackendKDE::kKdeService = "org.kde.kglobalaccel"; const char *GlobalShortcutsBackendKDE::kKdePath = "/kglobalaccel"; -GlobalShortcutsBackendKDE::GlobalShortcutsBackendKDE(GlobalShortcutsManager *manager, QObject *parent) : GlobalShortcutsBackend(manager, parent), interface_(nullptr), component_(nullptr) {} +GlobalShortcutsBackendKDE::GlobalShortcutsBackendKDE(GlobalShortcutsManager *manager, QObject *parent) + : GlobalShortcutsBackend(manager, parent), + interface_(nullptr), + component_(nullptr) {} bool GlobalShortcutsBackendKDE::IsAvailable() { diff --git a/src/globalshortcuts/globalshortcutsbackend-system.cpp b/src/globalshortcuts/globalshortcutsbackend-system.cpp index 0602e0ac4..443824586 100644 --- a/src/globalshortcuts/globalshortcutsbackend-system.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-system.cpp @@ -33,7 +33,9 @@ #include "globalshortcutsbackend.h" #include "globalshortcut.h" -GlobalShortcutsBackendSystem::GlobalShortcutsBackendSystem(GlobalShortcutsManager *manager, QObject *parent) : GlobalShortcutsBackend(manager, parent), gshortcut_init_(nullptr) {} +GlobalShortcutsBackendSystem::GlobalShortcutsBackendSystem(GlobalShortcutsManager *manager, QObject *parent) + : GlobalShortcutsBackend(manager, parent), + gshortcut_init_(nullptr) {} GlobalShortcutsBackendSystem::~GlobalShortcutsBackendSystem() { GlobalShortcutsBackendSystem::DoUnregister(); } diff --git a/src/globalshortcuts/globalshortcutsbackend.cpp b/src/globalshortcuts/globalshortcutsbackend.cpp index 9a00e6279..7a65c7f37 100644 --- a/src/globalshortcuts/globalshortcutsbackend.cpp +++ b/src/globalshortcuts/globalshortcutsbackend.cpp @@ -26,7 +26,9 @@ #include "globalshortcutsmanager.h" GlobalShortcutsBackend::GlobalShortcutsBackend(GlobalShortcutsManager *manager, QObject *parent) - : QObject(parent), manager_(manager), active_(false) {} + : QObject(parent), + manager_(manager), + active_(false) {} bool GlobalShortcutsBackend::Register() { bool ret = DoRegister(); diff --git a/src/globalshortcuts/globalshortcutsmanager.cpp b/src/globalshortcuts/globalshortcutsmanager.cpp index 1178e02d0..95d782454 100644 --- a/src/globalshortcuts/globalshortcutsmanager.cpp +++ b/src/globalshortcuts/globalshortcutsmanager.cpp @@ -60,8 +60,7 @@ GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent) use_kde_(true), use_gnome_(true), use_mate_(true), - use_x11_(false) - { + use_x11_(false) { settings_.beginGroup(GlobalShortcutsSettingsPage::kSettingsGroup); diff --git a/src/globalshortcuts/keymapper_x11.h b/src/globalshortcuts/keymapper_x11.h index c36a139ff..a1ccbe7ad 100644 --- a/src/globalshortcuts/keymapper_x11.h +++ b/src/globalshortcuts/keymapper_x11.h @@ -159,7 +159,7 @@ static const QMap keymapper_x11_ = { // clazy:exclude=non-pod { Qt::Key_cedilla, XK_cedilla }, { Qt::Key_onesuperior, XK_onesuperior }, { Qt::Key_masculine, XK_masculine }, - { Qt::Key_guillemotright, XK_guillemotright }, + { Qt::Key_guillemotright, XK_guillemotright }, { Qt::Key_onequarter, XK_onequarter }, { Qt::Key_onehalf, XK_onehalf }, { Qt::Key_threequarters, XK_threequarters }, @@ -171,7 +171,7 @@ static const QMap keymapper_x11_ = { // clazy:exclude=non-pod { Qt::Key_Adiaeresis, XK_Adiaeresis }, { Qt::Key_Aring, XK_Aring }, { Qt::Key_AE, XK_AE }, - { Qt::Key_Ccedilla, XK_Ccedilla }, + { Qt::Key_Ccedilla, XK_Ccedilla }, { Qt::Key_Egrave, XK_Egrave }, { Qt::Key_Eacute, XK_Eacute }, { Qt::Key_Ecircumflex, XK_Ecircumflex }, @@ -197,9 +197,9 @@ static const QMap keymapper_x11_ = { // clazy:exclude=non-pod { Qt::Key_THORN, XK_THORN }, { Qt::Key_ssharp, XK_ssharp }, { Qt::Key_division, XK_division }, - { Qt::Key_ydiaeresis, XK_ydiaeresis }, + { Qt::Key_ydiaeresis, XK_ydiaeresis }, { Qt::Key_Multi_key, XK_Multi_key }, - { Qt::Key_Codeinput, XK_Codeinput }, + { Qt::Key_Codeinput, XK_Codeinput }, { Qt::Key_SingleCandidate, XK_SingleCandidate }, { Qt::Key_MultipleCandidate, XK_MultipleCandidate }, { Qt::Key_PreviousCandidate, XK_PreviousCandidate }, diff --git a/src/internet/internetcollectionview.cpp b/src/internet/internetcollectionview.cpp index 1af441d21..202dc027c 100644 --- a/src/internet/internetcollectionview.cpp +++ b/src/internet/internetcollectionview.cpp @@ -66,8 +66,7 @@ InternetCollectionView::InternetCollectionView(QWidget *parent) add_to_playlist_enqueue_next_(nullptr), open_in_new_playlist_(nullptr), remove_songs_(nullptr), - is_in_keyboard_search_(false) - { + is_in_keyboard_search_(false) { setItemDelegate(new CollectionItemDelegate(this)); setAttribute(Qt::WA_MacShowFocusRect, false); diff --git a/src/internet/internetcollectionviewcontainer.cpp b/src/internet/internetcollectionviewcontainer.cpp index a34ff1dfc..ef1d189be 100644 --- a/src/internet/internetcollectionviewcontainer.cpp +++ b/src/internet/internetcollectionviewcontainer.cpp @@ -30,9 +30,9 @@ #include "internetcollectionviewcontainer.h" #include "ui_internetcollectionviewcontainer.h" -InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent) : - QWidget(parent), - ui_(new Ui_InternetCollectionViewContainer) { +InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent) + : QWidget(parent), + ui_(new Ui_InternetCollectionViewContainer) { ui_->setupUi(this); view()->SetFilter(filter_widget()); diff --git a/src/internet/internetplaylistitem.cpp b/src/internet/internetplaylistitem.cpp index 7edf4de32..45daf8eb0 100644 --- a/src/internet/internetplaylistitem.cpp +++ b/src/internet/internetplaylistitem.cpp @@ -36,7 +36,8 @@ #include "playlist/playlistbackend.h" InternetPlaylistItem::InternetPlaylistItem(const Song::Source source) - : PlaylistItem(source), source_(source) {} + : PlaylistItem(source), + source_(source) {} InternetPlaylistItem::InternetPlaylistItem(const Song &metadata) : PlaylistItem(metadata.source()), diff --git a/src/internet/internetsearchitemdelegate.cpp b/src/internet/internetsearchitemdelegate.cpp index 87c447efb..7be10acbd 100644 --- a/src/internet/internetsearchitemdelegate.cpp +++ b/src/internet/internetsearchitemdelegate.cpp @@ -25,7 +25,8 @@ #include "internetsearchview.h" InternetSearchItemDelegate::InternetSearchItemDelegate(InternetSearchView *view) - : CollectionItemDelegate(view), view_(view) {} + : CollectionItemDelegate(view), + view_(view) {} void InternetSearchItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const { diff --git a/src/internet/internetservice.cpp b/src/internet/internetservice.cpp index 1fb98d397..1128edfc9 100644 --- a/src/internet/internetservice.cpp +++ b/src/internet/internetservice.cpp @@ -26,11 +26,11 @@ class Application; -InternetService::InternetService(Song::Source source, const QString &name, const QString &url_scheme, const QString &settings_group, SettingsDialog::Page settings_page, Application *app, QObject *parent) : - QObject(parent), - app_(app), - source_(source), - name_(name), - url_scheme_(url_scheme), - settings_group_(settings_group), - settings_page_(settings_page) {} +InternetService::InternetService(Song::Source source, const QString &name, const QString &url_scheme, const QString &settings_group, SettingsDialog::Page settings_page, Application *app, QObject *parent) + : QObject(parent), + app_(app), + source_(source), + name_(name), + url_scheme_(url_scheme), + settings_group_(settings_group), + settings_page_(settings_page) {} diff --git a/src/internet/internetsongsview.cpp b/src/internet/internetsongsview.cpp index f0f2bd974..78a700fe8 100644 --- a/src/internet/internetsongsview.cpp +++ b/src/internet/internetsongsview.cpp @@ -46,8 +46,7 @@ InternetSongsView::InternetSongsView(Application *app, InternetService *service, service_(service), settings_group_(settings_group), settings_page_(settings_page), - ui_(new Ui_InternetCollectionViewContainer) - { + ui_(new Ui_InternetCollectionViewContainer) { ui_->setupUi(this); diff --git a/src/internet/internettabsview.cpp b/src/internet/internettabsview.cpp index bb57828da..b1c2ee483 100644 --- a/src/internet/internettabsview.cpp +++ b/src/internet/internettabsview.cpp @@ -50,8 +50,7 @@ InternetTabsView::InternetTabsView(Application *app, InternetService *service, c service_(service), settings_group_(settings_group), settings_page_(settings_page), - ui_(new Ui_InternetTabsView) - { + ui_(new Ui_InternetTabsView) { ui_->setupUi(this); diff --git a/src/internet/localredirectserver.cpp b/src/internet/localredirectserver.cpp index 0a29c4e8b..7e54669ff 100644 --- a/src/internet/localredirectserver.cpp +++ b/src/internet/localredirectserver.cpp @@ -57,8 +57,7 @@ LocalRedirectServer::LocalRedirectServer(QObject *parent) : QTcpServer(parent), https_(false), port_(0), - socket_(nullptr) - {} + socket_(nullptr) {} LocalRedirectServer::~LocalRedirectServer() { if (isListening()) close(); diff --git a/src/moodbar/moodbarcontroller.cpp b/src/moodbar/moodbarcontroller.cpp index 4c8ee3a90..c4dd73ce0 100644 --- a/src/moodbar/moodbarcontroller.cpp +++ b/src/moodbar/moodbarcontroller.cpp @@ -34,8 +34,8 @@ MoodbarController::MoodbarController(Application *app, QObject *parent) : QObject(parent), - app_(app), - enabled_(false) { + app_(app), + enabled_(false) { QObject::connect(app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, this, &MoodbarController::CurrentSongChanged); QObject::connect(app_->player(), &Player::Stopped, this, &MoodbarController::PlaybackStopped); diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp index 91eb0683a..aba24079a 100644 --- a/src/moodbar/moodbarpipeline.cpp +++ b/src/moodbar/moodbarpipeline.cpp @@ -224,7 +224,7 @@ void MoodbarPipeline::Cleanup() { GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline_)); gst_bus_set_sync_handler(bus, nullptr, nullptr, nullptr); gst_object_unref(bus); - + gst_element_set_state(pipeline_, GST_STATE_NULL); gst_object_unref(pipeline_); pipeline_ = nullptr; diff --git a/src/organize/organizedialog.h b/src/organize/organizedialog.h index 75d04d60f..a559b5698 100644 --- a/src/organize/organizedialog.h +++ b/src/organize/organizedialog.h @@ -70,7 +70,7 @@ class OrganizeDialog : public QDialog { void SetCopy(const bool copy); static Organize::NewSongInfoList ComputeNewSongsFilenames(const SongList &songs, const OrganizeFormat &format, const QString &extension = QString()); - + void SetPlaylist(const QString &playlist); protected: diff --git a/src/osd/osddbus.cpp b/src/osd/osddbus.cpp index 6002c76e3..5ecb90958 100644 --- a/src/osd/osddbus.cpp +++ b/src/osd/osddbus.cpp @@ -109,8 +109,13 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, QImage &image) { } -OSDDBus::OSDDBus(std::shared_ptr tray_icon, Application *app, QObject *parent) : OSDBase(tray_icon, app, parent), version_(1, 1), notification_id_(0) { +OSDDBus::OSDDBus(std::shared_ptr tray_icon, Application *app, QObject *parent) + : OSDBase(tray_icon, app, parent), + version_(1, 1), + notification_id_(0) { + Init(); + } OSDDBus::~OSDDBus() = default; diff --git a/src/playlist/dynamicplaylistcontrols.cpp b/src/playlist/dynamicplaylistcontrols.cpp index eb0447aa6..0ab0945e7 100644 --- a/src/playlist/dynamicplaylistcontrols.cpp +++ b/src/playlist/dynamicplaylistcontrols.cpp @@ -19,7 +19,8 @@ #include "ui_dynamicplaylistcontrols.h" DynamicPlaylistControls::DynamicPlaylistControls(QWidget *parent) - : QWidget(parent), ui_(new Ui_DynamicPlaylistControls) { + : QWidget(parent), + ui_(new Ui_DynamicPlaylistControls) { ui_->setupUi(this); diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index 495571741..563e8dbcb 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -144,8 +144,7 @@ Playlist::Playlist(PlaylistBackend *backend, TaskManager *task_manager, Collecti editing_(-1), auto_sort_(false), sort_column_(Column_Title), - sort_order_(Qt::AscendingOrder) - { + sort_order_(Qt::AscendingOrder) { undo_stack_->setUndoLimit(kUndoStackSize); diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index e909346f9..d5fb29833 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -60,7 +60,10 @@ const int PlaylistBackend::kSongTableJoins = 2; PlaylistBackend::PlaylistBackend(Application *app, QObject *parent) - : QObject(parent), app_(app), db_(app_->database()), original_thread_(nullptr) { + : QObject(parent), + app_(app), + db_(app_->database()), + original_thread_(nullptr) { original_thread_ = thread(); diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp index aaf4acb29..42573d64f 100644 --- a/src/playlist/playlistdelegates.cpp +++ b/src/playlist/playlistdelegates.cpp @@ -85,7 +85,8 @@ const float QueuedItemDelegate::kQueueOpacityLowerBound = 0.4; const int PlaylistDelegateBase::kMinHeight = 19; QueuedItemDelegate::QueuedItemDelegate(QObject *parent, int indicator_column) - : QStyledItemDelegate(parent), indicator_column_(indicator_column) {} + : QStyledItemDelegate(parent), + indicator_column_(indicator_column) {} void QueuedItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const { diff --git a/src/playlist/playlistheader.cpp b/src/playlist/playlistheader.cpp index 89769f6fe..263521f29 100644 --- a/src/playlist/playlistheader.cpp +++ b/src/playlist/playlistheader.cpp @@ -51,8 +51,7 @@ PlaylistHeader::PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, action_rating_lock_(nullptr), action_align_left_(nullptr), action_align_center_(nullptr), - action_align_right_(nullptr) - { + action_align_right_(nullptr) { action_hide_ = menu_->addAction(tr("&Hide..."), this, &PlaylistHeader::HideCurrent); action_stretch_ = menu_->addAction(tr("&Stretch columns to fit window"), this, &PlaylistHeader::ToggleStretchEnabled); diff --git a/src/playlist/playlistlistcontainer.cpp b/src/playlist/playlistlistcontainer.cpp index 4781e9abf..594f99367 100644 --- a/src/playlist/playlistlistcontainer.cpp +++ b/src/playlist/playlistlistcontainer.cpp @@ -77,8 +77,7 @@ PlaylistListContainer::PlaylistListContainer(QWidget *parent) model_(new PlaylistListModel(this)), proxy_(new PlaylistListSortFilterModel(this)), loaded_icons_(false), - active_playlist_id_(-1) -{ + active_playlist_id_(-1) { ui_->setupUi(this); ui_->tree->setAttribute(Qt::WA_MacShowFocusRect, false); diff --git a/src/playlist/playlistlistview.cpp b/src/playlist/playlistlistview.cpp index bcc17586a..1da2e6229 100644 --- a/src/playlist/playlistlistview.cpp +++ b/src/playlist/playlistlistview.cpp @@ -32,8 +32,7 @@ #include "playlistlistview.h" -PlaylistListView::PlaylistListView(QWidget *parent) - : AutoExpandingTreeView(parent) {} +PlaylistListView::PlaylistListView(QWidget *parent) : AutoExpandingTreeView(parent) {} void PlaylistListView::paintEvent(QPaintEvent *event) { diff --git a/src/playlist/playlistsequence.cpp b/src/playlist/playlistsequence.cpp index 66ddc722e..743ad54cd 100644 --- a/src/playlist/playlistsequence.cpp +++ b/src/playlist/playlistsequence.cpp @@ -49,8 +49,7 @@ PlaylistSequence::PlaylistSequence(QWidget *parent, SettingsProvider *settings) loading_(false), repeat_mode_(Repeat_Off), shuffle_mode_(Shuffle_Off), - dynamic_(false) -{ + dynamic_(false) { ui_->setupUi(this); diff --git a/src/playlist/playlistundocommands.cpp b/src/playlist/playlistundocommands.cpp index c47ec0d0f..efe5bebf0 100644 --- a/src/playlist/playlistundocommands.cpp +++ b/src/playlist/playlistundocommands.cpp @@ -37,13 +37,14 @@ namespace PlaylistUndoCommands { Base::Base(Playlist *playlist) : QUndoCommand(nullptr), playlist_(playlist) {} InsertItems::InsertItems(Playlist *playlist, const PlaylistItemList &items, int pos, bool enqueue, bool enqueue_next) - : Base(playlist), - items_(items), - pos_(pos), - enqueue_(enqueue), - enqueue_next_(enqueue_next) -{ + : Base(playlist), + items_(items), + pos_(pos), + enqueue_(enqueue), + enqueue_next_(enqueue_next) { + setText(tr("add %n songs", "", items_.count())); + } void InsertItems::redo() { @@ -96,11 +97,12 @@ bool RemoveItems::mergeWith(const QUndoCommand *other) { MoveItems::MoveItems(Playlist *playlist, const QList &source_rows, int pos) - : Base(playlist), - source_rows_(source_rows), - pos_(pos) -{ + : Base(playlist), + source_rows_(source_rows), + pos_(pos) { + setText(tr("move %n songs", "", source_rows.count())); + } void MoveItems::redo() { @@ -119,7 +121,7 @@ void ReOrderItems::undo() { playlist_->ReOrderWithoutUndo(old_items_); } void ReOrderItems::redo() { playlist_->ReOrderWithoutUndo(new_items_); } SortItems::SortItems(Playlist *playlist, int column, Qt::SortOrder order, const PlaylistItemList &new_items) - : ReOrderItems(playlist, new_items) { + : ReOrderItems(playlist, new_items) { Q_UNUSED(column); Q_UNUSED(order); @@ -130,9 +132,10 @@ SortItems::SortItems(Playlist *playlist, int column, Qt::SortOrder order, const ShuffleItems::ShuffleItems(Playlist *playlist, const PlaylistItemList &new_items) - : ReOrderItems(playlist, new_items) -{ + : ReOrderItems(playlist, new_items) { + setText(tr("shuffle songs")); + } } // namespace PlaylistUndoCommands diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index d073110d9..13071c24c 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -114,19 +114,23 @@ void PlaylistProxyStyle::drawControl(ControlElement element, const QStyleOption } } - if (element == CE_ItemViewItem) + if (element == CE_ItemViewItem) { common_style_->drawControl(element, option, painter, widget); - else + } + else { QProxyStyle::drawControl(element, option, painter, widget); + } } void PlaylistProxyStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const { - if (element == QStyle::PE_PanelItemViewRow || element == QStyle::PE_PanelItemViewItem) + if (element == QStyle::PE_PanelItemViewRow || element == QStyle::PE_PanelItemViewItem) { common_style_->drawPrimitive(element, option, painter, widget); - else + } + else { QProxyStyle::drawPrimitive(element, option, painter, widget); + } } diff --git a/src/playlistparsers/playlistparser.cpp b/src/playlistparsers/playlistparser.cpp index 8daecbe51..f2c399ffa 100644 --- a/src/playlistparsers/playlistparser.cpp +++ b/src/playlistparsers/playlistparser.cpp @@ -44,8 +44,7 @@ const int PlaylistParser::kMagicSize = 512; -PlaylistParser::PlaylistParser(CollectionBackendInterface *collection, QObject *parent) - : QObject(parent) { +PlaylistParser::PlaylistParser(CollectionBackendInterface *collection, QObject *parent) : QObject(parent) { default_parser_ = new XSPFParser(collection, this); parsers_ << new M3UParser(collection, this); diff --git a/src/qobuz/qobuzbaserequest.cpp b/src/qobuz/qobuzbaserequest.cpp index 31b5f414a..3f631db92 100644 --- a/src/qobuz/qobuzbaserequest.cpp +++ b/src/qobuz/qobuzbaserequest.cpp @@ -41,11 +41,10 @@ #include "qobuzservice.h" #include "qobuzbaserequest.h" -QobuzBaseRequest::QobuzBaseRequest(QobuzService *service, NetworkAccessManager *network, QObject *parent) : - QObject(parent), +QobuzBaseRequest::QobuzBaseRequest(QobuzService *service, NetworkAccessManager *network, QObject *parent) + : QObject(parent), service_(service), - network_(network) - {} + network_(network) {} QobuzBaseRequest::~QobuzBaseRequest() = default; diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp index 5902d3563..2f5a9e4e7 100644 --- a/src/qobuz/qobuzrequest.cpp +++ b/src/qobuz/qobuzrequest.cpp @@ -630,7 +630,7 @@ void QobuzRequest::AlbumsReceived(QNetworkReply *reply, const QString &artist_id } else { album_id = QString::number(obj_item["id"].toInt()); - } + } if (album_songs_requests_pending_.contains(album_id)) continue; @@ -813,7 +813,7 @@ void QobuzRequest::SongsReceived(QNetworkReply *reply, const QString &artist_id_ } else { album_id = QString::number(json_obj["id"].toInt()); - } + } } if (json_obj.contains("title")) { @@ -1027,7 +1027,7 @@ QString QobuzRequest::ParseSong(Song &song, const QJsonObject &json_obj, QString } else { album_id = QString::number(obj_album["id"].toInt()); - } + } } if (obj_album.contains("title")) { diff --git a/src/qobuz/qobuzstreamurlrequest.cpp b/src/qobuz/qobuzstreamurlrequest.cpp index ffc99911c..191b461bd 100644 --- a/src/qobuz/qobuzstreamurlrequest.cpp +++ b/src/qobuz/qobuzstreamurlrequest.cpp @@ -47,13 +47,13 @@ QobuzStreamURLRequest::QobuzStreamURLRequest(QobuzService *service, NetworkAccessManager *network, const QUrl &original_url, const int id, QObject *parent) : QobuzBaseRequest(service, network, parent), - service_(service), - reply_(nullptr), - original_url_(original_url), - id_(id), - song_id_(original_url.path().toInt()), - tries_(0), - need_login_(false) {} + service_(service), + reply_(nullptr), + original_url_(original_url), + id_(id), + song_id_(original_url.path().toInt()), + tries_(0), + need_login_(false) {} QobuzStreamURLRequest::~QobuzStreamURLRequest() { diff --git a/src/qobuz/qobuzurlhandler.cpp b/src/qobuz/qobuzurlhandler.cpp index 47e422494..ced4e21f8 100644 --- a/src/qobuz/qobuzurlhandler.cpp +++ b/src/qobuz/qobuzurlhandler.cpp @@ -27,12 +27,11 @@ #include "qobuz/qobuzservice.h" #include "qobuzurlhandler.h" -QobuzUrlHandler::QobuzUrlHandler(Application *app, QobuzService *service) : - UrlHandler(service), - app_(app), - service_(service), - task_id_(-1) - { +QobuzUrlHandler::QobuzUrlHandler(Application *app, QobuzService *service) + : UrlHandler(service), + app_(app), + service_(service), + task_id_(-1) { QObject::connect(service, &QobuzService::StreamURLFinished, this, &QobuzUrlHandler::GetStreamURLFinished); diff --git a/src/radios/radioparadiseservice.cpp b/src/radios/radioparadiseservice.cpp index 5daad93ff..4e010bf1a 100644 --- a/src/radios/radioparadiseservice.cpp +++ b/src/radios/radioparadiseservice.cpp @@ -24,7 +24,8 @@ #include "radioparadiseservice.h" #include "radiochannel.h" -RadioParadiseService::RadioParadiseService(Application *app, NetworkAccessManager *network, QObject *parent) : RadioService(Song::Source_RadioParadise, "Radio Paradise", IconLoader::Load("radioparadise"), app, network, parent) {} +RadioParadiseService::RadioParadiseService(Application *app, NetworkAccessManager *network, QObject *parent) + : RadioService(Song::Source_RadioParadise, "Radio Paradise", IconLoader::Load("radioparadise"), app, network, parent) {} QUrl RadioParadiseService::Homepage() { return QUrl("https://radioparadise.com/"); } QUrl RadioParadiseService::Donate() { return QUrl("https://payments.radioparadise.com/rp2s-content.php?name=Support&file=support"); } diff --git a/src/radios/somafmservice.cpp b/src/radios/somafmservice.cpp index b0ef8ac3e..7ae89c79c 100644 --- a/src/radios/somafmservice.cpp +++ b/src/radios/somafmservice.cpp @@ -38,7 +38,8 @@ const char *SomaFMService::kApiChannelsUrl = "https://somafm.com/channels.json"; -SomaFMService::SomaFMService(Application *app, NetworkAccessManager *network, QObject *parent) : RadioService(Song::Source_SomaFM, "SomaFM", IconLoader::Load("somafm"), app, network, parent) {} +SomaFMService::SomaFMService(Application *app, NetworkAccessManager *network, QObject *parent) + : RadioService(Song::Source_SomaFM, "SomaFM", IconLoader::Load("somafm"), app, network, parent) {} SomaFMService::~SomaFMService() { Abort(); diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp index f99cf1c30..19d38bb93 100644 --- a/src/scrobbler/audioscrobbler.cpp +++ b/src/scrobbler/audioscrobbler.cpp @@ -41,18 +41,17 @@ # include "subsonicscrobbler.h" #endif -AudioScrobbler::AudioScrobbler(Application *app, QObject *parent) : - QObject(parent), - app_(app), - scrobbler_services_(new ScrobblerServices(this)), - enabled_(false), - offline_(false), - scrobble_button_(false), - love_button_(false), - submit_delay_(0), - prefer_albumartist_(false), - show_error_dialog_(false) - { +AudioScrobbler::AudioScrobbler(Application *app, QObject *parent) + : QObject(parent), + app_(app), + scrobbler_services_(new ScrobblerServices(this)), + enabled_(false), + offline_(false), + scrobble_button_(false), + love_button_(false), + submit_delay_(0), + prefer_albumartist_(false), + show_error_dialog_(false) { scrobbler_services_->AddService(new LastFMScrobbler(app_, scrobbler_services_)); scrobbler_services_->AddService(new LibreFMScrobbler(app_, scrobbler_services_)); diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp index 00b79ae38..42e2cf87b 100644 --- a/src/scrobbler/lastfmimport.cpp +++ b/src/scrobbler/lastfmimport.cpp @@ -50,16 +50,16 @@ const int LastFMImport::kRequestsDelay = 2000; -LastFMImport::LastFMImport(QObject *parent) : - QObject(parent), - network_(new NetworkAccessManager(this)), - timer_flush_requests_(new QTimer(this)), - lastplayed_(false), - playcount_(false), - playcount_total_(0), - lastplayed_total_(0), - playcount_received_(0), - lastplayed_received_(0) { +LastFMImport::LastFMImport(QObject *parent) + : QObject(parent), + network_(new NetworkAccessManager(this)), + timer_flush_requests_(new QTimer(this)), + lastplayed_(false), + playcount_(false), + playcount_total_(0), + lastplayed_total_(0), + playcount_received_(0), + lastplayed_received_(0) { timer_flush_requests_->setInterval(kRequestsDelay); timer_flush_requests_->setSingleShot(false); diff --git a/src/scrobbler/lastfmscrobbler.cpp b/src/scrobbler/lastfmscrobbler.cpp index 607eeab5a..806887a6d 100644 --- a/src/scrobbler/lastfmscrobbler.cpp +++ b/src/scrobbler/lastfmscrobbler.cpp @@ -34,16 +34,17 @@ const char *LastFMScrobbler::kAuthUrl = "https://www.last.fm/api/auth/"; const char *LastFMScrobbler::kApiUrl = "https://ws.audioscrobbler.com/2.0/"; const char *LastFMScrobbler::kCacheFile = "lastfmscrobbler.cache"; -LastFMScrobbler::LastFMScrobbler(Application *app, QObject *parent) : ScrobblingAPI20(kName, kSettingsGroup, kAuthUrl, kApiUrl, true, app, parent), - auth_url_(kAuthUrl), - api_url_(kApiUrl), - app_(app), - network_(new NetworkAccessManager(this)), - cache_(new ScrobblerCache(kCacheFile, this)), - enabled_(false), - subscriber_(false), - submitted_(false), - timestamp_(0) { +LastFMScrobbler::LastFMScrobbler(Application *app, QObject *parent) + : ScrobblingAPI20(kName, kSettingsGroup, kAuthUrl, kApiUrl, true, app, parent), + auth_url_(kAuthUrl), + api_url_(kApiUrl), + app_(app), + network_(new NetworkAccessManager(this)), + cache_(new ScrobblerCache(kCacheFile, this)), + enabled_(false), + subscriber_(false), + submitted_(false), + timestamp_(0) { ReloadSettings(); LoadSession(); diff --git a/src/scrobbler/librefmscrobbler.cpp b/src/scrobbler/librefmscrobbler.cpp index 74f55ecb5..6ed3ee225 100644 --- a/src/scrobbler/librefmscrobbler.cpp +++ b/src/scrobbler/librefmscrobbler.cpp @@ -34,16 +34,17 @@ const char *LibreFMScrobbler::kAuthUrl = "https://www.libre.fm/api/auth/"; const char *LibreFMScrobbler::kApiUrl = "https://libre.fm/2.0/"; const char *LibreFMScrobbler::kCacheFile = "librefmscrobbler.cache"; -LibreFMScrobbler::LibreFMScrobbler(Application *app, QObject *parent) : ScrobblingAPI20(kName, kSettingsGroup, kAuthUrl, kApiUrl, false, app, parent), - auth_url_(kAuthUrl), - api_url_(kApiUrl), - app_(app), - network_(new NetworkAccessManager(this)), - cache_(new ScrobblerCache(kCacheFile, this)), - enabled_(false), - subscriber_(false), - submitted_(false), - timestamp_(0) { +LibreFMScrobbler::LibreFMScrobbler(Application *app, QObject *parent) + : ScrobblingAPI20(kName, kSettingsGroup, kAuthUrl, kApiUrl, false, app, parent), + auth_url_(kAuthUrl), + api_url_(kApiUrl), + app_(app), + network_(new NetworkAccessManager(this)), + cache_(new ScrobblerCache(kCacheFile, this)), + enabled_(false), + subscriber_(false), + submitted_(false), + timestamp_(0) { ReloadSettings(); LoadSession(); diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp index f821e2738..296bf0578 100644 --- a/src/scrobbler/listenbrainzscrobbler.cpp +++ b/src/scrobbler/listenbrainzscrobbler.cpp @@ -62,17 +62,18 @@ const char *ListenBrainzScrobbler::kClientSecretB64 = "Uk9GZ2hrZVEzRjNvUHlFaHFpe const char *ListenBrainzScrobbler::kCacheFile = "listenbrainzscrobbler.cache"; const int ListenBrainzScrobbler::kScrobblesPerRequest = 10; -ListenBrainzScrobbler::ListenBrainzScrobbler(Application *app, QObject *parent) : ScrobblerService(kName, app, parent), - app_(app), - network_(new NetworkAccessManager(this)), - cache_(new ScrobblerCache(kCacheFile, this)), - server_(nullptr), - enabled_(false), - expires_in_(-1), - login_time_(0), - submitted_(false), - scrobbled_(false), - timestamp_(0) { +ListenBrainzScrobbler::ListenBrainzScrobbler(Application *app, QObject *parent) + : ScrobblerService(kName, app, parent), + app_(app), + network_(new NetworkAccessManager(this)), + cache_(new ScrobblerCache(kCacheFile, this)), + server_(nullptr), + enabled_(false), + expires_in_(-1), + login_time_(0), + submitted_(false), + scrobbled_(false), + timestamp_(0) { refresh_login_timer_.setSingleShot(true); QObject::connect(&refresh_login_timer_, &QTimer::timeout, this, &ListenBrainzScrobbler::RequestNewAccessToken); @@ -304,7 +305,7 @@ void ListenBrainzScrobbler::AuthenticateReplyFinished(QNetworkReply *reply) { AuthError("Json document from server was empty."); return; } - + if (json_obj.contains("error") && json_obj.contains("error_description")) { QString failure_reason = json_obj["error_description"].toString(); AuthError(failure_reason); @@ -412,7 +413,7 @@ QByteArray ListenBrainzScrobbler::GetReplyData(QNetworkReply *reply) { } return data; - + } void ListenBrainzScrobbler::UpdateNowPlaying(const Song &song) { diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp index f37ff46dc..a8849c147 100644 --- a/src/scrobbler/scrobblercache.cpp +++ b/src/scrobbler/scrobblercache.cpp @@ -46,11 +46,11 @@ using namespace std::chrono_literals; -ScrobblerCache::ScrobblerCache(const QString &filename, QObject *parent) : - QObject(parent), - timer_flush_(new QTimer(this)), - filename_(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/" + filename), - loaded_(false) { +ScrobblerCache::ScrobblerCache(const QString &filename, QObject *parent) + : QObject(parent), + timer_flush_(new QTimer(this)), + filename_(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/" + filename), + loaded_(false) { ReadCache(); loaded_ = true; diff --git a/src/scrobbler/scrobblercacheitem.cpp b/src/scrobbler/scrobblercacheitem.cpp index de255a038..39da62112 100644 --- a/src/scrobbler/scrobblercacheitem.cpp +++ b/src/scrobbler/scrobblercacheitem.cpp @@ -24,13 +24,13 @@ #include "scrobblercacheitem.h" -ScrobblerCacheItem::ScrobblerCacheItem(const QString &artist, const QString &album, const QString &song, const QString &albumartist, const int track, const qint64 duration, const quint64 timestamp, QObject *parent) : - QObject(parent), - artist_(artist), - album_(album), - song_(song), - albumartist_(albumartist), - track_(track), - duration_(duration), - timestamp_(timestamp), - sent_(false) {} +ScrobblerCacheItem::ScrobblerCacheItem(const QString &artist, const QString &album, const QString &song, const QString &albumartist, const int track, const qint64 duration, const quint64 timestamp, QObject *parent) + : QObject(parent), + artist_(artist), + album_(album), + song_(song), + albumartist_(albumartist), + track_(track), + duration_(duration), + timestamp_(timestamp), + sent_(false) {} diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index ffbcf64e9..44a74e1dc 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -64,22 +64,22 @@ const char *ScrobblingAPI20::kApiKey = "211990b4c96782c05d1536e7219eb56e"; const char *ScrobblingAPI20::kSecret = "80fd738f49596e9709b1bf9319c444a8"; const int ScrobblingAPI20::kScrobblesPerRequest = 50; -ScrobblingAPI20::ScrobblingAPI20(const QString &name, const QString &settings_group, const QString &auth_url, const QString &api_url, const bool batch, Application *app, QObject *parent) : - ScrobblerService(name, app, parent), - name_(name), - settings_group_(settings_group), - auth_url_(auth_url), - api_url_(api_url), - batch_(batch), - app_(app), - server_(nullptr), - enabled_(false), - https_(false), - prefer_albumartist_(false), - subscriber_(false), - submitted_(false), - scrobbled_(false), - timestamp_(0) { +ScrobblingAPI20::ScrobblingAPI20(const QString &name, const QString &settings_group, const QString &auth_url, const QString &api_url, const bool batch, Application *app, QObject *parent) + : ScrobblerService(name, app, parent), + name_(name), + settings_group_(settings_group), + auth_url_(auth_url), + api_url_(api_url), + batch_(batch), + app_(app), + server_(nullptr), + enabled_(false), + https_(false), + prefer_albumartist_(false), + subscriber_(false), + submitted_(false), + scrobbled_(false), + timestamp_(0) { timer_submit_.setSingleShot(true); QObject::connect(&timer_submit_, &QTimer::timeout, this, &ScrobblingAPI20::Submit); @@ -301,13 +301,13 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) { } return; } - + QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { AuthError("Json document from server was empty."); return; } - + if (json_obj.contains("error") && json_obj.contains("message")) { int error = json_obj["error"].toInt(); QString message = json_obj["message"].toString(); @@ -339,7 +339,7 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) { subscriber_ = json_obj["subscriber"].toBool(); username_ = json_obj["name"].toString(); session_key_ = json_obj["key"].toString(); - + QSettings s; s.beginGroup(settings_group_); s.setValue("subscriber", subscriber_); diff --git a/src/scrobbler/scrobblingapi20.h b/src/scrobbler/scrobblingapi20.h index 819577a14..6499ae683 100644 --- a/src/scrobbler/scrobblingapi20.h +++ b/src/scrobbler/scrobblingapi20.h @@ -52,7 +52,7 @@ class ScrobblingAPI20 : public ScrobblerService { void ReloadSettings() override; void LoadSession(); - + virtual NetworkAccessManager *network() const = 0; virtual ScrobblerCache *cache() const = 0; diff --git a/src/scrobbler/subsonicscrobbler.cpp b/src/scrobbler/subsonicscrobbler.cpp index 47f34872f..70227320a 100644 --- a/src/scrobbler/subsonicscrobbler.cpp +++ b/src/scrobbler/subsonicscrobbler.cpp @@ -41,11 +41,12 @@ const char *SubsonicScrobbler::kName = "Subsonic"; -SubsonicScrobbler::SubsonicScrobbler(Application *app, QObject *parent) : ScrobblerService(kName, app, parent), - app_(app), - service_(app->internet_services()->Service()), - enabled_(false), - submitted_(false) { +SubsonicScrobbler::SubsonicScrobbler(Application *app, QObject *parent) + : ScrobblerService(kName, app, parent), + app_(app), + service_(app->internet_services()->Service()), + enabled_(false), + submitted_(false) { timer_submit_.setSingleShot(true); QObject::connect(&timer_submit_, &QTimer::timeout, this, &SubsonicScrobbler::Submit); diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp index 3984a2261..bc251f474 100644 --- a/src/settings/backendsettingspage.cpp +++ b/src/settings/backendsettingspage.cpp @@ -64,12 +64,12 @@ const qint64 BackendSettingsPage::kDefaultBufferDuration = 4000; const double BackendSettingsPage::kDefaultBufferLowWatermark = 0.33; const double BackendSettingsPage::kDefaultBufferHighWatermark = 0.99; -BackendSettingsPage::BackendSettingsPage(SettingsDialog *dialog, QWidget *parent) : - SettingsPage(dialog, parent), - ui_(new Ui_BackendSettingsPage), - configloaded_(false), - engineloaded_(false), - enginetype_current_(Engine::None) { +BackendSettingsPage::BackendSettingsPage(SettingsDialog *dialog, QWidget *parent) + : SettingsPage(dialog, parent), + ui_(new Ui_BackendSettingsPage), + configloaded_(false), + engineloaded_(false), + enginetype_current_(Engine::None) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("soundcard")); diff --git a/src/settings/behavioursettingspage.cpp b/src/settings/behavioursettingspage.cpp index ed270367e..7a66505a3 100644 --- a/src/settings/behavioursettingspage.cpp +++ b/src/settings/behavioursettingspage.cpp @@ -58,7 +58,10 @@ bool LocaleAwareCompare(const QString &a, const QString &b) { } // namespace #endif -BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), ui_(new Ui_BehaviourSettingsPage), systemtray_available_(false) { +BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog, QWidget *parent) + : SettingsPage(dialog, parent), + ui_(new Ui_BehaviourSettingsPage), + systemtray_available_(false) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("strawberry")); diff --git a/src/settings/collectionsettingspage.cpp b/src/settings/collectionsettingspage.cpp index eed4efa69..76c8faddf 100644 --- a/src/settings/collectionsettingspage.cpp +++ b/src/settings/collectionsettingspage.cpp @@ -64,8 +64,7 @@ const int CollectionSettingsPage::kSettingsDiskCacheSizeDefault = 360; CollectionSettingsPage::CollectionSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), ui_(new Ui_CollectionSettingsPage), - initialized_model_(false) - { + initialized_model_(false) { ui_->setupUi(this); ui_->list->setItemDelegate(new NativeSeparatorsDelegate(this)); diff --git a/src/settings/contextsettingspage.cpp b/src/settings/contextsettingspage.cpp index d429d4979..6527c6b66 100644 --- a/src/settings/contextsettingspage.cpp +++ b/src/settings/contextsettingspage.cpp @@ -60,7 +60,9 @@ const char *ContextSettingsPage::kSettingsGroupEnable[ContextSettingsOrder::NELE const qreal ContextSettingsPage::kDefaultFontSizeHeadline = 11; -ContextSettingsPage::ContextSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), ui_(new Ui_ContextSettingsPage) { +ContextSettingsPage::ContextSettingsPage(SettingsDialog *dialog, QWidget *parent) + : SettingsPage(dialog, parent), + ui_(new Ui_ContextSettingsPage) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("view-choose")); diff --git a/src/settings/coverssettingspage.cpp b/src/settings/coverssettingspage.cpp index 44351c98e..1e3e96ca0 100644 --- a/src/settings/coverssettingspage.cpp +++ b/src/settings/coverssettingspage.cpp @@ -46,7 +46,10 @@ const char *CoversSettingsPage::kSettingsGroup = "Covers"; -CoversSettingsPage::CoversSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), ui_(new Ui::CoversSettingsPage), provider_selected_(false) { +CoversSettingsPage::CoversSettingsPage(SettingsDialog *dialog, QWidget *parent) + : SettingsPage(dialog, parent), + ui_(new Ui::CoversSettingsPage), + provider_selected_(false) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("cdcase")); diff --git a/src/settings/lyricssettingspage.cpp b/src/settings/lyricssettingspage.cpp index e66c0f1dd..b0a66d461 100644 --- a/src/settings/lyricssettingspage.cpp +++ b/src/settings/lyricssettingspage.cpp @@ -46,7 +46,10 @@ const char *LyricsSettingsPage::kSettingsGroup = "Lyrics"; -LyricsSettingsPage::LyricsSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), ui_(new Ui::LyricsSettingsPage), provider_selected_(false) { +LyricsSettingsPage::LyricsSettingsPage(SettingsDialog *dialog, QWidget *parent) + : SettingsPage(dialog, parent), + ui_(new Ui::LyricsSettingsPage), + provider_selected_(false) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("view-media-lyrics")); diff --git a/src/settings/moodbarsettingspage.cpp b/src/settings/moodbarsettingspage.cpp index aab9cc53f..03110fe14 100644 --- a/src/settings/moodbarsettingspage.cpp +++ b/src/settings/moodbarsettingspage.cpp @@ -52,14 +52,13 @@ const int MoodbarSettingsPage::kMoodbarPreviewHeight = 18; MoodbarSettingsPage::MoodbarSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), ui_(new Ui_MoodbarSettingsPage), - initialized_(false) - { + initialized_(false) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("moodbar")); MoodbarSettingsPage::Load(); - + } MoodbarSettingsPage::~MoodbarSettingsPage() { delete ui_; } diff --git a/src/settings/networkproxysettingspage.cpp b/src/settings/networkproxysettingspage.cpp index bf61933b7..20ebd6071 100644 --- a/src/settings/networkproxysettingspage.cpp +++ b/src/settings/networkproxysettingspage.cpp @@ -41,7 +41,8 @@ class SettingsDialog; const char *NetworkProxySettingsPage::kSettingsGroup = "NetworkProxy"; NetworkProxySettingsPage::NetworkProxySettingsPage(SettingsDialog *dialog, QWidget *parent) - : SettingsPage(dialog, parent), ui_(new Ui_NetworkProxySettingsPage) { + : SettingsPage(dialog, parent), + ui_(new Ui_NetworkProxySettingsPage) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("applications-internet")); diff --git a/src/settings/notificationssettingspage.cpp b/src/settings/notificationssettingspage.cpp index 93dd6c5b4..587119b62 100644 --- a/src/settings/notificationssettingspage.cpp +++ b/src/settings/notificationssettingspage.cpp @@ -58,7 +58,9 @@ class QHideEvent; class QShowEvent; NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog *dialog, QWidget *parent) - : SettingsPage(dialog, parent), ui_(new Ui_NotificationsSettingsPage), pretty_popup_(new OSDPretty(OSDPretty::Mode_Draggable)) { + : SettingsPage(dialog, parent), + ui_(new Ui_NotificationsSettingsPage), + pretty_popup_(new OSDPretty(OSDPretty::Mode_Draggable)) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("help-hint")); diff --git a/src/settings/playlistsettingspage.cpp b/src/settings/playlistsettingspage.cpp index 4cd26a17e..f04e058ca 100644 --- a/src/settings/playlistsettingspage.cpp +++ b/src/settings/playlistsettingspage.cpp @@ -36,7 +36,9 @@ class SettingsDialog; const char *PlaylistSettingsPage::kSettingsGroup = "Playlist"; -PlaylistSettingsPage::PlaylistSettingsPage(SettingsDialog *dialog, QWidget *parent) : SettingsPage(dialog, parent), ui_(new Ui_PlaylistSettingsPage) { +PlaylistSettingsPage::PlaylistSettingsPage(SettingsDialog *dialog, QWidget *parent) + : SettingsPage(dialog, parent), + ui_(new Ui_PlaylistSettingsPage) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("document-new")); diff --git a/src/settings/scrobblersettingspage.cpp b/src/settings/scrobblersettingspage.cpp index 9824c0c83..0086bf2e6 100644 --- a/src/settings/scrobblersettingspage.cpp +++ b/src/settings/scrobblersettingspage.cpp @@ -52,8 +52,7 @@ ScrobblerSettingsPage::ScrobblerSettingsPage(SettingsDialog *dialog, QWidget *pa ui_(new Ui_ScrobblerSettingsPage), lastfm_waiting_for_auth_(false), librefm_waiting_for_auth_(false), - listenbrainz_waiting_for_auth_(false) - { + listenbrainz_waiting_for_auth_(false) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("scrobble")); diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index c8abdb2ff..7697858d6 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -87,8 +87,7 @@ const char *SettingsDialog::kSettingsGroup = "SettingsDialog"; -SettingsItemDelegate::SettingsItemDelegate(QObject *parent) - : QStyledItemDelegate(parent) {} +SettingsItemDelegate::SettingsItemDelegate(QObject *parent) : QStyledItemDelegate(parent) {} QSize SettingsItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &idx) const { diff --git a/src/settings/settingspage.cpp b/src/settings/settingspage.cpp index 8dc4601a7..5b0172c17 100644 --- a/src/settings/settingspage.cpp +++ b/src/settings/settingspage.cpp @@ -34,7 +34,11 @@ #include "settingsdialog.h" #include "settingspage.h" -SettingsPage::SettingsPage(SettingsDialog *dialog, QWidget *parent) : QWidget(parent), dialog_(dialog), ui_widget_(nullptr), changed_(false) {} +SettingsPage::SettingsPage(SettingsDialog *dialog, QWidget *parent) + : QWidget(parent), + dialog_(dialog), + ui_widget_(nullptr), + changed_(false) {} void SettingsPage::Init(QWidget *ui_widget) { diff --git a/src/settings/transcodersettingspage.cpp b/src/settings/transcodersettingspage.cpp index 0623b7109..909493745 100644 --- a/src/settings/transcodersettingspage.cpp +++ b/src/settings/transcodersettingspage.cpp @@ -39,7 +39,8 @@ class SettingsDialog; TranscoderSettingsPage::TranscoderSettingsPage(SettingsDialog *dialog, QWidget *parent) - : SettingsPage(dialog, parent), ui_(new Ui_TranscoderSettingsPage) { + : SettingsPage(dialog, parent), + ui_(new Ui_TranscoderSettingsPage) { ui_->setupUi(this); setWindowIcon(IconLoader::Load("tools-wizard")); diff --git a/src/smartplaylists/playlistgeneratorinserter.cpp b/src/smartplaylists/playlistgeneratorinserter.cpp index 098434d35..dee4d07f0 100644 --- a/src/smartplaylists/playlistgeneratorinserter.cpp +++ b/src/smartplaylists/playlistgeneratorinserter.cpp @@ -44,8 +44,7 @@ PlaylistGeneratorInserter::PlaylistGeneratorInserter(TaskManager *task_manager, play_now_(false), enqueue_(false), enqueue_next_(false), - is_dynamic_(false) - {} + is_dynamic_(false) {} PlaylistItemList PlaylistGeneratorInserter::Generate(PlaylistGeneratorPtr generator, int dynamic_count) { diff --git a/src/smartplaylists/playlistquerygenerator.cpp b/src/smartplaylists/playlistquerygenerator.cpp index a3f3922f3..6e66f7bcf 100644 --- a/src/smartplaylists/playlistquerygenerator.cpp +++ b/src/smartplaylists/playlistquerygenerator.cpp @@ -32,7 +32,10 @@ PlaylistQueryGenerator::PlaylistQueryGenerator(QObject *parent) : PlaylistGenerator(parent), dynamic_(false), current_pos_(0) {} PlaylistQueryGenerator::PlaylistQueryGenerator(const QString &name, const SmartPlaylistSearch &search, const bool dynamic, QObject *parent) - : PlaylistGenerator(parent), search_(search), dynamic_(dynamic), current_pos_(0) { + : PlaylistGenerator(parent), + search_(search), + dynamic_(dynamic), + current_pos_(0) { set_name(name); diff --git a/src/smartplaylists/smartplaylistsviewcontainer.cpp b/src/smartplaylists/smartplaylistsviewcontainer.cpp index 006141c5f..2d7160402 100644 --- a/src/smartplaylists/smartplaylistsviewcontainer.cpp +++ b/src/smartplaylists/smartplaylistsviewcontainer.cpp @@ -44,19 +44,18 @@ SmartPlaylistsViewContainer::SmartPlaylistsViewContainer(Application *app, QWidget *parent) : QWidget(parent), - ui_(new Ui_SmartPlaylistsViewContainer), - app_(app), - context_menu_(new QMenu(this)), - context_menu_selected_(new QMenu(this)), - action_new_smart_playlist_(nullptr), - action_edit_smart_playlist_(nullptr), - action_delete_smart_playlist_(nullptr), - action_append_to_playlist_(nullptr), - action_replace_current_playlist_(nullptr), - action_open_in_new_playlist_(nullptr), - action_add_to_playlist_enqueue_(nullptr), - action_add_to_playlist_enqueue_next_(nullptr) - { + ui_(new Ui_SmartPlaylistsViewContainer), + app_(app), + context_menu_(new QMenu(this)), + context_menu_selected_(new QMenu(this)), + action_new_smart_playlist_(nullptr), + action_edit_smart_playlist_(nullptr), + action_delete_smart_playlist_(nullptr), + action_append_to_playlist_(nullptr), + action_replace_current_playlist_(nullptr), + action_open_in_new_playlist_(nullptr), + action_add_to_playlist_enqueue_(nullptr), + action_add_to_playlist_enqueue_next_(nullptr) { ui_->setupUi(this); @@ -244,7 +243,7 @@ void SmartPlaylistsViewContainer::DeleteSmartPlaylistFromContext() { } void SmartPlaylistsViewContainer::DeleteSmartPlaylistFromButton() { - + if (ui_->view->selectionModel()->selectedIndexes().count() == 0) return; DeleteSmartPlaylist(ui_->view->selectionModel()->selectedIndexes().first()); diff --git a/src/smartplaylists/smartplaylistwizardplugin.cpp b/src/smartplaylists/smartplaylistwizardplugin.cpp index f2c95cac5..272c89f53 100644 --- a/src/smartplaylists/smartplaylistwizardplugin.cpp +++ b/src/smartplaylists/smartplaylistwizardplugin.cpp @@ -25,7 +25,11 @@ #include "smartplaylistwizardplugin.h" -SmartPlaylistWizardPlugin::SmartPlaylistWizardPlugin(Application *app, CollectionBackend *collection, QObject *parent) : QObject(parent), app_(app), collection_(collection), start_page_(-1) {} +SmartPlaylistWizardPlugin::SmartPlaylistWizardPlugin(Application *app, CollectionBackend *collection, QObject *parent) + : QObject(parent), + app_(app), + collection_(collection), + start_page_(-1) {} void SmartPlaylistWizardPlugin::Init(QWizard *wizard, const int finish_page_id) { start_page_ = CreatePages(wizard, finish_page_id); diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp index 36731f619..758112878 100644 --- a/src/subsonic/subsonicbaserequest.cpp +++ b/src/subsonic/subsonicbaserequest.cpp @@ -42,8 +42,8 @@ #include "subsonicservice.h" #include "subsonicbaserequest.h" -SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *parent) : - QObject(parent), +SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *parent) + : QObject(parent), service_(service), network_(new QNetworkAccessManager) { diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp index ca8504d3c..575f409ca 100644 --- a/src/subsonic/subsonicrequest.cpp +++ b/src/subsonic/subsonicrequest.cpp @@ -71,8 +71,7 @@ SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *u album_covers_requests_active_(0), album_covers_requested_(0), album_covers_received_(0), - no_results_(false) - { + no_results_(false) { #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy); diff --git a/src/subsonic/subsonicscrobblerequest.cpp b/src/subsonic/subsonicscrobblerequest.cpp index 1853c9935..5729e820d 100644 --- a/src/subsonic/subsonicscrobblerequest.cpp +++ b/src/subsonic/subsonicscrobblerequest.cpp @@ -44,8 +44,7 @@ SubsonicScrobbleRequest::SubsonicScrobbleRequest(SubsonicService *service, Subso service_(service), url_handler_(url_handler), app_(app), - scrobble_requests_active_(0) - {} + scrobble_requests_active_(0) {} SubsonicScrobbleRequest::~SubsonicScrobbleRequest() { diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp index 55119713a..8a553081f 100644 --- a/src/tidal/tidalbaserequest.cpp +++ b/src/tidal/tidalbaserequest.cpp @@ -43,8 +43,7 @@ TidalBaseRequest::TidalBaseRequest(TidalService *service, NetworkAccessManager *network, QObject *parent) : QObject(parent), service_(service), - network_(network) - {} + network_(network) {} QNetworkReply *TidalBaseRequest::CreateRequest(const QString &ressource_name, const QList ¶ms_provided) { diff --git a/src/tidal/tidalfavoriterequest.cpp b/src/tidal/tidalfavoriterequest.cpp index 50e044633..5b472e78a 100644 --- a/src/tidal/tidalfavoriterequest.cpp +++ b/src/tidal/tidalfavoriterequest.cpp @@ -43,9 +43,9 @@ TidalFavoriteRequest::TidalFavoriteRequest(TidalService *service, NetworkAccessManager *network, QObject *parent) : TidalBaseRequest(service, network, parent), - service_(service), - network_(network), - need_login_(false) {} + service_(service), + network_(network), + need_login_(false) {} TidalFavoriteRequest::~TidalFavoriteRequest() { diff --git a/src/tidal/tidalstreamurlrequest.cpp b/src/tidal/tidalstreamurlrequest.cpp index 1a8e66f3c..05aea183a 100644 --- a/src/tidal/tidalstreamurlrequest.cpp +++ b/src/tidal/tidalstreamurlrequest.cpp @@ -48,13 +48,13 @@ TidalStreamURLRequest::TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &original_url, const int id, QObject *parent) : TidalBaseRequest(service, network, parent), - service_(service), - reply_(nullptr), - original_url_(original_url), - id_(id), - song_id_(original_url.path().toInt()), - tries_(0), - need_login_(false) {} + service_(service), + reply_(nullptr), + original_url_(original_url), + id_(id), + song_id_(original_url.path().toInt()), + tries_(0), + need_login_(false) {} TidalStreamURLRequest::~TidalStreamURLRequest() { diff --git a/src/tidal/tidalurlhandler.cpp b/src/tidal/tidalurlhandler.cpp index 55a04ca67..9afe7bf96 100644 --- a/src/tidal/tidalurlhandler.cpp +++ b/src/tidal/tidalurlhandler.cpp @@ -29,12 +29,11 @@ #include "tidal/tidalservice.h" #include "tidalurlhandler.h" -TidalUrlHandler::TidalUrlHandler(Application *app, TidalService *service) : - UrlHandler(service), - app_(app), - service_(service), - task_id_(-1) - { +TidalUrlHandler::TidalUrlHandler(Application *app, TidalService *service) + : UrlHandler(service), + app_(app), + service_(service), + task_id_(-1) { QObject::connect(service, &TidalService::StreamURLFinished, this, &TidalUrlHandler::GetStreamURLFinished); diff --git a/src/transcoder/transcoderoptionsasf.cpp b/src/transcoder/transcoderoptionsasf.cpp index d9b175cfe..debb868bd 100644 --- a/src/transcoder/transcoderoptionsasf.cpp +++ b/src/transcoder/transcoderoptionsasf.cpp @@ -33,8 +33,7 @@ const char *TranscoderOptionsASF::kSettingsGroup = "Transcoder/ffenc_wmav2"; -TranscoderOptionsASF::TranscoderOptionsASF(QWidget *parent) - : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsASF) { +TranscoderOptionsASF::TranscoderOptionsASF(QWidget *parent) : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsASF) { ui_->setupUi(this); } diff --git a/src/transcoder/transcoderoptionsdialog.cpp b/src/transcoder/transcoderoptionsdialog.cpp index dc15f8095..cd71b14af 100644 --- a/src/transcoder/transcoderoptionsdialog.cpp +++ b/src/transcoder/transcoderoptionsdialog.cpp @@ -42,8 +42,8 @@ TranscoderOptionsDialog::TranscoderOptionsDialog(Song::FileType type, QWidget *parent) : QDialog(parent), - ui_(new Ui_TranscoderOptionsDialog), - options_(nullptr) { + ui_(new Ui_TranscoderOptionsDialog), + options_(nullptr) { ui_->setupUi(this); diff --git a/src/transcoder/transcoderoptionsflac.cpp b/src/transcoder/transcoderoptionsflac.cpp index 2902ac0da..51856f538 100644 --- a/src/transcoder/transcoderoptionsflac.cpp +++ b/src/transcoder/transcoderoptionsflac.cpp @@ -33,8 +33,7 @@ const char *TranscoderOptionsFLAC::kSettingsGroup = "Transcoder/flacenc"; -TranscoderOptionsFLAC::TranscoderOptionsFLAC(QWidget *parent) - : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsFLAC) { +TranscoderOptionsFLAC::TranscoderOptionsFLAC(QWidget *parent) : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsFLAC) { ui_->setupUi(this); } diff --git a/src/transcoder/transcoderoptionsmp3.cpp b/src/transcoder/transcoderoptionsmp3.cpp index b83df1d95..328c2f673 100644 --- a/src/transcoder/transcoderoptionsmp3.cpp +++ b/src/transcoder/transcoderoptionsmp3.cpp @@ -36,8 +36,8 @@ const char *TranscoderOptionsMP3::kSettingsGroup = "Transcoder/lamemp3enc"; -TranscoderOptionsMP3::TranscoderOptionsMP3(QWidget *parent) - : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsMP3) { +TranscoderOptionsMP3::TranscoderOptionsMP3(QWidget *parent) : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsMP3) { + ui_->setupUi(this); QObject::connect(ui_->quality_slider, &QSlider::valueChanged, this, &TranscoderOptionsMP3::QualitySliderChanged); diff --git a/src/transcoder/transcoderoptionsspeex.cpp b/src/transcoder/transcoderoptionsspeex.cpp index 353224c71..534dfece7 100644 --- a/src/transcoder/transcoderoptionsspeex.cpp +++ b/src/transcoder/transcoderoptionsspeex.cpp @@ -36,8 +36,7 @@ const char *TranscoderOptionsSpeex::kSettingsGroup = "Transcoder/speexenc"; -TranscoderOptionsSpeex::TranscoderOptionsSpeex(QWidget *parent) - : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsSpeex) { +TranscoderOptionsSpeex::TranscoderOptionsSpeex(QWidget *parent) : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsSpeex) { ui_->setupUi(this); } diff --git a/src/transcoder/transcoderoptionsvorbis.cpp b/src/transcoder/transcoderoptionsvorbis.cpp index 3d5f581f1..ac09018a7 100644 --- a/src/transcoder/transcoderoptionsvorbis.cpp +++ b/src/transcoder/transcoderoptionsvorbis.cpp @@ -34,8 +34,7 @@ const char *TranscoderOptionsVorbis::kSettingsGroup = "Transcoder/vorbisenc"; -TranscoderOptionsVorbis::TranscoderOptionsVorbis(QWidget *parent) - : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsVorbis) { +TranscoderOptionsVorbis::TranscoderOptionsVorbis(QWidget *parent) : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsVorbis) { ui_->setupUi(this); } diff --git a/src/transcoder/transcoderoptionswavpack.cpp b/src/transcoder/transcoderoptionswavpack.cpp index de6f0583d..00a882979 100644 --- a/src/transcoder/transcoderoptionswavpack.cpp +++ b/src/transcoder/transcoderoptionswavpack.cpp @@ -29,8 +29,7 @@ const char *TranscoderOptionsWavPack::kSettingsGroup = "Transcoder/wavpackenc"; -TranscoderOptionsWavPack::TranscoderOptionsWavPack(QWidget *parent) - : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsWavPack) { +TranscoderOptionsWavPack::TranscoderOptionsWavPack(QWidget *parent) : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsWavPack) { ui_->setupUi(this); } diff --git a/src/widgets/autoexpandingtreeview.cpp b/src/widgets/autoexpandingtreeview.cpp index 64ba1554d..dab65cfa0 100644 --- a/src/widgets/autoexpandingtreeview.cpp +++ b/src/widgets/autoexpandingtreeview.cpp @@ -34,12 +34,11 @@ const int AutoExpandingTreeView::kRowsToShow = 50; AutoExpandingTreeView::AutoExpandingTreeView(QWidget *parent) - : QTreeView(parent), - auto_open_(false), - expand_on_reset_(false), - add_on_double_click_(true), - ignore_next_click_(false) - { + : QTreeView(parent), + auto_open_(false), + expand_on_reset_(false), + add_on_double_click_(true), + ignore_next_click_(false) { setExpandsOnDoubleClick(true); setAnimated(true); diff --git a/src/widgets/busyindicator.cpp b/src/widgets/busyindicator.cpp index cdbbedfa3..85463d8c3 100644 --- a/src/widgets/busyindicator.cpp +++ b/src/widgets/busyindicator.cpp @@ -33,9 +33,9 @@ class QHideEvent; class QShowEvent; BusyIndicator::BusyIndicator(const QString &text, QWidget *parent) - : QWidget(parent), - movie_(nullptr), - label_(nullptr) { + : QWidget(parent), + movie_(nullptr), + label_(nullptr) { Init(text); diff --git a/src/widgets/clickablelabel.cpp b/src/widgets/clickablelabel.cpp index 5446a622f..b8387127a 100644 --- a/src/widgets/clickablelabel.cpp +++ b/src/widgets/clickablelabel.cpp @@ -22,10 +22,7 @@ #include #include -ClickableLabel::ClickableLabel(QWidget *parent) - : QLabel(parent) -{ -} +ClickableLabel::ClickableLabel(QWidget *parent) : QLabel(parent){} void ClickableLabel::mousePressEvent(QMouseEvent *event) { emit Clicked(); diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp index 537f9f33a..72d180f44 100644 --- a/src/widgets/fancytabwidget.cpp +++ b/src/widgets/fancytabwidget.cpp @@ -441,7 +441,8 @@ class FancyTabWidgetProxyStyle : public QProxyStyle { // clazy:exclude=missing- QCommonStyle *common_style_; }; -FancyTabWidget::FancyTabWidget(QWidget *parent) : QTabWidget(parent), +FancyTabWidget::FancyTabWidget(QWidget *parent) + : QTabWidget(parent), style_(nullptr), menu_(nullptr), mode_(Mode_None), @@ -449,8 +450,7 @@ FancyTabWidget::FancyTabWidget(QWidget *parent) : QTabWidget(parent), bg_color_system_(true), bg_gradient_(true), iconsize_smallsidebar_(FancyTabWidget::IconSize_SmallSidebar), - iconsize_largesidebar_(FancyTabWidget::IconSize_LargeSidebar) - { + iconsize_largesidebar_(FancyTabWidget::IconSize_LargeSidebar) { FancyTabBar *tabBar = new FancyTabBar(this); setTabBar(tabBar); diff --git a/src/widgets/forcescrollperpixel.cpp b/src/widgets/forcescrollperpixel.cpp index 1db8d4aae..b6a22bcd3 100644 --- a/src/widgets/forcescrollperpixel.cpp +++ b/src/widgets/forcescrollperpixel.cpp @@ -27,12 +27,12 @@ #include "forcescrollperpixel.h" -ForceScrollPerPixel::ForceScrollPerPixel(QAbstractItemView *item_view, QObject *parent) - : QObject(parent), item_view_(item_view) { +ForceScrollPerPixel::ForceScrollPerPixel(QAbstractItemView *item_view, QObject *parent) : QObject(parent), item_view_(item_view) { item_view_->installEventFilter(this); } bool ForceScrollPerPixel::eventFilter(QObject *object, QEvent *event) { + if (object == item_view_ && event->type() != QEvent::Destroy && event->type() != QEvent::WinIdChange) { //event->type() != QEvent::AccessibilityPrepare) item_view_->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); @@ -40,4 +40,5 @@ bool ForceScrollPerPixel::eventFilter(QObject *object, QEvent *event) { } return QObject::eventFilter(object, event); + } diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp index 41ad1efeb..1de5237ae 100644 --- a/src/widgets/freespacebar.cpp +++ b/src/widgets/freespacebar.cpp @@ -66,9 +66,10 @@ FreeSpaceBar::FreeSpaceBar(QWidget *parent) total_(100), free_text_(tr("Available")), additional_text_(tr("New songs")), - used_text_(tr("Used")) -{ + used_text_(tr("Used")) { + setMinimumHeight(FreeSpaceBar::sizeHint().height()); + } QSize FreeSpaceBar::sizeHint() const { diff --git a/src/widgets/groupediconview.cpp b/src/widgets/groupediconview.cpp index e40e6ea43..a1b1f7700 100644 --- a/src/widgets/groupediconview.cpp +++ b/src/widgets/groupediconview.cpp @@ -61,8 +61,8 @@ GroupedIconView::GroupedIconView(QWidget *parent) header_spacing_(10), header_indent_(5), item_indent_(10), - header_text_("%1") -{ + header_text_("%1") { + setFlow(LeftToRight); setViewMode(IconMode); setResizeMode(Adjust); diff --git a/src/widgets/linetextedit.cpp b/src/widgets/linetextedit.cpp index c1089dd3b..f74053dff 100644 --- a/src/widgets/linetextedit.cpp +++ b/src/widgets/linetextedit.cpp @@ -31,8 +31,7 @@ #include "linetextedit.h" -LineTextEdit::LineTextEdit(QWidget *parent) - : QTextEdit(parent) { +LineTextEdit::LineTextEdit(QWidget *parent) : QTextEdit(parent) { setWordWrapMode(QTextOption::NoWrap); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); diff --git a/src/widgets/loginstatewidget.cpp b/src/widgets/loginstatewidget.cpp index 6697ab1b4..5538217c7 100644 --- a/src/widgets/loginstatewidget.cpp +++ b/src/widgets/loginstatewidget.cpp @@ -34,7 +34,9 @@ #include LoginStateWidget::LoginStateWidget(QWidget *parent) - : QWidget(parent), ui_(new Ui_LoginStateWidget), state_(LoggedOut) { + : QWidget(parent), + ui_(new Ui_LoginStateWidget), + state_(LoggedOut) { ui_->setupUi(this); ui_->signed_in->hide(); diff --git a/src/widgets/multiloadingindicator.cpp b/src/widgets/multiloadingindicator.cpp index 9b1784023..208b91db6 100644 --- a/src/widgets/multiloadingindicator.cpp +++ b/src/widgets/multiloadingindicator.cpp @@ -42,9 +42,9 @@ const int MultiLoadingIndicator::kHorizontalPadding = 6; const int MultiLoadingIndicator::kSpacing = 6; MultiLoadingIndicator::MultiLoadingIndicator(QWidget *parent) - : QWidget(parent), - task_manager_(nullptr), - spinner_(new BusyIndicator(this)) { + : QWidget(parent), + task_manager_(nullptr), + spinner_(new BusyIndicator(this)) { spinner_->move(kHorizontalPadding, kVerticalPadding); setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); diff --git a/src/widgets/renametablineedit.cpp b/src/widgets/renametablineedit.cpp index ceb0f652f..8b1ec377b 100644 --- a/src/widgets/renametablineedit.cpp +++ b/src/widgets/renametablineedit.cpp @@ -28,8 +28,7 @@ #include "renametablineedit.h" -RenameTabLineEdit::RenameTabLineEdit(QWidget *parent) : - QLineEdit(parent) {} +RenameTabLineEdit::RenameTabLineEdit(QWidget *parent) : QLineEdit(parent) {} void RenameTabLineEdit::keyPressEvent(QKeyEvent *e) { diff --git a/src/widgets/stickyslider.cpp b/src/widgets/stickyslider.cpp index bddb3932b..0b365abbc 100644 --- a/src/widgets/stickyslider.cpp +++ b/src/widgets/stickyslider.cpp @@ -27,11 +27,9 @@ #include "stickyslider.h" StickySlider::StickySlider(QWidget *parent) - : QSlider(parent), - sticky_center_(-1), - sticky_threshold_(10) -{ -} + : QSlider(parent), + sticky_center_(-1), + sticky_threshold_(10) {} void StickySlider::mouseMoveEvent(QMouseEvent *e) { diff --git a/src/widgets/stretchheaderview.cpp b/src/widgets/stretchheaderview.cpp index f06b819c9..2eb2c1996 100644 --- a/src/widgets/stretchheaderview.cpp +++ b/src/widgets/stretchheaderview.cpp @@ -44,7 +44,7 @@ const int StretchHeaderView::kMagicNumber = 0x502c950f; StretchHeaderView::StretchHeaderView(const Qt::Orientation orientation, QWidget *parent) : QHeaderView(orientation, parent), stretch_enabled_(false), - in_mouse_move_event_(false) { + in_mouse_move_event_(false) { QObject::connect(this, &StretchHeaderView::sectionResized, this, &StretchHeaderView::SectionResized); setMinimumSectionSize(kMinimumColumnWidth); diff --git a/src/widgets/tracksliderpopup.cpp b/src/widgets/tracksliderpopup.cpp index e47645a36..af7b00140 100644 --- a/src/widgets/tracksliderpopup.cpp +++ b/src/widgets/tracksliderpopup.cpp @@ -48,7 +48,7 @@ const qreal TrackSliderPopup::kBlurRadius = 20.0; TrackSliderPopup::TrackSliderPopup(QWidget *parent) : QWidget(parent), font_metrics_(fontMetrics()), - small_font_metrics_(fontMetrics()) { + small_font_metrics_(fontMetrics()) { setAttribute(Qt::WA_TransparentForMouseEvents); setMouseTracking(true); diff --git a/src/widgets/volumeslider.cpp b/src/widgets/volumeslider.cpp index 5f48181ed..acbbf6fc2 100644 --- a/src/widgets/volumeslider.cpp +++ b/src/widgets/volumeslider.cpp @@ -53,7 +53,9 @@ SliderSlider::SliderSlider(const Qt::Orientation orientation, QWidget *parent, c sliding_(false), outside_(false), prev_value_(0) { + setRange(0, max); + } void SliderSlider::wheelEvent(QWheelEvent *e) {