Formatting

This commit is contained in:
Jonas Kvinge 2023-07-21 05:11:27 +02:00
parent 9fb15545bd
commit a2c7ff63df
87 changed files with 5 additions and 84 deletions

View File

@ -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();

View File

@ -48,4 +48,3 @@ class CollectionViewContainer : public QWidget {
};
#endif // COLLECTIONVIEWCONTAINER_H

View File

@ -166,7 +166,6 @@ class ContextView : public QWidget {
QList<ResizableTextEdit*> textedit_play_;
QList<QLabel*> labels_play_data_;
QList<QLabel*> labels_play_all_;
};
#endif // CONTEXTVIEW_H

View File

@ -137,7 +137,6 @@ class AlbumCoverFetcher : public QObject {
QHash<quint64, AlbumCoverFetcherSearch*> active_requests_;
QTimer *request_starter_;
};
#endif // ALBUMCOVERFETCHER_H

View File

@ -87,7 +87,6 @@ class CoverProvider : public QObject {
float quality_;
bool batch_;
bool allow_missing_album_;
};
#endif // COVERPROVIDER_H

View File

@ -46,7 +46,6 @@ struct CoverSearchStatistics {
quint64 chosen_height_;
QString AverageDimensions() const;
};
#endif // COVERSEARCHSTATISTICS_H

View File

@ -59,7 +59,6 @@ class DeezerCoverProvider : public JsonCoverProvider {
static const int kLimit;
QList<QNetworkReply*> replies_;
};
#endif // DEEZERCOVERPROVIDER_H

View File

@ -101,7 +101,6 @@ class DiscogsCoverProvider : public JsonCoverProvider {
QQueue<DiscogsCoverReleaseContext> queue_release_requests_;
QMap<int, std::shared_ptr<DiscogsCoverSearchContext>> requests_search_;
QList<QNetworkReply*> replies_;
};
Q_DECLARE_METATYPE(DiscogsCoverProvider::DiscogsCoverSearchContext)

View File

@ -66,7 +66,6 @@ class LastFmCoverProvider : public JsonCoverProvider {
static const char *kSecret;
QList<QNetworkReply*> replies_;
};
#endif // LASTFMCOVERPROVIDER_H

View File

@ -71,7 +71,6 @@ class MusicbrainzCoverProvider : public JsonCoverProvider {
QTimer *timer_flush_requests_;
QQueue<SearchRequest> queue_search_requests_;
QList<QNetworkReply*> replies_;
};
#endif // MUSICBRAINZCOVERPROVIDER_H

View File

@ -52,7 +52,6 @@ class MusixmatchCoverProvider : public JsonCoverProvider, MusixmatchProvider {
private:
QList<QNetworkReply*> replies_;
};
#endif // MUSIXMATCHCOVERPROVIDER_H

View File

@ -63,7 +63,6 @@ class QobuzCoverProvider : public JsonCoverProvider {
QobuzService *service_;
QList<QNetworkReply*> replies_;
};
#endif // QOBUZCOVERPROVIDER_H

View File

@ -88,7 +88,6 @@ class SpotifyCoverProvider : public JsonCoverProvider {
quint64 login_time_;
QTimer refresh_login_timer_;
QList<QNetworkReply*> replies_;
};
#endif // SPOTIFYCOVERPROVIDER_H

View File

@ -66,7 +66,6 @@ class TidalCoverProvider : public JsonCoverProvider {
TidalService *service_;
QList<QNetworkReply*> replies_;
};
#endif // TIDALCOVERPROVIDER_H

View File

@ -120,7 +120,6 @@ class DeviceInfo : public SimpleTreeItem<DeviceInfo> {
bool forget_;
Q_DISABLE_COPY(DeviceInfo)
};
#endif // DEVICEINFO_H

View File

@ -170,7 +170,6 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
QThreadPool thread_pool_;
QList<QObject*> wait_for_exit_;
};
template<typename T>

View File

