From a2c7ff63dfc3ff9fdbe018dade51fce29c25e6b9 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 21 Jul 2023 05:11:27 +0200 Subject: [PATCH] Formatting --- src/collection/collectionviewcontainer.cpp | 3 +++ src/collection/collectionviewcontainer.h | 1 - src/context/contextview.h | 1 - src/covermanager/albumcoverfetcher.h | 1 - src/covermanager/coverprovider.h | 1 - src/covermanager/coversearchstatistics.h | 1 - src/covermanager/deezercoverprovider.h | 1 - src/covermanager/discogscoverprovider.h | 1 - src/covermanager/lastfmcoverprovider.h | 1 - src/covermanager/musicbrainzcoverprovider.h | 1 - src/covermanager/musixmatchcoverprovider.h | 1 - src/covermanager/qobuzcoverprovider.h | 1 - src/covermanager/spotifycoverprovider.h | 1 - src/covermanager/tidalcoverprovider.h | 1 - src/device/deviceinfo.h | 1 - src/device/devicemanager.h | 1 - src/device/giolister.cpp | 1 + src/device/gpodloader.h | 1 - src/device/mtploader.cpp | 1 - src/dialogs/addstreamdialog.h | 1 - src/dialogs/deleteconfirmationdialog.h | 1 - src/dialogs/snapdialog.h | 1 - src/engine/chromaprinter.h | 1 - src/engine/devicefinders.h | 1 - src/engine/directsounddevicefinder.h | 1 - src/engine/gstenginepipeline.cpp | 1 + src/engine/gststartup.h | 1 - src/engine/vlcengine.h | 1 - src/equalizer/equalizerslider.h | 1 - src/globalshortcuts/globalshortcut.h | 1 - src/globalshortcuts/globalshortcutsbackend-gnome.h | 1 - src/globalshortcuts/globalshortcutsbackend-mate.h | 1 - src/globalshortcuts/globalshortcutsbackend-win.h | 1 - src/globalshortcuts/globalshortcutsbackend-x11.h | 1 - src/globalshortcuts/globalshortcutsbackend.h | 1 - src/internet/internetcollectionview.h | 1 - src/internet/internetsearchitemdelegate.h | 1 - src/internet/internetsearchmodel.h | 1 - src/internet/internetsearchview.h | 1 - src/internet/internetservice.h | 1 - src/internet/internetservices.h | 1 - src/internet/internetsongsview.h | 1 - src/internet/internettabsview.h | 1 - src/internet/localredirectserver.h | 1 - src/lyrics/chartlyricsprovider.h | 1 - src/lyrics/geniuslyricsprovider.h | 1 - src/lyrics/lololyricsprovider.h | 1 - src/lyrics/lyricsfetcher.h | 1 - src/lyrics/lyricsfetchersearch.h | 1 - src/lyrics/musixmatchlyricsprovider.h | 1 - src/lyrics/ovhlyricsprovider.h | 1 - src/musicbrainz/acoustidclient.h | 1 - src/organize/organizedialog.h | 1 - src/organize/organizeformat.h | 1 - src/osd/osdbase.h | 1 - src/osd/osddbus.h | 1 - src/osd/osdpretty.h | 1 - src/playlist/playlist.h | 1 - src/playlist/playlistview.h | 1 - src/qobuz/qobuzfavoriterequest.h | 1 - src/qobuz/qobuzrequest.h | 1 - src/qobuz/qobuzservice.h | 1 - src/qobuz/qobuzstreamurlrequest.h | 1 - src/qobuz/qobuzurlhandler.h | 1 - src/queue/queue.h | 1 - src/radios/radioparadiseservice.h | 1 - src/radios/radioservice.h | 1 - src/scrobbler/lastfmimport.h | 1 - src/scrobbler/lastfmscrobbler.h | 1 - src/scrobbler/librefmscrobbler.h | 1 - src/scrobbler/listenbrainzscrobbler.h | 1 - src/scrobbler/scrobblercache.h | 1 - src/scrobbler/scrobblerservice.h | 1 - src/scrobbler/scrobblingapi20.h | 1 - src/scrobbler/subsonicscrobbler.h | 1 - src/settings/appearancesettingspage.h | 1 - src/settings/backendsettingspage.h | 1 - src/settings/behavioursettingspage.h | 1 - src/settings/globalshortcutssettingspage.h | 1 - src/settings/playlistsettingspage.h | 1 - src/settings/scrobblersettingspage.h | 1 - src/settings/settingsdialog.h | 1 - src/smartplaylists/playlistgenerator.h | 1 - src/smartplaylists/playlistquerygenerator.h | 1 - src/smartplaylists/smartplaylistsearch.h | 1 - src/smartplaylists/smartplaylistsearchpreview.h | 1 - src/smartplaylists/smartplaylistsearchterm.h | 1 - 87 files changed, 5 insertions(+), 84 deletions(-) diff --git a/src/collection/collectionviewcontainer.cpp b/src/collection/collectionviewcontainer.cpp index 8b8107a9c..8b9a8e134 100644 --- a/src/collection/collectionviewcontainer.cpp +++ b/src/collection/collectionviewcontainer.cpp @@ -44,8 +44,11 @@ CollectionViewContainer::CollectionViewContainer(QWidget *parent) : QWidget(pare } CollectionViewContainer::~CollectionViewContainer() { delete ui_; } + CollectionView *CollectionViewContainer::view() const { return ui_->view; } + CollectionFilterWidget *CollectionViewContainer::filter_widget() const { return ui_->filter; } + void CollectionViewContainer::ReloadSettings() const { filter_widget()->ReloadSettings(); view()->ReloadSettings(); diff --git a/src/collection/collectionviewcontainer.h b/src/collection/collectionviewcontainer.h index c92ef9a3f..7230cc5f9 100644 --- a/src/collection/collectionviewcontainer.h +++ b/src/collection/collectionviewcontainer.h @@ -48,4 +48,3 @@ class CollectionViewContainer : public QWidget { }; #endif // COLLECTIONVIEWCONTAINER_H - diff --git a/src/context/contextview.h b/src/context/contextview.h index de5a1bff1..afea0d9f0 100644 --- a/src/context/contextview.h +++ b/src/context/contextview.h @@ -166,7 +166,6 @@ class ContextView : public QWidget { QList textedit_play_; QList labels_play_data_; QList labels_play_all_; - }; #endif // CONTEXTVIEW_H diff --git a/src/covermanager/albumcoverfetcher.h b/src/covermanager/albumcoverfetcher.h index 4e4b1e4e3..ab5153614 100644 --- a/src/covermanager/albumcoverfetcher.h +++ b/src/covermanager/albumcoverfetcher.h @@ -137,7 +137,6 @@ class AlbumCoverFetcher : public QObject { QHash active_requests_; QTimer *request_starter_; - }; #endif // ALBUMCOVERFETCHER_H diff --git a/src/covermanager/coverprovider.h b/src/covermanager/coverprovider.h index 187ae400f..2438c2111 100644 --- a/src/covermanager/coverprovider.h +++ b/src/covermanager/coverprovider.h @@ -87,7 +87,6 @@ class CoverProvider : public QObject { float quality_; bool batch_; bool allow_missing_album_; - }; #endif // COVERPROVIDER_H diff --git a/src/covermanager/coversearchstatistics.h b/src/covermanager/coversearchstatistics.h index 0fa0875b9..b655f8849 100644 --- a/src/covermanager/coversearchstatistics.h +++ b/src/covermanager/coversearchstatistics.h @@ -46,7 +46,6 @@ struct CoverSearchStatistics { quint64 chosen_height_; QString AverageDimensions() const; - }; #endif // COVERSEARCHSTATISTICS_H diff --git a/src/covermanager/deezercoverprovider.h b/src/covermanager/deezercoverprovider.h index ab85b0645..db03b9cda 100644 --- a/src/covermanager/deezercoverprovider.h +++ b/src/covermanager/deezercoverprovider.h @@ -59,7 +59,6 @@ class DeezerCoverProvider : public JsonCoverProvider { static const int kLimit; QList replies_; - }; #endif // DEEZERCOVERPROVIDER_H diff --git a/src/covermanager/discogscoverprovider.h b/src/covermanager/discogscoverprovider.h index a1d2597c8..ef22f1b64 100644 --- a/src/covermanager/discogscoverprovider.h +++ b/src/covermanager/discogscoverprovider.h @@ -101,7 +101,6 @@ class DiscogsCoverProvider : public JsonCoverProvider { QQueue queue_release_requests_; QMap> requests_search_; QList replies_; - }; Q_DECLARE_METATYPE(DiscogsCoverProvider::DiscogsCoverSearchContext) diff --git a/src/covermanager/lastfmcoverprovider.h b/src/covermanager/lastfmcoverprovider.h index c94f581b1..2bcee60c2 100644 --- a/src/covermanager/lastfmcoverprovider.h +++ b/src/covermanager/lastfmcoverprovider.h @@ -66,7 +66,6 @@ class LastFmCoverProvider : public JsonCoverProvider { static const char *kSecret; QList replies_; - }; #endif // LASTFMCOVERPROVIDER_H diff --git a/src/covermanager/musicbrainzcoverprovider.h b/src/covermanager/musicbrainzcoverprovider.h index 659d55084..64c5f7545 100644 --- a/src/covermanager/musicbrainzcoverprovider.h +++ b/src/covermanager/musicbrainzcoverprovider.h @@ -71,7 +71,6 @@ class MusicbrainzCoverProvider : public JsonCoverProvider { QTimer *timer_flush_requests_; QQueue queue_search_requests_; QList replies_; - }; #endif // MUSICBRAINZCOVERPROVIDER_H diff --git a/src/covermanager/musixmatchcoverprovider.h b/src/covermanager/musixmatchcoverprovider.h index 827a9f8e7..45609bb67 100644 --- a/src/covermanager/musixmatchcoverprovider.h +++ b/src/covermanager/musixmatchcoverprovider.h @@ -52,7 +52,6 @@ class MusixmatchCoverProvider : public JsonCoverProvider, MusixmatchProvider { private: QList replies_; - }; #endif // MUSIXMATCHCOVERPROVIDER_H diff --git a/src/covermanager/qobuzcoverprovider.h b/src/covermanager/qobuzcoverprovider.h index cf05ff313..88c9d03ee 100644 --- a/src/covermanager/qobuzcoverprovider.h +++ b/src/covermanager/qobuzcoverprovider.h @@ -63,7 +63,6 @@ class QobuzCoverProvider : public JsonCoverProvider { QobuzService *service_; QList replies_; - }; #endif // QOBUZCOVERPROVIDER_H diff --git a/src/covermanager/spotifycoverprovider.h b/src/covermanager/spotifycoverprovider.h index c2e3a37ff..73fb26ce1 100644 --- a/src/covermanager/spotifycoverprovider.h +++ b/src/covermanager/spotifycoverprovider.h @@ -88,7 +88,6 @@ class SpotifyCoverProvider : public JsonCoverProvider { quint64 login_time_; QTimer refresh_login_timer_; QList replies_; - }; #endif // SPOTIFYCOVERPROVIDER_H diff --git a/src/covermanager/tidalcoverprovider.h b/src/covermanager/tidalcoverprovider.h index 3fda6d400..8ae367083 100644 --- a/src/covermanager/tidalcoverprovider.h +++ b/src/covermanager/tidalcoverprovider.h @@ -66,7 +66,6 @@ class TidalCoverProvider : public JsonCoverProvider { TidalService *service_; QList replies_; - }; #endif // TIDALCOVERPROVIDER_H diff --git a/src/device/deviceinfo.h b/src/device/deviceinfo.h index d243452da..cbabb3b86 100644 --- a/src/device/deviceinfo.h +++ b/src/device/deviceinfo.h @@ -120,7 +120,6 @@ class DeviceInfo : public SimpleTreeItem { bool forget_; Q_DISABLE_COPY(DeviceInfo) - }; #endif // DEVICEINFO_H diff --git a/src/device/devicemanager.h b/src/device/devicemanager.h index c16345386..22ef84315 100644 --- a/src/device/devicemanager.h +++ b/src/device/devicemanager.h @@ -170,7 +170,6 @@ class DeviceManager : public SimpleTreeModel { QThreadPool thread_pool_; QList wait_for_exit_; - }; template diff --git a/src/device/giolister.cpp b/src/device/giolister.cpp index bfcd9d4cb..910e6d2b9 100644 --- a/src/device/giolister.cpp +++ b/src/device/giolister.cpp @@ -22,6 +22,7 @@ #include "config.h" #include + #include #include #include diff --git a/src/device/gpodloader.h b/src/device/gpodloader.h index 96508a5ca..704529536 100644 --- a/src/device/gpodloader.h +++ b/src/device/gpodloader.h @@ -70,7 +70,6 @@ class GPodLoader : public QObject { TaskManager *task_manager_; CollectionBackend *backend_; bool abort_; - }; #endif // GPODLOADER_H diff --git a/src/device/mtploader.cpp b/src/device/mtploader.cpp index 7a358538e..5a069c7a8 100644 --- a/src/device/mtploader.cpp +++ b/src/device/mtploader.cpp @@ -102,4 +102,3 @@ bool MtpLoader::TryLoad() { return !abort_; } - diff --git a/src/dialogs/addstreamdialog.h b/src/dialogs/addstreamdialog.h index 1a991d8fa..38224a439 100644 --- a/src/dialogs/addstreamdialog.h +++ b/src/dialogs/addstreamdialog.h @@ -45,7 +45,6 @@ class AddStreamDialog : public QDialog { private: Ui_AddStreamDialog *ui_; - }; #endif // ADDSTREAMDIALOG_H diff --git a/src/dialogs/deleteconfirmationdialog.h b/src/dialogs/deleteconfirmationdialog.h index 24402f6d9..efc7a3154 100644 --- a/src/dialogs/deleteconfirmationdialog.h +++ b/src/dialogs/deleteconfirmationdialog.h @@ -37,7 +37,6 @@ class DeleteConfirmationDialog : public QDialog { private: QDialogButtonBox *button_box_; - }; #endif // DELETECONFIRMATIONDIALOG_H diff --git a/src/dialogs/snapdialog.h b/src/dialogs/snapdialog.h index 44bc9acb4..0497cbc2d 100644 --- a/src/dialogs/snapdialog.h +++ b/src/dialogs/snapdialog.h @@ -27,7 +27,6 @@ class SnapDialog : public MessageDialog { public: explicit SnapDialog(QWidget *parent = nullptr); - }; #endif // SNAPDIALOG_H diff --git a/src/engine/chromaprinter.h b/src/engine/chromaprinter.h index 5ebb0de0c..a2e8215de 100644 --- a/src/engine/chromaprinter.h +++ b/src/engine/chromaprinter.h @@ -58,7 +58,6 @@ class Chromaprinter { GstElement *convert_element_; QBuffer buffer_; - }; #endif // CHROMAPRINTER_H diff --git a/src/engine/devicefinders.h b/src/engine/devicefinders.h index bee366119..9f68a46f9 100644 --- a/src/engine/devicefinders.h +++ b/src/engine/devicefinders.h @@ -40,7 +40,6 @@ class DeviceFinders : public QObject { private: QList device_finders_; - }; #endif // DEVICEFINDERS_H diff --git a/src/engine/directsounddevicefinder.h b/src/engine/directsounddevicefinder.h index 6c58a8a40..26fa20441 100644 --- a/src/engine/directsounddevicefinder.h +++ b/src/engine/directsounddevicefinder.h @@ -42,7 +42,6 @@ class DirectSoundDeviceFinder : public DeviceFinder { }; static BOOL CALLBACK EnumerateCallback(LPGUID guid, LPCSTR description, LPCSTR module, LPVOID state_voidptr); - }; #endif // DIRECTSOUNDDEVICEFINDER_H diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index 54b8913c9..83a30ce4b 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -25,6 +25,7 @@ #include #include #include + #include #include #include diff --git a/src/engine/gststartup.h b/src/engine/gststartup.h index ac0fd36a2..2a85dd72f 100644 --- a/src/engine/gststartup.h +++ b/src/engine/gststartup.h @@ -46,7 +46,6 @@ class GstStartup : public QObject { static void SetEnvironment(); QFuture initializing_; - }; #endif // GSTSTARTUP_H diff --git a/src/engine/vlcengine.h b/src/engine/vlcengine.h index 41afbf7d6..20d06a64a 100644 --- a/src/engine/vlcengine.h +++ b/src/engine/vlcengine.h @@ -80,7 +80,6 @@ class VLCEngine : public EngineBase { static void StateChangedCallback(const libvlc_event_t *e, void *data); void GetDevicesList(const QString &output) const; - }; #endif // VLCENGINE_H diff --git a/src/equalizer/equalizerslider.h b/src/equalizer/equalizerslider.h index 68169bfea..b359bad49 100644 --- a/src/equalizer/equalizerslider.h +++ b/src/equalizer/equalizerslider.h @@ -48,7 +48,6 @@ class EqualizerSlider : public QWidget { private: Ui_EqualizerSlider *ui_; - }; #endif // EQUALISERSLIDER_H diff --git a/src/globalshortcuts/globalshortcut.h b/src/globalshortcuts/globalshortcut.h index f1c175992..ddb413122 100644 --- a/src/globalshortcuts/globalshortcut.h +++ b/src/globalshortcuts/globalshortcut.h @@ -79,7 +79,6 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter { int native_key_; int native_key2_; int native_mods_; - }; #endif // GLOBALSHORTCUT_H diff --git a/src/globalshortcuts/globalshortcutsbackend-gnome.h b/src/globalshortcuts/globalshortcutsbackend-gnome.h index eedd91e3e..b66e9a114 100644 --- a/src/globalshortcuts/globalshortcutsbackend-gnome.h +++ b/src/globalshortcuts/globalshortcutsbackend-gnome.h @@ -58,7 +58,6 @@ class GlobalShortcutsBackendGnome : public GlobalShortcutsBackend { OrgGnomeSettingsDaemonMediaKeysInterface *interface_; bool is_connected_; - }; #endif // GLOBALSHORTCUTSBACKEND_GNOME_H diff --git a/src/globalshortcuts/globalshortcutsbackend-mate.h b/src/globalshortcuts/globalshortcutsbackend-mate.h index a9abc301e..3e88c12f9 100644 --- a/src/globalshortcuts/globalshortcutsbackend-mate.h +++ b/src/globalshortcuts/globalshortcutsbackend-mate.h @@ -56,7 +56,6 @@ class GlobalShortcutsBackendMate : public GlobalShortcutsBackend { OrgMateSettingsDaemonMediaKeysInterface *interface_; bool is_connected_; - }; #endif // GLOBALSHORTCUTSBACKEND_Mate_H diff --git a/src/globalshortcuts/globalshortcutsbackend-win.h b/src/globalshortcuts/globalshortcutsbackend-win.h index a00a41ab2..634587461 100644 --- a/src/globalshortcuts/globalshortcutsbackend-win.h +++ b/src/globalshortcuts/globalshortcutsbackend-win.h @@ -51,7 +51,6 @@ class GlobalShortcutsBackendWin : public GlobalShortcutsBackend { QList shortcuts_; GlobalShortcut *gshortcut_init_; - }; #endif // GLOBALSHORTCUTSBACKEND_WIN_H diff --git a/src/globalshortcuts/globalshortcutsbackend-x11.h b/src/globalshortcuts/globalshortcutsbackend-x11.h index a2d1ce0cc..48d3d1ac5 100644 --- a/src/globalshortcuts/globalshortcutsbackend-x11.h +++ b/src/globalshortcuts/globalshortcutsbackend-x11.h @@ -52,7 +52,6 @@ class GlobalShortcutsBackendX11 : public GlobalShortcutsBackend { QList shortcuts_; GlobalShortcut *gshortcut_init_; - }; #endif // GLOBALSHORTCUTSBACKEND_X11_H diff --git a/src/globalshortcuts/globalshortcutsbackend.h b/src/globalshortcuts/globalshortcutsbackend.h index b644df645..f26305838 100644 --- a/src/globalshortcuts/globalshortcutsbackend.h +++ b/src/globalshortcuts/globalshortcutsbackend.h @@ -64,7 +64,6 @@ class GlobalShortcutsBackend : public QObject { GlobalShortcutsManager *manager_; Type type_; bool active_; - }; #endif // GLOBALSHORTCUTSBACKEND_H diff --git a/src/internet/internetcollectionview.h b/src/internet/internetcollectionview.h index 866b172f8..e0191df1f 100644 --- a/src/internet/internetcollectionview.h +++ b/src/internet/internetcollectionview.h @@ -136,7 +136,6 @@ class InternetCollectionView : public AutoExpandingTreeView { Song last_selected_song_; QString last_selected_container_; QSet last_selected_path_; - }; #endif // INTERNETCOLLECTIONVIEW_H diff --git a/src/internet/internetsearchitemdelegate.h b/src/internet/internetsearchitemdelegate.h index 114879f2d..148f324b1 100644 --- a/src/internet/internetsearchitemdelegate.h +++ b/src/internet/internetsearchitemdelegate.h @@ -40,7 +40,6 @@ class InternetSearchItemDelegate : public CollectionItemDelegate { private: InternetSearchView *view_; - }; #endif // INTERNETSEARCHITEMDELEGATE_H diff --git a/src/internet/internetsearchmodel.h b/src/internet/internetsearchmodel.h index 36dd8a7ed..bd56f9548 100644 --- a/src/internet/internetsearchmodel.h +++ b/src/internet/internetsearchmodel.h @@ -93,7 +93,6 @@ class InternetSearchModel : public QStandardItemModel { QPixmap no_cover_icon_; CollectionModel::Grouping group_by_; QMap containers_; - }; #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) diff --git a/src/internet/internetsearchview.h b/src/internet/internetsearchview.h index 034dd95ae..19dbdf549 100644 --- a/src/internet/internetsearchview.h +++ b/src/internet/internetsearchview.h @@ -215,7 +215,6 @@ class InternetSearchView : public QWidget { QMap pending_searches_; QMap> cover_loader_tasks_; - }; Q_DECLARE_METATYPE(InternetSearchView::Result) Q_DECLARE_METATYPE(InternetSearchView::ResultList) diff --git a/src/internet/internetservice.h b/src/internet/internetservice.h index f004958bf..5c841d704 100644 --- a/src/internet/internetservice.h +++ b/src/internet/internetservice.h @@ -141,7 +141,6 @@ class InternetService : public QObject { QString url_scheme_; QString settings_group_; SettingsDialog::Page settings_page_; - }; Q_DECLARE_METATYPE(InternetService*) diff --git a/src/internet/internetservices.h b/src/internet/internetservices.h index cbabca991..44b8cbccc 100644 --- a/src/internet/internetservices.h +++ b/src/internet/internetservices.h @@ -60,7 +60,6 @@ class InternetServices : public QObject { private: QMap services_; QList wait_for_exit_; - }; #endif // INTERNETSERVICES_H diff --git a/src/internet/internetsongsview.h b/src/internet/internetsongsview.h index 8dc262c3c..38d06e334 100644 --- a/src/internet/internetsongsview.h +++ b/src/internet/internetsongsview.h @@ -63,7 +63,6 @@ class InternetSongsView : public QWidget { QString settings_group_; SettingsDialog::Page settings_page_; Ui_InternetCollectionViewContainer *ui_; - }; #endif // INTERNETSONGSVIEW_H diff --git a/src/internet/internettabsview.h b/src/internet/internettabsview.h index c5c3daab2..57e79d5ad 100644 --- a/src/internet/internettabsview.h +++ b/src/internet/internettabsview.h @@ -74,7 +74,6 @@ class InternetTabsView : public QWidget { QString settings_group_; SettingsDialog::Page settings_page_; Ui_InternetTabsView *ui_; - }; #endif // INTERNETTABSVIEW_H diff --git a/src/internet/localredirectserver.h b/src/internet/localredirectserver.h index 95cdbf89f..7f075ca91 100644 --- a/src/internet/localredirectserver.h +++ b/src/internet/localredirectserver.h @@ -69,7 +69,6 @@ class LocalRedirectServer : public QTcpServer { QAbstractSocket *socket_; QByteArray buffer_; QString error_; - }; #endif // LOCALREDIRECTSERVER_H diff --git a/src/lyrics/chartlyricsprovider.h b/src/lyrics/chartlyricsprovider.h index 4fdbf3a10..9e24ad6ec 100644 --- a/src/lyrics/chartlyricsprovider.h +++ b/src/lyrics/chartlyricsprovider.h @@ -52,7 +52,6 @@ class ChartLyricsProvider : public LyricsProvider { private: static const char *kUrlSearch; QList replies_; - }; #endif // CHARTLYRICSPROVIDER_H diff --git a/src/lyrics/geniuslyricsprovider.h b/src/lyrics/geniuslyricsprovider.h index 63b078f03..f8505809f 100644 --- a/src/lyrics/geniuslyricsprovider.h +++ b/src/lyrics/geniuslyricsprovider.h @@ -104,7 +104,6 @@ class GeniusLyricsProvider : public JsonLyricsProvider { QStringList login_errors_; QMap> requests_search_; QList replies_; - }; #endif // GENIUSLYRICSPROVIDER_H diff --git a/src/lyrics/lololyricsprovider.h b/src/lyrics/lololyricsprovider.h index 34ace9911..755f93595 100644 --- a/src/lyrics/lololyricsprovider.h +++ b/src/lyrics/lololyricsprovider.h @@ -53,7 +53,6 @@ class LoloLyricsProvider : public LyricsProvider { private: static const char *kUrlSearch; QList replies_; - }; #endif // LOLOLYRICSPROVIDER_H diff --git a/src/lyrics/lyricsfetcher.h b/src/lyrics/lyricsfetcher.h index 098c6f5d4..4ad1b6409 100644 --- a/src/lyrics/lyricsfetcher.h +++ b/src/lyrics/lyricsfetcher.h @@ -77,7 +77,6 @@ class LyricsFetcher : public QObject { QHash active_requests_; QTimer *request_starter_; - }; #endif // LYRICSFETCHER_H diff --git a/src/lyrics/lyricsfetchersearch.h b/src/lyrics/lyricsfetchersearch.h index 73d611e57..0f2619c2a 100644 --- a/src/lyrics/lyricsfetchersearch.h +++ b/src/lyrics/lyricsfetchersearch.h @@ -66,7 +66,6 @@ class LyricsFetcherSearch : public QObject { LyricsSearchResults results_; QMap pending_requests_; bool cancel_requested_; - }; #endif // LYRICSFETCHERSEARCH_H diff --git a/src/lyrics/musixmatchlyricsprovider.h b/src/lyrics/musixmatchlyricsprovider.h index c3abd9ac6..79bb69d44 100644 --- a/src/lyrics/musixmatchlyricsprovider.h +++ b/src/lyrics/musixmatchlyricsprovider.h @@ -75,7 +75,6 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider, public MusixmatchPro QList requests_search_; QList replies_; bool use_api_; - }; #endif // MUSIXMATCHLYRICSPROVIDER_H diff --git a/src/lyrics/ovhlyricsprovider.h b/src/lyrics/ovhlyricsprovider.h index e5de0ead5..114957cb1 100644 --- a/src/lyrics/ovhlyricsprovider.h +++ b/src/lyrics/ovhlyricsprovider.h @@ -53,7 +53,6 @@ class OVHLyricsProvider : public JsonLyricsProvider { private: static const char *kUrlSearch; QList replies_; - }; #endif // OVHLYRICSPROVIDER_H diff --git a/src/musicbrainz/acoustidclient.h b/src/musicbrainz/acoustidclient.h index 86a345d49..7e6670af9 100644 --- a/src/musicbrainz/acoustidclient.h +++ b/src/musicbrainz/acoustidclient.h @@ -72,7 +72,6 @@ class AcoustidClient : public QObject { NetworkAccessManager *network_; NetworkTimeouts *timeouts_; QMap requests_; - }; #endif // ACOUSTIDCLIENT_H diff --git a/src/organize/organizedialog.h b/src/organize/organizedialog.h index fcbb0b3a6..7480c5d10 100644 --- a/src/organize/organizedialog.h +++ b/src/organize/organizedialog.h @@ -124,7 +124,6 @@ class OrganizeDialog : public QDialog { std::unique_ptr error_dialog_; bool devices_; - }; #endif // ORGANISEDIALOG_H diff --git a/src/organize/organizeformat.h b/src/organize/organizeformat.h index 95a5a95ed..39712bcce 100644 --- a/src/organize/organizeformat.h +++ b/src/organize/organizeformat.h @@ -99,7 +99,6 @@ class OrganizeFormat { bool remove_non_ascii_; bool allow_ascii_ext_; bool replace_spaces_; - }; #endif // ORGANISEFORMAT_H diff --git a/src/osd/osdbase.h b/src/osd/osdbase.h index ac79da5a9..4803a99d8 100644 --- a/src/osd/osdbase.h +++ b/src/osd/osdbase.h @@ -120,7 +120,6 @@ class OSDBase : public QObject { Song last_song_; QUrl last_image_uri_; QImage last_image_; - }; #endif // OSDBASE_H diff --git a/src/osd/osddbus.h b/src/osd/osddbus.h index d423b8271..3a383d288 100644 --- a/src/osd/osddbus.h +++ b/src/osd/osddbus.h @@ -67,7 +67,6 @@ class OSDDBus : public OSDBase { QVersionNumber version_; uint notification_id_; QDateTime last_notification_time_; - }; QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image); diff --git a/src/osd/osdpretty.h b/src/osd/osdpretty.h index 7226916ab..ba1f8f0e3 100644 --- a/src/osd/osdpretty.h +++ b/src/osd/osdpretty.h @@ -173,7 +173,6 @@ class OSDPretty : public QWidget { bool toggle_mode_; QMap screens_; - }; #endif // OSDPRETTY_H diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index 9a157fac2..fabfb78eb 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -436,7 +436,6 @@ class Playlist : public QAbstractListModel { bool auto_sort_; int sort_column_; Qt::SortOrder sort_order_; - }; #endif // PLAYLIST_H diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index ef394afac..ea6ff9cd1 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -305,7 +305,6 @@ class PlaylistView : public QTreeView { QPixmap pixmap_tinyplay_; QPixmap pixmap_tinypause_; - }; #endif // PLAYLISTVIEW_H diff --git a/src/qobuz/qobuzfavoriterequest.h b/src/qobuz/qobuzfavoriterequest.h index 50287fa9b..ded733721 100644 --- a/src/qobuz/qobuzfavoriterequest.h +++ b/src/qobuz/qobuzfavoriterequest.h @@ -82,7 +82,6 @@ class QobuzFavoriteRequest : public QobuzBaseRequest { QobuzService *service_; NetworkAccessManager *network_; QList replies_; - }; #endif // QOBUZFAVORITEREQUEST_H diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h index 45e47b1b9..8ac9ac45a 100644 --- a/src/qobuz/qobuzrequest.h +++ b/src/qobuz/qobuzrequest.h @@ -241,7 +241,6 @@ class QobuzRequest : public QobuzBaseRequest { bool no_results_; QList replies_; QList album_cover_replies_; - }; #endif // QOBUZREQUEST_H diff --git a/src/qobuz/qobuzservice.h b/src/qobuz/qobuzservice.h index bf66bba95..ad6625ded 100644 --- a/src/qobuz/qobuzservice.h +++ b/src/qobuz/qobuzservice.h @@ -217,7 +217,6 @@ class QobuzService : public InternetService { QList wait_for_exit_; QList replies_; - }; #endif // QOBUZSERVICE_H diff --git a/src/qobuz/qobuzstreamurlrequest.h b/src/qobuz/qobuzstreamurlrequest.h index e0129cb87..1c2de9a0b 100644 --- a/src/qobuz/qobuzstreamurlrequest.h +++ b/src/qobuz/qobuzstreamurlrequest.h @@ -74,7 +74,6 @@ class QobuzStreamURLRequest : public QobuzBaseRequest { int tries_; bool need_login_; QStringList errors_; - }; #endif // QOBUZSTREAMURLREQUEST_H diff --git a/src/qobuz/qobuzurlhandler.h b/src/qobuz/qobuzurlhandler.h index b16f79f2e..c4ee63531 100644 --- a/src/qobuz/qobuzurlhandler.h +++ b/src/qobuz/qobuzurlhandler.h @@ -57,7 +57,6 @@ class QobuzUrlHandler : public UrlHandler { Application *app_; QobuzService *service_; QMap requests_; - }; #endif // QOBUZURLHANDLER_H diff --git a/src/queue/queue.h b/src/queue/queue.h index ba0a52cb1..4a4321b15 100644 --- a/src/queue/queue.h +++ b/src/queue/queue.h @@ -97,7 +97,6 @@ class Queue : public QAbstractProxyModel { const Playlist *playlist_; quint64 total_length_ns_; QMetaObject::Connection signal_item_count_changed_; - }; #endif // QUEUE_H diff --git a/src/radios/radioparadiseservice.h b/src/radios/radioparadiseservice.h index 8ac02e47e..8f62e3a08 100644 --- a/src/radios/radioparadiseservice.h +++ b/src/radios/radioparadiseservice.h @@ -39,7 +39,6 @@ class RadioParadiseService : public RadioService { public slots: void GetChannels() override; - }; #endif // RADIOPARADISESERVICE_H diff --git a/src/radios/radioservice.h b/src/radios/radioservice.h index 614b3c1b8..2b7d80bf0 100644 --- a/src/radios/radioservice.h +++ b/src/radios/radioservice.h @@ -70,7 +70,6 @@ class RadioService : public QObject { Song::Source source_; QString name_; QIcon icon_; - }; Q_DECLARE_METATYPE(RadioService*) diff --git a/src/scrobbler/lastfmimport.h b/src/scrobbler/lastfmimport.h index a1012003d..eef891630 100644 --- a/src/scrobbler/lastfmimport.h +++ b/src/scrobbler/lastfmimport.h @@ -107,7 +107,6 @@ class LastFMImport : public QObject { QQueue recent_tracks_requests_; QQueue top_tracks_requests_; QList replies_; - }; #endif // LASTFMIMPORT_H diff --git a/src/scrobbler/lastfmscrobbler.h b/src/scrobbler/lastfmscrobbler.h index 6031cd1fa..a0195baa9 100644 --- a/src/scrobbler/lastfmscrobbler.h +++ b/src/scrobbler/lastfmscrobbler.h @@ -43,7 +43,6 @@ class LastFMScrobbler : public ScrobblingAPI20 { private: static const char *kAuthUrl; static const char *kCacheFile; - }; #endif // LASTFMSCROBBLER_H diff --git a/src/scrobbler/librefmscrobbler.h b/src/scrobbler/librefmscrobbler.h index e41e7f7dd..60735befa 100644 --- a/src/scrobbler/librefmscrobbler.h +++ b/src/scrobbler/librefmscrobbler.h @@ -43,7 +43,6 @@ class LibreFMScrobbler : public ScrobblingAPI20 { static const char *kAuthUrl; static const char *kApiUrl; static const char *kCacheFile; - }; #endif // LIBREFMSCROBBLER_H diff --git a/src/scrobbler/listenbrainzscrobbler.h b/src/scrobbler/listenbrainzscrobbler.h index 0a87d7665..7ab084ad2 100644 --- a/src/scrobbler/listenbrainzscrobbler.h +++ b/src/scrobbler/listenbrainzscrobbler.h @@ -132,7 +132,6 @@ class ListenBrainzScrobbler : public ScrobblerService { bool prefer_albumartist_; QList replies_; - }; #endif // LISTENBRAINZSCROBBLER_H diff --git a/src/scrobbler/scrobblercache.h b/src/scrobbler/scrobblercache.h index fa6bfc979..9d5149c5f 100644 --- a/src/scrobbler/scrobblercache.h +++ b/src/scrobbler/scrobblercache.h @@ -59,7 +59,6 @@ class ScrobblerCache : public QObject { QString filename_; bool loaded_; QList scrobbler_cache_; - }; #endif // SCROBBLERCACHE_H diff --git a/src/scrobbler/scrobblerservice.h b/src/scrobbler/scrobblerservice.h index 8292734b7..ab229d52c 100644 --- a/src/scrobbler/scrobblerservice.h +++ b/src/scrobbler/scrobblerservice.h @@ -73,7 +73,6 @@ class ScrobblerService : public QObject { private: QString name_; - }; #endif // SCROBBLERSERVICE_H diff --git a/src/scrobbler/scrobblingapi20.h b/src/scrobbler/scrobblingapi20.h index b1a81f322..78ff4c622 100644 --- a/src/scrobbler/scrobblingapi20.h +++ b/src/scrobbler/scrobblingapi20.h @@ -162,7 +162,6 @@ class ScrobblingAPI20 : public ScrobblerService { QTimer timer_submit_; QList replies_; - }; #endif // SCROBBLINGAPI20_H diff --git a/src/scrobbler/subsonicscrobbler.h b/src/scrobbler/subsonicscrobbler.h index 377ef7f51..5d3c4cf0c 100644 --- a/src/scrobbler/subsonicscrobbler.h +++ b/src/scrobbler/subsonicscrobbler.h @@ -70,7 +70,6 @@ class SubsonicScrobbler : public ScrobblerService { Song song_playing_; QDateTime time_; QTimer timer_submit_; - }; #endif // SUBSONICSCROBBLER_H diff --git a/src/settings/appearancesettingspage.h b/src/settings/appearancesettingspage.h index 0f73ab1c0..3c2a88751 100644 --- a/src/settings/appearancesettingspage.h +++ b/src/settings/appearancesettingspage.h @@ -115,7 +115,6 @@ class AppearanceSettingsPage : public SettingsPage { BackgroundImageType background_image_type_; QString background_image_filename_; QColor current_playlist_playing_song_color_; - }; #endif // APPEARANCESETTINGSPAGE_H diff --git a/src/settings/backendsettingspage.h b/src/settings/backendsettingspage.h index 4f75c1dea..5386f1fe5 100644 --- a/src/settings/backendsettingspage.h +++ b/src/settings/backendsettingspage.h @@ -101,7 +101,6 @@ class BackendSettingsPage : public SettingsPage { EngineBase::Type enginetype_current_; QString output_current_; QVariant device_current_; - }; #endif // BACKENDSETTINGSPAGE_H diff --git a/src/settings/behavioursettingspage.h b/src/settings/behavioursettingspage.h index 095fead4f..2f9812056 100644 --- a/src/settings/behavioursettingspage.h +++ b/src/settings/behavioursettingspage.h @@ -84,7 +84,6 @@ class BehaviourSettingsPage : public SettingsPage { Ui_BehaviourSettingsPage *ui_; QMap language_map_; bool systemtray_available_; - }; #endif // BEHAVIOURSETTINGSPAGE_H diff --git a/src/settings/globalshortcutssettingspage.h b/src/settings/globalshortcutssettingspage.h index 0ec7f12c2..f4bbb4c36 100644 --- a/src/settings/globalshortcutssettingspage.h +++ b/src/settings/globalshortcutssettingspage.h @@ -83,7 +83,6 @@ class GlobalShortcutsSettingsPage : public SettingsPage { QString current_id_; QString de_; - }; #endif // GLOBALSHORTCUTSSETTINGSPAGE_H diff --git a/src/settings/playlistsettingspage.h b/src/settings/playlistsettingspage.h index 967fb456b..90239af17 100644 --- a/src/settings/playlistsettingspage.h +++ b/src/settings/playlistsettingspage.h @@ -53,7 +53,6 @@ class PlaylistSettingsPage : public SettingsPage { private: Ui_PlaylistSettingsPage *ui_; - }; Q_DECLARE_METATYPE(PlaylistSettingsPage::PathType) diff --git a/src/settings/scrobblersettingspage.h b/src/settings/scrobblersettingspage.h index 5ee806781..3c91c1ed3 100644 --- a/src/settings/scrobblersettingspage.h +++ b/src/settings/scrobblersettingspage.h @@ -69,7 +69,6 @@ class ScrobblerSettingsPage : public SettingsPage { void LastFM_RefreshControls(const bool authenticated); void LibreFM_RefreshControls(const bool authenticated); void ListenBrainz_RefreshControls(const bool authenticated); - }; #endif // SCROBBLERSETTINGSPAGE_H diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h index 0028561a1..0ead153f8 100644 --- a/src/settings/settingsdialog.h +++ b/src/settings/settingsdialog.h @@ -56,7 +56,6 @@ class SettingsPage; class Ui_SettingsDialog; - class SettingsItemDelegate : public QStyledItemDelegate { Q_OBJECT diff --git a/src/smartplaylists/playlistgenerator.h b/src/smartplaylists/playlistgenerator.h index c9d1c0317..f43491130 100644 --- a/src/smartplaylists/playlistgenerator.h +++ b/src/smartplaylists/playlistgenerator.h @@ -92,7 +92,6 @@ class PlaylistGenerator : public QObject, public std::enable_shared_from_this previous_ids_; int current_pos_; - }; #endif // PLAYLISTQUERYGENERATOR_H diff --git a/src/smartplaylists/smartplaylistsearch.h b/src/smartplaylists/smartplaylistsearch.h index 340e19577..8ff0bef04 100644 --- a/src/smartplaylists/smartplaylistsearch.h +++ b/src/smartplaylists/smartplaylistsearch.h @@ -68,7 +68,6 @@ class SmartPlaylistSearch { void Reset(); QString ToSql(const QString &songs_table) const; - }; QDataStream &operator<<(QDataStream &s, const SmartPlaylistSearch &search); diff --git a/src/smartplaylists/smartplaylistsearchpreview.h b/src/smartplaylists/smartplaylistsearchpreview.h index 601fdbc45..709e07af1 100644 --- a/src/smartplaylists/smartplaylistsearchpreview.h +++ b/src/smartplaylists/smartplaylistsearchpreview.h @@ -67,7 +67,6 @@ class SmartPlaylistSearchPreview : public QWidget { SmartPlaylistSearch pending_search_; SmartPlaylistSearch last_search_; PlaylistGeneratorPtr generator_; - }; #endif // SMARTPLAYLISTSEARCHPREVIEW_H diff --git a/src/smartplaylists/smartplaylistsearchterm.h b/src/smartplaylists/smartplaylistsearchterm.h index f25d07d99..48d9c00b2 100644 --- a/src/smartplaylists/smartplaylistsearchterm.h +++ b/src/smartplaylists/smartplaylistsearchterm.h @@ -133,7 +133,6 @@ class SmartPlaylistSearchTerm { static QString FieldColumnName(const Field field); static QString FieldSortOrderText(const Type type, const bool ascending); static QString DateName(const DateType datetype, const bool forQuery); - }; QDataStream &operator<<(QDataStream &s, const SmartPlaylistSearchTerm &term);