@ -22,6 +22,7 @@
#include "config.h"
#include <functional>
#include <glib.h>
#include <glib-object.h>
#include <gio/gio.h>

View File

@ -70,7 +70,6 @@ class GPodLoader : public QObject {
TaskManager *task_manager_;
CollectionBackend *backend_;
bool abort_;
};
#endif // GPODLOADER_H

View File

@ -102,4 +102,3 @@ bool MtpLoader::TryLoad() {
return !abort_;
}

View File

@ -45,7 +45,6 @@ class AddStreamDialog : public QDialog {
private:
Ui_AddStreamDialog *ui_;
};
#endif // ADDSTREAMDIALOG_H

View File

@ -37,7 +37,6 @@ class DeleteConfirmationDialog : public QDialog {
private:
QDialogButtonBox *button_box_;
};
#endif // DELETECONFIRMATIONDIALOG_H

View File

@ -27,7 +27,6 @@ class SnapDialog : public MessageDialog {
public:
explicit SnapDialog(QWidget *parent = nullptr);
};
#endif // SNAPDIALOG_H

View File

@ -58,7 +58,6 @@ class Chromaprinter {
GstElement *convert_element_;
QBuffer buffer_;
};
#endif // CHROMAPRINTER_H

View File

@ -40,7 +40,6 @@ class DeviceFinders : public QObject {
private:
QList<DeviceFinder*> device_finders_;
};
#endif // DEVICEFINDERS_H

View File

@ -42,7 +42,6 @@ class DirectSoundDeviceFinder : public DeviceFinder {
};
static BOOL CALLBACK EnumerateCallback(LPGUID guid, LPCSTR description, LPCSTR module, LPVOID state_voidptr);
};
#endif // DIRECTSOUNDDEVICEFINDER_H

View File

@ -25,6 +25,7 @@
#include <cstdint>
#include <cstring>
#include <cmath>
#include <glib.h>
#include <glib-object.h>
#include <gst/gst.h>

View File

@ -46,7 +46,6 @@ class GstStartup : public QObject {
static void SetEnvironment();
QFuture<void> initializing_;
};
#endif // GSTSTARTUP_H

View File

@ -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

View File

@ -48,7 +48,6 @@ class EqualizerSlider : public QWidget {
private:
Ui_EqualizerSlider *ui_;
};
#endif // EQUALISERSLIDER_H

View File

@ -79,7 +79,6 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
int native_key_;
int native_key2_;
int native_mods_;
};
#endif // GLOBALSHORTCUT_H

View File

@ -58,7 +58,6 @@ class GlobalShortcutsBackendGnome : public GlobalShortcutsBackend {
OrgGnomeSettingsDaemonMediaKeysInterface *interface_;
bool is_connected_;
};
#endif // GLOBALSHORTCUTSBACKEND_GNOME_H

View File

@ -56,7 +56,6 @@ class GlobalShortcutsBackendMate : public GlobalShortcutsBackend {
OrgMateSettingsDaemonMediaKeysInterface *interface_;
bool is_connected_;
};
#endif // GLOBALSHORTCUTSBACKEND_Mate_H

View File

@ -51,7 +51,6 @@ class GlobalShortcutsBackendWin : public GlobalShortcutsBackend {
QList<GlobalShortcut*> shortcuts_;
GlobalShortcut *gshortcut_init_;
};
#endif // GLOBALSHORTCUTSBACKEND_WIN_H

View File

@ -52,7 +52,6 @@ class GlobalShortcutsBackendX11 : public GlobalShortcutsBackend {
QList<GlobalShortcut*> shortcuts_;
GlobalShortcut *gshortcut_init_;
};
#endif // GLOBALSHORTCUTSBACKEND_X11_H

View File

@ -64,7 +64,6 @@ class GlobalShortcutsBackend : public QObject {
GlobalShortcutsManager *manager_;
Type type_;
bool active_;
};
#endif // GLOBALSHORTCUTSBACKEND_H

View File

@ -136,7 +136,6 @@ class InternetCollectionView : public AutoExpandingTreeView {
Song last_selected_song_;
QString last_selected_container_;
QSet<QString> last_selected_path_;
};
#endif // INTERNETCOLLECTIONVIEW_H

View File

@ -40,7 +40,6 @@ class InternetSearchItemDelegate : public CollectionItemDelegate {
private:
InternetSearchView *view_;
};
#endif // INTERNETSEARCHITEMDELEGATE_H

View File

@ -93,7 +93,6 @@ class InternetSearchModel : public QStandardItemModel {
QPixmap no_cover_icon_;
CollectionModel::Grouping group_by_;
QMap<ContainerKey, QStandardItem*> containers_;
};
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)

View File

@ -215,7 +215,6 @@ class InternetSearchView : public QWidget {
QMap<int, PendingState> pending_searches_;
QMap<quint64, QPair<QModelIndex, QString>> cover_loader_tasks_;
};
Q_DECLARE_METATYPE(InternetSearchView::Result)
Q_DECLARE_METATYPE(InternetSearchView::ResultList)

View File

@ -141,7 +141,6 @@ class InternetService : public QObject {
QString url_scheme_;
QString settings_group_;
SettingsDialog::Page settings_page_;
};
Q_DECLARE_METATYPE(InternetService*)

View File

@ -60,7 +60,6 @@ class InternetServices : public QObject {
private:
QMap<Song::Source, InternetService*> services_;
QList<InternetService*> wait_for_exit_;
};
#endif // INTERNETSERVICES_H

View File

@ -63,7 +63,6 @@ class InternetSongsView : public QWidget {
QString settings_group_;
SettingsDialog::Page settings_page_;
Ui_InternetCollectionViewContainer *ui_;
};
#endif // INTERNETSONGSVIEW_H

View File

@ -74,7 +74,6 @@ class InternetTabsView : public QWidget {
QString settings_group_;
SettingsDialog::Page settings_page_;
Ui_InternetTabsView *ui_;
};
#endif // INTERNETTABSVIEW_H

View File

@ -69,7 +69,6 @@ class LocalRedirectServer : public QTcpServer {
QAbstractSocket *socket_;
QByteArray buffer_;
QString error_;
};
#endif // LOCALREDIRECTSERVER_H

View File

@ -52,7 +52,6 @@ class ChartLyricsProvider : public LyricsProvider {
private:
static const char *kUrlSearch;
QList<QNetworkReply*> replies_;
};
#endif // CHARTLYRICSPROVIDER_H

View File

@ -104,7 +104,6 @@ class GeniusLyricsProvider : public JsonLyricsProvider {
QStringList login_errors_;
QMap<int, std::shared_ptr<GeniusLyricsSearchContext>> requests_search_;
QList<QNetworkReply*> replies_;
};
#endif // GENIUSLYRICSPROVIDER_H

View File

@ -53,7 +53,6 @@ class LoloLyricsProvider : public LyricsProvider {
private:
static const char *kUrlSearch;
QList<QNetworkReply*> replies_;
};
#endif // LOLOLYRICSPROVIDER_H

View File

@ -77,7 +77,6 @@ class LyricsFetcher : public QObject {
QHash<quint64, LyricsFetcherSearch*> active_requests_;
QTimer *request_starter_;
};
#endif // LYRICSFETCHER_H

View File

@ -66,7 +66,6 @@ class LyricsFetcherSearch : public QObject {
LyricsSearchResults results_;
QMap<int, LyricsProvider*> pending_requests_;
bool cancel_requested_;
};
#endif // LYRICSFETCHERSEARCH_H

View File

@ -75,7 +75,6 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider, public MusixmatchPro
QList<LyricsSearchContextPtr> requests_search_;
QList<QNetworkReply*> replies_;
bool use_api_;
};
#endif // MUSIXMATCHLYRICSPROVIDER_H

View File

@ -53,7 +53,6 @@ class OVHLyricsProvider : public JsonLyricsProvider {
private:
static const char *kUrlSearch;
QList<QNetworkReply*> replies_;
};
#endif // OVHLYRICSPROVIDER_H

View File

@ -72,7 +72,6 @@ class AcoustidClient : public QObject {
NetworkAccessManager *network_;
NetworkTimeouts *timeouts_;
QMap<int, QNetworkReply*> requests_;
};
#endif // ACOUSTIDCLIENT_H

View File

@ -124,7 +124,6 @@ class OrganizeDialog : public QDialog {
std::unique_ptr<OrganizeErrorDialog> error_dialog_;
bool devices_;
};
#endif // ORGANISEDIALOG_H

View File

@ -99,7 +99,6 @@ class OrganizeFormat {
bool remove_non_ascii_;
bool allow_ascii_ext_;
bool replace_spaces_;
};
#endif // ORGANISEFORMAT_H

View File

@ -120,7 +120,6 @@ class OSDBase : public QObject {
Song last_song_;
QUrl last_image_uri_;
QImage last_image_;
};
#endif // OSDBASE_H

View File

@ -67,7 +67,6 @@ class OSDDBus : public OSDBase {
QVersionNumber version_;
uint notification_id_;
QDateTime last_notification_time_;
};
QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image);

View File

@ -173,7 +173,6 @@ class OSDPretty : public QWidget {
bool toggle_mode_;
QMap<QString, QScreen*> screens_;
};
#endif // OSDPRETTY_H

View File

@ -436,7 +436,6 @@ class Playlist : public QAbstractListModel {
bool auto_sort_;
int sort_column_;
Qt::SortOrder sort_order_;
};
#endif // PLAYLIST_H

View File

@ -305,7 +305,6 @@ class PlaylistView : public QTreeView {
QPixmap pixmap_tinyplay_;
QPixmap pixmap_tinypause_;
};
#endif // PLAYLISTVIEW_H

View File

@ -82,7 +82,6 @@ class QobuzFavoriteRequest : public QobuzBaseRequest {
QobuzService *service_;
NetworkAccessManager *network_;
QList<QNetworkReply*> replies_;
};
#endif // QOBUZFAVORITEREQUEST_H

View File

@ -241,7 +241,6 @@ class QobuzRequest : public QobuzBaseRequest {
bool no_results_;
QList<QNetworkReply*> replies_;
QList<QNetworkReply*> album_cover_replies_;
};
#endif // QOBUZREQUEST_H

View File

@ -217,7 +217,6 @@ class QobuzService : public InternetService {
QList<QObject*> wait_for_exit_;
QList<QNetworkReply*> replies_;
};
#endif // QOBUZSERVICE_H

View File

@ -74,7 +74,6 @@ class QobuzStreamURLRequest : public QobuzBaseRequest {
int tries_;
bool need_login_;
QStringList errors_;
};
#endif // QOBUZSTREAMURLREQUEST_H

View File

@ -57,7 +57,6 @@ class QobuzUrlHandler : public UrlHandler {
Application *app_;
QobuzService *service_;
QMap<uint, Request> requests_;
};
#endif // QOBUZURLHANDLER_H

View File

@ -97,7 +97,6 @@ class Queue : public QAbstractProxyModel {
const Playlist *playlist_;
quint64 total_length_ns_;
QMetaObject::Connection signal_item_count_changed_;
};
#endif // QUEUE_H

View File

@ -39,7 +39,6 @@ class RadioParadiseService : public RadioService {
public slots:
void GetChannels() override;
};
#endif // RADIOPARADISESERVICE_H

View File

@ -70,7 +70,6 @@ class RadioService : public QObject {
Song::Source source_;
QString name_;
QIcon icon_;
};
Q_DECLARE_METATYPE(RadioService*)

View File

@ -107,7 +107,6 @@ class LastFMImport : public QObject {
QQueue<GetRecentTracksRequest> recent_tracks_requests_;
QQueue<GetTopTracksRequest> top_tracks_requests_;
QList<QNetworkReply*> replies_;
};
#endif // LASTFMIMPORT_H

View File

@ -43,7 +43,6 @@ class LastFMScrobbler : public ScrobblingAPI20 {
private:
static const char *kAuthUrl;
static const char *kCacheFile;
};
#endif // LASTFMSCROBBLER_H

View File

@ -43,7 +43,6 @@ class LibreFMScrobbler : public ScrobblingAPI20 {
static const char *kAuthUrl;
static const char *kApiUrl;
static const char *kCacheFile;
};
#endif // LIBREFMSCROBBLER_H

View File

@ -132,7 +132,6 @@ class ListenBrainzScrobbler : public ScrobblerService {
bool prefer_albumartist_;
QList<QNetworkReply*> replies_;
};
#endif // LISTENBRAINZSCROBBLER_H

View File

@ -59,7 +59,6 @@ class ScrobblerCache : public QObject {
QString filename_;
bool loaded_;
QList<ScrobblerCacheItemPtr> scrobbler_cache_;
};
#endif // SCROBBLERCACHE_H

View File

@ -73,7 +73,6 @@ class ScrobblerService : public QObject {
private:
QString name_;
};
#endif // SCROBBLERSERVICE_H

View File

@ -162,7 +162,6 @@ class ScrobblingAPI20 : public ScrobblerService {
QTimer timer_submit_;
QList<QNetworkReply*> replies_;
};
#endif // SCROBBLINGAPI20_H

View File

@ -70,7 +70,6 @@ class SubsonicScrobbler : public ScrobblerService {
Song song_playing_;
QDateTime time_;
QTimer timer_submit_;
};
#endif // SUBSONICSCROBBLER_H

View File

@ -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

View File

@ -101,7 +101,6 @@ class BackendSettingsPage : public SettingsPage {
EngineBase::Type enginetype_current_;
QString output_current_;
QVariant device_current_;
};
#endif // BACKENDSETTINGSPAGE_H

View File

@ -84,7 +84,6 @@ class BehaviourSettingsPage : public SettingsPage {
Ui_BehaviourSettingsPage *ui_;
QMap<QString, QString> language_map_;
bool systemtray_available_;
};
#endif // BEHAVIOURSETTINGSPAGE_H

View File

@ -83,7 +83,6 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
QString current_id_;
QString de_;
};
#endif // GLOBALSHORTCUTSSETTINGSPAGE_H

View File

@ -53,7 +53,6 @@ class PlaylistSettingsPage : public SettingsPage {
private:
Ui_PlaylistSettingsPage *ui_;
};
Q_DECLARE_METATYPE(PlaylistSettingsPage::PathType)

View File

@ -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

View File

@ -56,7 +56,6 @@ class SettingsPage;
class Ui_SettingsDialog;
class SettingsItemDelegate : public QStyledItemDelegate {
Q_OBJECT

View File

@ -92,7 +92,6 @@ class PlaylistGenerator : public QObject, public std::enable_shared_from_this<Pl
private:
QString name_;
};
#include "playlistgenerator_fwd.h"

View File

@ -57,7 +57,6 @@ class PlaylistQueryGenerator : public PlaylistGenerator {
QList<int> previous_ids_;
int current_pos_;
};
#endif // PLAYLISTQUERYGENERATOR_H

View File

@ -68,7 +68,6 @@ class SmartPlaylistSearch {
void Reset();
QString ToSql(const QString &songs_table) const;
};
QDataStream &operator<<(QDataStream &s, const SmartPlaylistSearch &search);

View File

@ -67,7 +67,6 @@ class SmartPlaylistSearchPreview : public QWidget {
SmartPlaylistSearch pending_search_;
SmartPlaylistSearch last_search_;
PlaylistGeneratorPtr generator_;
};
#endif // SMARTPLAYLISTSEARCHPREVIEW_H

View File

@ -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);