From 8c2b907ff546cccb3921a12c765a24fa7d4bffe3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 22 Jun 2021 13:41:38 +0200 Subject: [PATCH] Make static --- .../singleapplication/singleapplication_p.h | 4 +- .../singlecoreapplication_p.h | 4 +- src/analyzer/fht.h | 2 +- src/collection/collectionmodel.cpp | 8 ++-- src/collection/collectionmodel.h | 12 +++--- src/collection/collectionwatcher.h | 6 +-- src/context/contextalbumsmodel.cpp | 2 +- src/context/contextalbumsmodel.h | 2 +- src/context/contextview.h | 2 +- src/core/appearance.h | 2 +- src/core/application.h | 2 +- src/core/commandlineoptions.h | 2 +- src/core/database.cpp | 2 +- src/core/database.h | 10 ++--- src/core/mainwindow.cpp | 2 +- src/core/mainwindow.h | 2 +- src/core/mpris2.cpp | 28 ++++++------- src/core/mpris2.h | 40 +++++++++---------- src/core/song.cpp | 2 +- src/core/song.h | 2 +- src/core/stylesheetloader.cpp | 2 +- src/core/stylesheetloader.h | 2 +- src/covermanager/albumcoverchoicecontroller.h | 2 +- src/covermanager/albumcoverfetchersearch.cpp | 2 +- src/covermanager/albumcoverfetchersearch.h | 2 +- src/covermanager/albumcoverloader.h | 2 +- src/covermanager/albumcovermanager.h | 2 +- src/covermanager/lastfmcoverprovider.h | 2 +- src/device/udisks2lister.h | 4 +- src/dialogs/about.cpp | 2 +- src/dialogs/about.h | 2 +- src/dialogs/edittagdialog.cpp | 8 +--- src/dialogs/edittagdialog.h | 4 +- src/dialogs/trackselectiondialog.cpp | 2 +- src/dialogs/trackselectiondialog.h | 2 +- src/engine/chromaprinter.h | 2 +- src/engine/gstelementdeleter.h | 2 +- src/engine/gstenginepipeline.cpp | 4 +- src/engine/gstenginepipeline.h | 4 +- src/engine/gststartup.cpp | 6 +-- src/engine/gststartup.h | 4 +- src/engine/vlcengine.h | 2 +- src/globalshortcuts/globalshortcut.h | 10 ++--- .../globalshortcutsmanager.cpp | 4 +- src/globalshortcuts/globalshortcutsmanager.h | 4 +- src/moodbar/moodbarproxystyle.h | 2 +- src/musicbrainz/musicbrainzclient.h | 4 +- src/organize/organizedialog.cpp | 6 +-- src/organize/organizedialog.h | 2 +- src/osd/osdpretty.cpp | 2 +- src/osd/osdpretty.h | 2 +- src/playlist/playlistdelegates.cpp | 2 +- src/playlist/playlistdelegates.h | 2 +- src/playlist/playlistfilterparser.cpp | 2 +- src/playlist/playlistfilterparser.h | 2 +- src/playlist/playlistlistmodel.cpp | 2 +- src/playlist/playlistlistmodel.h | 2 +- src/playlistparsers/cueparser.cpp | 8 ++-- src/playlistparsers/cueparser.h | 8 ++-- src/playlistparsers/m3uparser.cpp | 2 +- src/playlistparsers/m3uparser.h | 2 +- src/playlistparsers/parserbase.cpp | 2 +- src/playlistparsers/parserbase.h | 2 +- src/playlistparsers/playlistparser.cpp | 2 +- src/playlistparsers/playlistparser.h | 2 +- src/playlistparsers/wplparser.cpp | 2 +- src/playlistparsers/wplparser.h | 2 +- src/qobuz/qobuzbaserequest.h | 2 +- src/qobuz/qobuzfavoriterequest.h | 2 +- src/qobuz/qobuzrequest.h | 2 +- src/settings/appearancesettingspage.h | 2 +- src/settings/contextsettingspage.h | 2 +- src/settings/settingspage.h | 4 +- src/smartplaylists/smartplaylistsmodel.cpp | 2 +- src/smartplaylists/smartplaylistsmodel.h | 2 +- src/subsonic/subsonicbaserequest.h | 2 +- src/subsonic/subsonicrequest.h | 2 +- src/tidal/tidalbaserequest.h | 2 +- src/tidal/tidalfavoriterequest.h | 2 +- src/tidal/tidalrequest.h | 2 +- src/transcoder/transcodedialog.cpp | 2 +- src/transcoder/transcodedialog.h | 2 +- src/transcoder/transcoder.h | 2 +- src/widgets/freespacebar.cpp | 2 +- src/widgets/freespacebar.h | 2 +- src/widgets/trackslider.h | 2 +- tests/src/collectionbackend_test.cpp | 2 +- tests/src/concurrentrun_test.cpp | 2 +- tests/src/testobjectdecorators.h | 2 +- 89 files changed, 157 insertions(+), 169 deletions(-) diff --git a/3rdparty/singleapplication/singleapplication_p.h b/3rdparty/singleapplication/singleapplication_p.h index 8f269375..bf9ae8ad 100644 --- a/3rdparty/singleapplication/singleapplication_p.h +++ b/3rdparty/singleapplication/singleapplication_p.h @@ -80,7 +80,7 @@ class SingleApplicationPrivate : public QObject { explicit SingleApplicationPrivate(SingleApplication *ptr); ~SingleApplicationPrivate() override; - QString getUsername(); + static QString getUsername(); void genBlockServerName(); void initializeMemoryBlock(); void startPrimary(); @@ -91,7 +91,7 @@ class SingleApplicationPrivate : public QObject { QString primaryUser(); void readInitMessageHeader(QLocalSocket *socket); void readInitMessageBody(QLocalSocket *socket); - void randomSleep(); + static void randomSleep(); SingleApplication *q_ptr; QSharedMemory *memory_; diff --git a/3rdparty/singleapplication/singlecoreapplication_p.h b/3rdparty/singleapplication/singlecoreapplication_p.h index d8963a0f..797dc2be 100644 --- a/3rdparty/singleapplication/singlecoreapplication_p.h +++ b/3rdparty/singleapplication/singlecoreapplication_p.h @@ -80,7 +80,7 @@ class SingleCoreApplicationPrivate : public QObject { explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr); ~SingleCoreApplicationPrivate() override; - QString getUsername(); + static QString getUsername(); void genBlockServerName(); void initializeMemoryBlock(); void startPrimary(); @@ -91,7 +91,7 @@ class SingleCoreApplicationPrivate : public QObject { QString primaryUser(); void readInitMessageHeader(QLocalSocket *socket); void readInitMessageBody(QLocalSocket *socket); - void randomSleep(); + static void randomSleep(); SingleCoreApplication *q_ptr; QSharedMemory *memory_; diff --git a/src/analyzer/fht.h b/src/analyzer/fht.h index 12c6f9d1..0890301d 100644 --- a/src/analyzer/fht.h +++ b/src/analyzer/fht.h @@ -117,7 +117,7 @@ class FHT { /** * Discrete Hartley transform of data sets with 8 values. */ - void transform8(float*); + static void transform8(float*); void transform(float*); }; diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index 590702bb..e5a683fe 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -306,7 +306,7 @@ CollectionItem *CollectionModel::CreateCompilationArtistNode(const bool signal, } -QString CollectionModel::ContainerKey(const GroupBy type, const Song &song) const { +QString CollectionModel::ContainerKey(const GroupBy type, const Song &song) { QString key; @@ -397,7 +397,7 @@ QString CollectionModel::ContainerKey(const GroupBy type, const Song &song) cons } -QString CollectionModel::DividerKey(const GroupBy type, CollectionItem *item) const { +QString CollectionModel::DividerKey(const GroupBy type, CollectionItem *item) { // Items which are to be grouped under the same divider must produce the same divider key. This will only get called for top-level items. @@ -455,7 +455,7 @@ QString CollectionModel::DividerKey(const GroupBy type, CollectionItem *item) co } -QString CollectionModel::DividerDisplayText(const GroupBy type, const QString &key) const { +QString CollectionModel::DividerDisplayText(const GroupBy type, const QString &key) { // Pretty display text for the dividers. @@ -1754,7 +1754,7 @@ bool CollectionModel::CompareItems(const CollectionItem *a, const CollectionItem } -qint64 CollectionModel::MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default) const { +qint64 CollectionModel::MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default) { qint64 size = s->value(size_id, cache_size_default).toInt(); int unit = s->value(size_unit_id, CollectionSettingsPage::CacheSizeUnit::CacheSizeUnit_MB).toInt() + 1; diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h index 93b02ec2..4fe6f2c7 100644 --- a/src/collection/collectionmodel.h +++ b/src/collection/collectionmodel.h @@ -226,7 +226,7 @@ class CollectionModel : public SimpleTreeModel { void TotalSongCountUpdatedSlot(const int count); void TotalArtistCountUpdatedSlot(const int count); void TotalAlbumCountUpdatedSlot(const int count); - void ClearDiskCache(); + static void ClearDiskCache(); // Called after ResetAsync void ResetAsyncQueryFinished(); @@ -247,7 +247,7 @@ class CollectionModel : public SimpleTreeModel { // When the model is reset or when a node is lazy-loaded the Collection constructs a database query to populate the items. // Filters are added for each parent item, restricting the songs returned to a particular album or artist for example. static void InitQuery(const GroupBy type, CollectionQuery *q); - void FilterQuery(const GroupBy type, CollectionItem *item, CollectionQuery *q); + static void FilterQuery(const GroupBy type, CollectionItem *item, CollectionQuery *q); // Items can be created either from a query that's been run to populate a node, or by a spontaneous SongsDiscovered emission from the backend. CollectionItem *ItemFromQuery(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, const SqlRow &row, const int container_level); @@ -260,9 +260,9 @@ class CollectionModel : public SimpleTreeModel { CollectionItem *InitItem(const GroupBy type, const bool signal, CollectionItem *parent, const int container_level); void FinishItem(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, CollectionItem *item); - QString ContainerKey(const GroupBy type, const Song &song) const; - QString DividerKey(const GroupBy type, CollectionItem *item) const; - QString DividerDisplayText(const GroupBy type, const QString &key) const; + static QString ContainerKey(const GroupBy type, const Song &song) ; + static QString DividerKey(const GroupBy type, CollectionItem *item) ; + static QString DividerDisplayText(const GroupBy type, const QString &key) ; // Helpers static bool IsCompilationArtistNode(const CollectionItem *node) { return node == node->parent->compilation_artist_node_; } @@ -270,7 +270,7 @@ class CollectionModel : public SimpleTreeModel { QVariant AlbumIcon(const QModelIndex &idx); QVariant data(const CollectionItem *item, const int role) const; bool CompareItems(const CollectionItem *a, const CollectionItem *b) const; - qint64 MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default) const; + static qint64 MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default) ; private: CollectionBackend *backend_; diff --git a/src/collection/collectionwatcher.h b/src/collection/collectionwatcher.h index bc8b7e4a..087f397c 100644 --- a/src/collection/collectionwatcher.h +++ b/src/collection/collectionwatcher.h @@ -168,7 +168,7 @@ class CollectionWatcher : public QObject { void ScanSubdirectory(const QString &path, const Subdirectory &subdir, const quint64 files_count, CollectionWatcher::ScanTransaction *t, const bool force_noincremental = false); private: - static bool FindSongsByPath(const SongList &list, const QString &path, SongList *out); + static bool FindSongsByPath(const SongList &songs, const QString &path, SongList *out); bool FindSongsByFingerprint(const QString &file, const QString &fingerprint, SongList *out); static bool FindSongsByFingerprint(const QString &file, const SongList &songs, const QString &fingerprint, SongList *out); inline static QString NoExtensionPart(const QString &fileName); @@ -178,7 +178,7 @@ class CollectionWatcher : public QObject { QUrl ImageForSong(const QString &path, QMap &album_art); void AddWatch(const Directory &dir, const QString &path); void RemoveWatch(const Directory &dir, const Subdirectory &subdir); - quint64 GetMtimeForCue(const QString &cue_path); + static quint64 GetMtimeForCue(const QString &cue_path); void PerformScan(const bool incremental, const bool ignore_mtimes); // Updates the sections of a cue associated and altered (according to mtime) media file during a scan. @@ -189,7 +189,7 @@ class CollectionWatcher : public QObject { // It may result in a multiple files added to the collection when the media file has many sections (like a CUE related media file). SongList ScanNewFile(const QString &file, const QString &path, const QString &fingerprint, const QString &matching_cue, QSet *cues_processed); - void AddChangedSong(const QString &file, const Song &matching_song, const Song &new_song, ScanTransaction *t); + static void AddChangedSong(const QString &file, const Song &matching_song, const Song &new_song, ScanTransaction *t); quint64 FilesCountForPath(ScanTransaction *t, const QString &path); quint64 FilesCountForSubdirs(ScanTransaction *t, const SubdirectoryList &subdirs, QMap &subdir_files_count); diff --git a/src/context/contextalbumsmodel.cpp b/src/context/contextalbumsmodel.cpp index 25f0968e..e7f1364a 100644 --- a/src/context/contextalbumsmodel.cpp +++ b/src/context/contextalbumsmodel.cpp @@ -103,7 +103,7 @@ void ContextAlbumsModel::AddSongs(const SongList &songs) { } -QString ContextAlbumsModel::AlbumIconPixmapCacheKey(const QModelIndex &idx) const { +QString ContextAlbumsModel::AlbumIconPixmapCacheKey(const QModelIndex &idx) { QStringList path; QModelIndex index_copy(idx); diff --git a/src/context/contextalbumsmodel.h b/src/context/contextalbumsmodel.h index 50b06951..f88388a5 100644 --- a/src/context/contextalbumsmodel.h +++ b/src/context/contextalbumsmodel.h @@ -107,7 +107,7 @@ class ContextAlbumsModel : public SimpleTreeModel { void PostQuery(CollectionItem *parent, const QueryResult &result, bool signal); CollectionItem *ItemFromSong(CollectionItem::Type item_type, bool signal, CollectionItem *parent, const Song &s, int container_level); - QString AlbumIconPixmapCacheKey(const QModelIndex &idx) const; + static QString AlbumIconPixmapCacheKey(const QModelIndex &idx) ; QVariant AlbumIcon(const QModelIndex &idx); QVariant data(const CollectionItem *item, int role) const; bool CompareItems(const CollectionItem *a, const CollectionItem *b) const; diff --git a/src/context/contextview.h b/src/context/contextview.h index 6b610c0a..def475fd 100644 --- a/src/context/contextview.h +++ b/src/context/contextview.h @@ -72,7 +72,7 @@ class ContextView : public QWidget { private: void AddActions(); - void SetLabelText(QLabel *label, int value, const QString &suffix, const QString &def = QString()); + static void SetLabelText(QLabel *label, int value, const QString &suffix, const QString &def = QString()); void NoSong(); void SetSong(); void UpdateSong(const Song &song); diff --git a/src/core/appearance.h b/src/core/appearance.h index e1476644..d0705f0d 100644 --- a/src/core/appearance.h +++ b/src/core/appearance.h @@ -36,7 +36,7 @@ class Appearance : public QObject { static const QPalette kDefaultPalette; void LoadUserTheme(); - void ResetToSystemDefaultTheme(); + static void ResetToSystemDefaultTheme(); void ChangeForegroundColor(const QColor &color); void ChangeBackgroundColor(const QColor &color); diff --git a/src/core/application.h b/src/core/application.h index 25e74244..139b3028 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -106,7 +106,7 @@ class Application : public QObject { void Exit(); QThread *MoveToNewThread(QObject *object); - void MoveToThread(QObject *object, QThread *thread); + static void MoveToThread(QObject *object, QThread *thread); private slots: void ExitReceived(); diff --git a/src/core/commandlineoptions.h b/src/core/commandlineoptions.h index 6c870ec7..9dd494cd 100644 --- a/src/core/commandlineoptions.h +++ b/src/core/commandlineoptions.h @@ -100,7 +100,7 @@ class CommandlineOptions { RestartOrPrevious }; - QString tr(const char *source_text); + static QString tr(const char *source_text); void RemoveArg(const QString &starts_with, int count); private: diff --git a/src/core/database.cpp b/src/core/database.cpp index b248fb6a..36b4e46e 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -533,7 +533,7 @@ void Database::DoBackup() { } -bool Database::OpenDatabase(const QString &filename, sqlite3 **connection) const { +bool Database::OpenDatabase(const QString &filename, sqlite3 **connection) { int ret = sqlite3_open(filename.toUtf8(), connection); if (ret != 0) { diff --git a/src/core/database.h b/src/core/database.h index 7dff069e..85e4ae55 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -65,7 +65,7 @@ class Database : public QObject { void ExitAsync(); QSqlDatabase Connect(); void Close(); - bool CheckErrors(const QSqlQuery &query); + static bool CheckErrors(const QSqlQuery &query); #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QRecursiveMutex *Mutex() { return &mutex_; } @@ -94,18 +94,18 @@ class Database : public QObject { void DoBackup(); private: - int SchemaVersion(QSqlDatabase *db); + static int SchemaVersion(QSqlDatabase *db); void UpdateMainSchema(QSqlDatabase *db); void ExecSchemaCommandsFromFile(QSqlDatabase &db, const QString &filename, int schema_version, bool in_transaction = false); - void ExecSongTablesCommands(QSqlDatabase &db, const QStringList &song_tables, const QStringList &commands); + static void ExecSongTablesCommands(QSqlDatabase &db, const QStringList &song_tables, const QStringList &commands); void UpdateDatabaseSchema(int version, QSqlDatabase &db); - void UrlEncodeFilenameColumn(const QString &table, QSqlDatabase &db); + static void UrlEncodeFilenameColumn(const QString &table, QSqlDatabase &db); QStringList SongsTables(QSqlDatabase &db, int schema_version) const; bool IntegrityCheck(const QSqlDatabase &db); void BackupFile(const QString &filename); - bool OpenDatabase(const QString &filename, sqlite3 **connection) const; + static bool OpenDatabase(const QString &filename, sqlite3 **connection) ; Application *app_; diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 82747c12..33d4ac66 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -1633,7 +1633,7 @@ void MainWindow::UpdateTrackSliderPosition() { } -void MainWindow::ApplyAddBehaviour(const BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) const { +void MainWindow::ApplyAddBehaviour(const BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) { switch (b) { case BehaviourSettingsPage::AddBehaviour_Append: diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h index 9dc660a9..b8f2ffcb 100644 --- a/src/core/mainwindow.h +++ b/src/core/mainwindow.h @@ -279,7 +279,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { void SaveSettings(); - void ApplyAddBehaviour(const BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) const; + static void ApplyAddBehaviour(const BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) ; void ApplyPlayBehaviour(const BehaviourSettingsPage::PlayBehaviour b, MimeData *mimedata) const; void CheckFullRescanRevisions(); diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp index 1cb84bb1..df699d80 100644 --- a/src/core/mpris2.cpp +++ b/src/core/mpris2.cpp @@ -226,11 +226,11 @@ void Mpris2::EmitNotification(const QString &name) { //------------------Root Interface--------------------------// -bool Mpris2::CanQuit() const { return true; } +bool Mpris2::CanQuit() { return true; } -bool Mpris2::CanRaise() const { return true; } +bool Mpris2::CanRaise() { return true; } -bool Mpris2::HasTrackList() const { return true; } +bool Mpris2::HasTrackList() { return true; } QString Mpris2::Identity() const { return app_name_; } @@ -250,7 +250,7 @@ QString Mpris2::DesktopEntryAbsolutePath() const { QString Mpris2::DesktopEntry() const { return desktop_file_; } -QStringList Mpris2::SupportedUriSchemes() const { +QStringList Mpris2::SupportedUriSchemes() { static QStringList res = QStringList() << "file" << "http" @@ -261,7 +261,7 @@ QStringList Mpris2::SupportedUriSchemes() const { } -QStringList Mpris2::SupportedMimeTypes() const { +QStringList Mpris2::SupportedMimeTypes() { static QStringList res = QStringList() << "x-content/audio-player" << "application/ogg" @@ -304,7 +304,7 @@ QString Mpris2::PlaybackStatus() const { return PlaybackStatus(app_->player()->GetState()); } -QString Mpris2::PlaybackStatus(Engine::State state) const { +QString Mpris2::PlaybackStatus(Engine::State state) { switch (state) { case Engine::Playing: return "Playing"; @@ -347,7 +347,7 @@ void Mpris2::SetLoopStatus(const QString &value) { } -double Mpris2::Rate() const { return 1.0; } +double Mpris2::Rate() { return 1.0; } void Mpris2::SetRate(double rate) { @@ -418,9 +418,9 @@ qint64 Mpris2::Position() const { return app_->player()->engine()->position_nanosec() / kNsecPerUsec; } -double Mpris2::MaximumRate() const { return 1.0; } +double Mpris2::MaximumRate() { return 1.0; } -double Mpris2::MinimumRate() const { return 1.0; } +double Mpris2::MinimumRate() { return 1.0; } bool Mpris2::CanGoNext() const { return app_->playlist_manager()->active() && app_->playlist_manager()->active()->next_row() != -1; @@ -445,7 +445,7 @@ bool Mpris2::CanSeek(Engine::State state) const { return app_->player()->GetCurrentItem() && state != Engine::Empty && !app_->player()->GetCurrentItem()->Metadata().is_stream(); } -bool Mpris2::CanControl() const { return true; } +bool Mpris2::CanControl() { return true; } void Mpris2::Next() { if (CanGoNext()) { @@ -503,14 +503,14 @@ void Mpris2::OpenUri(const QString &uri) { app_->playlist_manager()->active()->InsertUrls(QList() << QUrl(uri), -1, true); } -Track_Ids Mpris2::Tracks() const { +Track_Ids Mpris2::Tracks() { // TODO return Track_Ids(); } -bool Mpris2::CanEditTracks() const { return false; } +bool Mpris2::CanEditTracks() { return false; } -TrackMetadata Mpris2::GetTracksMetadata(const Track_Ids &tracks) const { +TrackMetadata Mpris2::GetTracksMetadata(const Track_Ids &tracks) { Q_UNUSED(tracks); @@ -543,7 +543,7 @@ quint32 Mpris2::PlaylistCount() const { return app_->playlist_manager()->GetAllPlaylists().size(); } -QStringList Mpris2::Orderings() const { return QStringList() << "User"; } +QStringList Mpris2::Orderings() { return QStringList() << "User"; } namespace { diff --git a/src/core/mpris2.h b/src/core/mpris2.h index 50695119..871a941c 100644 --- a/src/core/mpris2.h +++ b/src/core/mpris2.h @@ -118,13 +118,13 @@ class Mpris2 : public QObject { Q_PROPERTY(MaybePlaylist ActivePlaylist READ ActivePlaylist) // Root Properties - bool CanQuit() const; - bool CanRaise() const; - bool HasTrackList() const; + static bool CanQuit(); + static bool CanRaise(); + static bool HasTrackList(); QString Identity() const; QString DesktopEntry() const; - QStringList SupportedUriSchemes() const; - QStringList SupportedMimeTypes() const; + static QStringList SupportedUriSchemes(); + static QStringList SupportedMimeTypes(); // Root Properties added in MPRIS 2.2 bool CanSetFullscreen() const { return false; } @@ -133,13 +133,13 @@ class Mpris2 : public QObject { // Methods void Raise(); - void Quit(); + static void Quit(); // Player Properties QString PlaybackStatus() const; QString LoopStatus() const; void SetLoopStatus(const QString &value); - double Rate() const; + static double Rate(); void SetRate(double rate); bool Shuffle() const; void SetShuffle(bool enable); @@ -147,14 +147,14 @@ class Mpris2 : public QObject { double Volume() const; void SetVolume(double value); qint64 Position() const; - double MaximumRate() const; - double MinimumRate() const; + static double MaximumRate(); + static double MinimumRate(); bool CanGoNext() const; bool CanGoPrevious() const; bool CanPlay() const; bool CanPause() const; bool CanSeek() const; - bool CanControl() const; + static bool CanControl(); // Methods void Next(); @@ -168,18 +168,18 @@ class Mpris2 : public QObject { void OpenUri(const QString &uri); // TrackList Properties - Track_Ids Tracks() const; - bool CanEditTracks() const; + static Track_Ids Tracks(); + static bool CanEditTracks(); // Methods - TrackMetadata GetTracksMetadata(const Track_Ids &tracks) const; - void AddTrack(const QString &uri, const QDBusObjectPath &afterTrack, bool setAsCurrent); - void RemoveTrack(const QDBusObjectPath &trackId); - void GoTo(const QDBusObjectPath &trackId); + static TrackMetadata GetTracksMetadata(const Track_Ids &tracks) ; + static void AddTrack(const QString &uri, const QDBusObjectPath &afterTrack, bool setAsCurrent); + static void RemoveTrack(const QDBusObjectPath &trackId); + static void GoTo(const QDBusObjectPath &trackId); // Playlist Properties quint32 PlaylistCount() const; - QStringList Orderings() const; + static QStringList Orderings(); MaybePlaylist ActivePlaylist() const; // Methods @@ -215,10 +215,10 @@ class Mpris2 : public QObject { private: void EmitNotification(const QString &name); - void EmitNotification(const QString &name, const QVariant &val); - void EmitNotification(const QString &name, const QVariant &val, const QString &mprisEntity); + static void EmitNotification(const QString &name, const QVariant &val); + static void EmitNotification(const QString &name, const QVariant &val, const QString &mprisEntity); - QString PlaybackStatus(Engine::State state) const; + static QString PlaybackStatus(Engine::State state) ; QString current_track_id() const; diff --git a/src/core/song.cpp b/src/core/song.cpp index 58de9f57..a278275e 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -414,7 +414,7 @@ void Song::set_artist_id(const QString &v) { d->artist_id_ = v; } void Song::set_album_id(const QString &v) { d->album_id_ = v; } void Song::set_song_id(const QString &v) { d->song_id_ = v; } -QString Song::sortable(const QString &v) const { +QString Song::sortable(const QString &v) { QString copy = v.toLower(); diff --git a/src/core/song.h b/src/core/song.h index 33f43747..f0645040 100644 --- a/src/core/song.h +++ b/src/core/song.h @@ -388,7 +388,7 @@ class Song { private: struct Private; - QString sortable(const QString &v) const; + static QString sortable(const QString &v) ; QSharedDataPointer d; }; diff --git a/src/core/stylesheetloader.cpp b/src/core/stylesheetloader.cpp index fa63b0d2..71e7ee1a 100644 --- a/src/core/stylesheetloader.cpp +++ b/src/core/stylesheetloader.cpp @@ -126,7 +126,7 @@ void StyleSheetLoader::UpdateStyleSheet(QWidget *widget, StyleSheetData styledat } -void StyleSheetLoader::ReplaceColor(QString *css, const QString &name, const QPalette &palette, QPalette::ColorRole role) const { +void StyleSheetLoader::ReplaceColor(QString *css, const QString &name, const QPalette &palette, QPalette::ColorRole role) { css->replace("%palette-" + name + "-lighter", palette.color(role).lighter().name(), Qt::CaseInsensitive); css->replace("%palette-" + name + "-darker", palette.color(role).darker().name(), Qt::CaseInsensitive); diff --git a/src/core/stylesheetloader.h b/src/core/stylesheetloader.h index e72ce1d9..cdffbc4e 100644 --- a/src/core/stylesheetloader.h +++ b/src/core/stylesheetloader.h @@ -59,7 +59,7 @@ class StyleSheetLoader : public QObject { private: void UpdateStyleSheet(QWidget *widget, StyleSheetData styledata); - void ReplaceColor(QString *css, const QString &name, const QPalette &palette, QPalette::ColorRole role) const; + static void ReplaceColor(QString *css, const QString &name, const QPalette &palette, QPalette::ColorRole role); private slots: void ResetCounters(); diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h index 82599406..f44824ea 100644 --- a/src/covermanager/albumcoverchoicecontroller.h +++ b/src/covermanager/albumcoverchoicecontroller.h @@ -160,7 +160,7 @@ class AlbumCoverChoiceController : public QWidget { void AutomaticCoverSearchDone(); private: - QString GetInitialPathForFileDialog(const Song &song, const QString &filename); + static QString GetInitialPathForFileDialog(const Song &song, const QString &filename); static bool IsKnownImageExtension(const QString &suffix); static QSet *sImageExtensions; diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp index 0764e3f2..12170eb9 100644 --- a/src/covermanager/albumcoverfetchersearch.cpp +++ b/src/covermanager/albumcoverfetchersearch.cpp @@ -371,7 +371,7 @@ void AlbumCoverFetcherSearch::ProviderCoverFetchFinished(QNetworkReply *reply) { } -float AlbumCoverFetcherSearch::ScoreImage(const QSize size) const { +float AlbumCoverFetcherSearch::ScoreImage(const QSize size) { if (size.width() == 0 || size.height() == 0) return 0.0; diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h index 207a82b9..b9cd1ce5 100644 --- a/src/covermanager/albumcoverfetchersearch.h +++ b/src/covermanager/albumcoverfetchersearch.h @@ -81,7 +81,7 @@ class AlbumCoverFetcherSearch : public QObject { void AllProvidersFinished(); void FetchMoreImages(); - float ScoreImage(const QSize size) const; + static float ScoreImage(const QSize size) ; void SendBestImage(); static bool ProviderCompareOrder(CoverProvider *a, CoverProvider *b); diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h index dc63a657..983b7df3 100644 --- a/src/covermanager/albumcoverloader.h +++ b/src/covermanager/albumcoverloader.h @@ -67,7 +67,7 @@ class AlbumCoverLoader : public QObject { static QString AlbumCoverFilename(QString artist, QString album, const QString &extension); - QString CoverFilenameFromSource(const Song::Source source, const QUrl &cover_url, const QString &artist, const QString &album, const QString &album_id, const QString &extension); + static QString CoverFilenameFromSource(const Song::Source source, const QUrl &cover_url, const QString &artist, const QString &album, const QString &album_id, const QString &extension); QString CoverFilenameFromVariable(const QString &artist, const QString &album, const QString &extension = QString()); QString CoverFilePath(const Song &song, const QString &album_dir, const QUrl &cover_url, const QString &extension = QString()); diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h index 5eb9d344..fff569b8 100644 --- a/src/covermanager/albumcovermanager.h +++ b/src/covermanager/albumcovermanager.h @@ -133,7 +133,7 @@ class AlbumCoverManager : public QMainWindow { Song GetFirstSelectedAsSong(); Song ItemAsSong(QListWidgetItem *item) { return ItemAsSong(static_cast(item)); } - Song ItemAsSong(AlbumItem *item); + static Song ItemAsSong(AlbumItem *item); void UpdateStatusText(); bool ShouldHide(const AlbumItem &item, const QString &filter, HideCovers hide) const; diff --git a/src/covermanager/lastfmcoverprovider.h b/src/covermanager/lastfmcoverprovider.h index 1f44b540..67f06c52 100644 --- a/src/covermanager/lastfmcoverprovider.h +++ b/src/covermanager/lastfmcoverprovider.h @@ -57,7 +57,7 @@ class LastFmCoverProvider : public JsonCoverProvider { }; QByteArray GetReplyData(QNetworkReply *reply); - LastFmImageSize ImageSizeFromString(const QString &size); + static LastFmImageSize ImageSizeFromString(const QString &size); void Error(const QString &error, const QVariant &debug = QVariant()) override; private: diff --git a/src/device/udisks2lister.h b/src/device/udisks2lister.h index f1359e38..c8483ed7 100644 --- a/src/device/udisks2lister.h +++ b/src/device/udisks2lister.h @@ -79,7 +79,7 @@ class Udisks2Lister : public DeviceLister { private: bool isPendingJob(const QDBusObjectPath &job_path); void RemoveDevice(const QDBusObjectPath &device_path); - QList GetMountedPartitionsFromDBusArgument(const QDBusArgument &input); + static QList GetMountedPartitionsFromDBusArgument(const QDBusArgument &input); struct Udisks2Job { Udisks2Job(); @@ -114,7 +114,7 @@ class Udisks2Lister : public DeviceLister { QStringList mount_paths; }; - PartitionData ReadPartitionData(const QDBusObjectPath &path); + static PartitionData ReadPartitionData(const QDBusObjectPath &path); void HandleFinishedMountJob(const Udisks2Lister::PartitionData &partition_data); void HandleFinishedUnmountJob(const Udisks2Lister::PartitionData &partition_data, const QDBusObjectPath &mounted_object); diff --git a/src/dialogs/about.cpp b/src/dialogs/about.cpp index e9267794..dc10332d 100644 --- a/src/dialogs/about.cpp +++ b/src/dialogs/about.cpp @@ -190,7 +190,7 @@ QString About::ContributorsHtml() const { } -QString About::PersonToHtml(const Person &person) const { +QString About::PersonToHtml(const Person &person) { if (person.email.isNull()) return person.name; diff --git a/src/dialogs/about.h b/src/dialogs/about.h index 5ed3ad71..40635254 100644 --- a/src/dialogs/about.h +++ b/src/dialogs/about.h @@ -49,7 +49,7 @@ class About : public QDialog { QString MainHtml() const; QString ContributorsHtml() const; - QString PersonToHtml(const Person &person) const; + static QString PersonToHtml(const Person &person) ; private: Ui::About ui_; diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp index 7db003e5..5bcc92bd 100644 --- a/src/dialogs/edittagdialog.cpp +++ b/src/dialogs/edittagdialog.cpp @@ -379,7 +379,7 @@ bool EditTagDialog::SetLoading(const QString &message) { } -QList EditTagDialog::LoadData(const SongList &songs) const { +QList EditTagDialog::LoadData(const SongList &songs) { QList ret; @@ -410,11 +410,7 @@ void EditTagDialog::SetSongs(const SongList &s, const PlaylistItemList &items) { collection_songs_.clear(); // Reload tags in the background -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - QFuture> future = QtConcurrent::run(&EditTagDialog::LoadData, this, s); -#else - QFuture> future = QtConcurrent::run(this, &EditTagDialog::LoadData, s); -#endif + QFuture> future = QtConcurrent::run(&EditTagDialog::LoadData, s); QFutureWatcher> *watcher = new QFutureWatcher>(); QObject::connect(watcher, &QFutureWatcher>::finished, this, &EditTagDialog::SetSongsFinished); watcher->setFuture(future); diff --git a/src/dialogs/edittagdialog.h b/src/dialogs/edittagdialog.h index 79609008..9ab1b998 100644 --- a/src/dialogs/edittagdialog.h +++ b/src/dialogs/edittagdialog.h @@ -160,7 +160,7 @@ class EditTagDialog : public QDialog { void UpdateSummaryTab(const Song &song, const UpdateCoverAction cover_action); void UpdateStatisticsTab(const Song &song); - QString GetArtSummary(const Song &song, const UpdateCoverAction cover_action); + static QString GetArtSummary(const Song &song, const UpdateCoverAction cover_action); void UpdateUI(const QModelIndexList &indexes); @@ -168,7 +168,7 @@ class EditTagDialog : public QDialog { void SetSongListVisibility(bool visible); // Called by QtConcurrentRun - QList LoadData(const SongList &songs) const; + static QList LoadData(const SongList &songs); void SaveData(); static void SetText(QLabel *label, const int value, const QString &suffix, const QString &def = QString()); diff --git a/src/dialogs/trackselectiondialog.cpp b/src/dialogs/trackselectiondialog.cpp index 93c22b04..b7ede22a 100644 --- a/src/dialogs/trackselectiondialog.cpp +++ b/src/dialogs/trackselectiondialog.cpp @@ -228,7 +228,7 @@ void TrackSelectionDialog::AddDivider(const QString &text, QTreeWidget *parent) } -void TrackSelectionDialog::AddSong(const Song &song, int result_index, QTreeWidget *parent) const { +void TrackSelectionDialog::AddSong(const Song &song, int result_index, QTreeWidget *parent) { QStringList values; values << ((song.track() > 0) ? QString::number(song.track()) : QString()) << ((song.year() > 0) ? QString::number(song.year()) : QString()) << song.title() << song.artist() << song.album(); diff --git a/src/dialogs/trackselectiondialog.h b/src/dialogs/trackselectiondialog.h index 4db82744..4223fd22 100644 --- a/src/dialogs/trackselectiondialog.h +++ b/src/dialogs/trackselectiondialog.h @@ -80,7 +80,7 @@ class TrackSelectionDialog : public QDialog { }; void AddDivider(const QString &text, QTreeWidget *parent) const; - void AddSong(const Song &song, int result_index, QTreeWidget *parent) const; + static void AddSong(const Song &song, int result_index, QTreeWidget *parent) ; void SetLoading(const QString &message); static void SaveData(const QList &data); diff --git a/src/engine/chromaprinter.h b/src/engine/chromaprinter.h index 07b09793..5ebb0de0 100644 --- a/src/engine/chromaprinter.h +++ b/src/engine/chromaprinter.h @@ -47,7 +47,7 @@ class Chromaprinter { QString CreateFingerprint(); private: - GstElement *CreateElement(const QString &factory_name, GstElement *bin = nullptr); + static GstElement *CreateElement(const QString &factory_name, GstElement *bin = nullptr); static void NewPadCallback(GstElement*, GstPad *pad, gpointer data); static GstFlowReturn NewBufferCallback(GstAppSink *app_sink, gpointer self); diff --git a/src/engine/gstelementdeleter.h b/src/engine/gstelementdeleter.h index 3067d575..f78110b3 100644 --- a/src/engine/gstelementdeleter.h +++ b/src/engine/gstelementdeleter.h @@ -41,7 +41,7 @@ class GstElementDeleter : public QObject { void DeleteElementLater(GstElement *element); private slots: - void DeleteElement(GstElement *element); + static void DeleteElement(GstElement *element); }; #endif // GSTELEMENTDELETER_H diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index 245b17b5..79c1bfd1 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -985,7 +985,7 @@ void GstEnginePipeline::TagMessageReceived(GstMessage *msg) { } -QString GstEnginePipeline::ParseStrTag(GstTagList *list, const char *tag) const { +QString GstEnginePipeline::ParseStrTag(GstTagList *list, const char *tag) { gchar *data = nullptr; bool success = gst_tag_list_get_string(list, tag, &data); @@ -999,7 +999,7 @@ QString GstEnginePipeline::ParseStrTag(GstTagList *list, const char *tag) const } -guint GstEnginePipeline::ParseUIntTag(GstTagList *list, const char *tag) const { +guint GstEnginePipeline::ParseUIntTag(GstTagList *list, const char *tag) { guint data = 0; bool success = gst_tag_list_get_uint(list, tag, &data); diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index cbb6a3d9..37b44a23 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -161,8 +161,8 @@ class GstEnginePipeline : public QObject { void StreamStatusMessageReceived(GstMessage*); void StreamStartMessageReceived(); - QString ParseStrTag(GstTagList *list, const char *tag) const; - guint ParseUIntTag(GstTagList *list, const char *tag) const; + static QString ParseStrTag(GstTagList *list, const char *tag); + static guint ParseUIntTag(GstTagList *list, const char *tag); void UpdateVolume(); void UpdateStereoBalance(); diff --git a/src/engine/gststartup.cpp b/src/engine/gststartup.cpp index 1cfd5e2e..0a6e458a 100644 --- a/src/engine/gststartup.cpp +++ b/src/engine/gststartup.cpp @@ -62,11 +62,7 @@ gpointer GstStartup::GLibMainLoopThreadFunc(gpointer) { GstStartup::GstStartup(QObject *parent) : QObject(parent) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - initializing_ = QtConcurrent::run(&GstStartup::InitializeGStreamer, this); -#else - initializing_ = QtConcurrent::run(this, &GstStartup::InitializeGStreamer); -#endif + initializing_ = QtConcurrent::run(&GstStartup::InitializeGStreamer); const QMetaObject *mo = QAbstractEventDispatcher::instance(qApp->thread())->metaObject(); if (mo && strcmp(mo->className(), "QEventDispatcherGlib") != 0 && strcmp(mo->superClass()->className(), "QEventDispatcherGlib") != 0) { diff --git a/src/engine/gststartup.h b/src/engine/gststartup.h index dff5e289..ac0fd36a 100644 --- a/src/engine/gststartup.h +++ b/src/engine/gststartup.h @@ -42,8 +42,8 @@ class GstStartup : public QObject { static GThread *kGThread; static gpointer GLibMainLoopThreadFunc(gpointer); - void InitializeGStreamer(); - void SetEnvironment(); + static void InitializeGStreamer(); + static void SetEnvironment(); QFuture initializing_; diff --git a/src/engine/vlcengine.h b/src/engine/vlcengine.h index e959b217..77a05eba 100644 --- a/src/engine/vlcengine.h +++ b/src/engine/vlcengine.h @@ -75,7 +75,7 @@ class VLCEngine : public Engine::Base { bool Initialized() const { return (instance_ && player_); } uint position() const; uint length() const; - bool CanDecode(const QUrl &url); + static bool CanDecode(const QUrl &url); void AttachCallback(libvlc_event_manager_t *em, libvlc_event_type_t type, libvlc_callback_t callback); static void StateChangedCallback(const libvlc_event_t *e, void *data); diff --git a/src/globalshortcuts/globalshortcut.h b/src/globalshortcuts/globalshortcut.h index 1cff3945..edf647f3 100644 --- a/src/globalshortcuts/globalshortcut.h +++ b/src/globalshortcuts/globalshortcut.h @@ -53,13 +53,13 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter { private: - void activateShortcut(quint32 native_key, quint32 native_mods); + static void activateShortcut(quint32 native_key, quint32 native_mods); - quint32 nativeModifiers(Qt::KeyboardModifiers qt_mods); - quint32 nativeKeycode(Qt::Key qt_keycode); + static quint32 nativeModifiers(Qt::KeyboardModifiers qt_mods); + static quint32 nativeKeycode(Qt::Key qt_keycode); - bool registerShortcut(quint32 native_key, quint32 native_mods); - bool unregisterShortcut(quint32 native_key, quint32 native_mods); + static bool registerShortcut(quint32 native_key, quint32 native_mods); + static bool unregisterShortcut(quint32 native_key, quint32 native_mods); #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool nativeEventFilter(const QByteArray &eventtype, void *message, qintptr *result) override; diff --git a/src/globalshortcuts/globalshortcutsmanager.cpp b/src/globalshortcuts/globalshortcutsmanager.cpp index 4ba11b9d..7f51ec40 100644 --- a/src/globalshortcuts/globalshortcutsmanager.cpp +++ b/src/globalshortcuts/globalshortcutsmanager.cpp @@ -179,7 +179,7 @@ bool GlobalShortcutsManager::IsMateAvailable() const { } -bool GlobalShortcutsManager::IsX11Available() const { +bool GlobalShortcutsManager::IsX11Available() { return QApplication::platformName() == "xcb"; @@ -212,7 +212,7 @@ void GlobalShortcutsManager::Unregister() { } -bool GlobalShortcutsManager::IsMacAccessibilityEnabled() const { +bool GlobalShortcutsManager::IsMacAccessibilityEnabled() { #ifdef Q_OS_MACOS if (system_backend_) return qobject_cast(system_backend_)->IsAccessibilityEnabled(); else return false; diff --git a/src/globalshortcuts/globalshortcutsmanager.h b/src/globalshortcuts/globalshortcutsmanager.h index 73eb0fcb..e1af6bfe 100644 --- a/src/globalshortcuts/globalshortcutsmanager.h +++ b/src/globalshortcuts/globalshortcutsmanager.h @@ -52,10 +52,10 @@ class GlobalShortcutsManager : public QWidget { QMap shortcuts() const { return shortcuts_; } bool IsKdeAvailable() const; - bool IsX11Available() const; + static bool IsX11Available() ; bool IsGnomeAvailable() const; bool IsMateAvailable() const; - bool IsMacAccessibilityEnabled() const; + static bool IsMacAccessibilityEnabled() ; public slots: void ReloadSettings(); diff --git a/src/moodbar/moodbarproxystyle.h b/src/moodbar/moodbarproxystyle.h index 690df2aa..010eda23 100644 --- a/src/moodbar/moodbarproxystyle.h +++ b/src/moodbar/moodbarproxystyle.h @@ -80,7 +80,7 @@ class MoodbarProxyStyle : public QProxyStyle { void DrawArrow(const QStyleOptionSlider *option, QPainter *painter) const; void ShowContextMenu(const QPoint pos); - QPixmap MoodbarPixmap(const ColorVector &colors, const QSize size, const QPalette &palette, const QStyleOptionSlider *opt); + static QPixmap MoodbarPixmap(const ColorVector &colors, const QSize size, const QPalette &palette, const QStyleOptionSlider *opt); private slots: void ReloadSettings(); diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h index 0d445b72..c7b26a0d 100644 --- a/src/musicbrainz/musicbrainzclient.h +++ b/src/musicbrainz/musicbrainzclient.h @@ -189,7 +189,7 @@ class MusicBrainzClient : public QObject { ResultList results_; }; - QByteArray GetReplyData(QNetworkReply *reply, QString &error); + static QByteArray GetReplyData(QNetworkReply *reply, QString &error); static bool MediumHasDiscid(const QString &discid, QXmlStreamReader *reader); static ResultList ParseMedium(QXmlStreamReader *reader); static Result ParseTrackFromDisc(QXmlStreamReader *reader); @@ -197,7 +197,7 @@ class MusicBrainzClient : public QObject { static void ParseArtist(QXmlStreamReader *reader, QString *artist); static Release ParseRelease(QXmlStreamReader *reader); static ResultList UniqueResults(const ResultList &results, UniqueResultsSortOption opt = SortResults); - void Error(const QString &error, const QVariant &debug = QVariant()); + static void Error(const QString &error, const QVariant &debug = QVariant()); private: diff --git a/src/organize/organizedialog.cpp b/src/organize/organizedialog.cpp index ecf9facc..f9e5f4a5 100644 --- a/src/organize/organizedialog.cpp +++ b/src/organize/organizedialog.cpp @@ -390,11 +390,7 @@ bool OrganizeDialog::SetUrls(const QList &urls) { bool OrganizeDialog::SetFilenames(const QStringList &filenames) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - songs_future_ = QtConcurrent::run(&OrganizeDialog::LoadSongsBlocking, this, filenames); -#else - songs_future_ = QtConcurrent::run(this, &OrganizeDialog::LoadSongsBlocking, filenames); -#endif + songs_future_ = QtConcurrent::run(&OrganizeDialog::LoadSongsBlocking, filenames); QFutureWatcher *watcher = new QFutureWatcher(); QObject::connect(watcher, &QFutureWatcher::finished, this, [this, watcher]() { SetSongs(watcher->result()); diff --git a/src/organize/organizedialog.h b/src/organize/organizedialog.h index d39ae7ea..75d04d60 100644 --- a/src/organize/organizedialog.h +++ b/src/organize/organizedialog.h @@ -83,7 +83,7 @@ class OrganizeDialog : public QDialog { void LoadSettings(); void AdjustSize(); - SongList LoadSongsBlocking(const QStringList &filenames); + static SongList LoadSongsBlocking(const QStringList &filenames); void SetLoadingSongs(const bool loading); signals: diff --git a/src/osd/osdpretty.cpp b/src/osd/osdpretty.cpp index 834ef644..6a92ff17 100644 --- a/src/osd/osdpretty.cpp +++ b/src/osd/osdpretty.cpp @@ -529,7 +529,7 @@ void OSDPretty::mouseReleaseEvent(QMouseEvent *) { } -QScreen *OSDPretty::current_screen(const QPoint pos) const { +QScreen *OSDPretty::current_screen(const QPoint pos) { QScreen *screen(nullptr); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) diff --git a/src/osd/osdpretty.h b/src/osd/osdpretty.h index d4160553..b4538152 100644 --- a/src/osd/osdpretty.h +++ b/src/osd/osdpretty.h @@ -97,7 +97,7 @@ class OSDPretty : public QWidget { // When the user has been moving the popup, use these to get its current position and screen. // Note that these return invalid values if the popup is hidden. QScreen *current_screen() const; - QScreen *current_screen(const QPoint pos) const; + static QScreen *current_screen(const QPoint pos); QPoint current_pos() const; // QWidget diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp index 1c72dabd..c0a56c51 100644 --- a/src/playlist/playlistdelegates.cpp +++ b/src/playlist/playlistdelegates.cpp @@ -104,7 +104,7 @@ void QueuedItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op } -void QueuedItemDelegate::DrawBox(QPainter *painter, const QRect line_rect, const QFont &font, const QString &text, int width, const float opacity) const { +void QueuedItemDelegate::DrawBox(QPainter *painter, const QRect line_rect, const QFont &font, const QString &text, int width, const float opacity) { QFont smaller = font; smaller.setPointSize(smaller.pointSize() - 1); diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h index 191837bd..9e966527 100644 --- a/src/playlist/playlistdelegates.h +++ b/src/playlist/playlistdelegates.h @@ -62,7 +62,7 @@ class QueuedItemDelegate : public QStyledItemDelegate { explicit QueuedItemDelegate(QObject *parent, int indicator_column = Playlist::Column_Title); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const override; - void DrawBox(QPainter *painter, const QRect line_rect, const QFont &font, const QString &idx, int width = -1, const float opacity = 1.0) const; + static void DrawBox(QPainter *painter, const QRect line_rect, const QFont &font, const QString &text, int width = -1, const float opacity = 1.0) ; int queue_indicator_size(const QModelIndex &idx) const; diff --git a/src/playlist/playlistfilterparser.cpp b/src/playlist/playlistfilterparser.cpp index 7ee5d104..fff2e70a 100644 --- a/src/playlist/playlistfilterparser.cpp +++ b/src/playlist/playlistfilterparser.cpp @@ -530,7 +530,7 @@ FilterTree *FilterParser::createSearchTermTreeNode(const QString &col, const QSt // "225" is parsed to "225" (srsly! ^.^) // "2:3:4:5" is parsed to "2:3:4:5" // "25m" is parsed to "25m" -int FilterParser::parseTime(const QString &time_str) const { +int FilterParser::parseTime(const QString &time_str) { int seconds = 0; int accum = 0; diff --git a/src/playlist/playlistfilterparser.h b/src/playlist/playlistfilterparser.h index 8b7a82bd..1cc0141e 100644 --- a/src/playlist/playlistfilterparser.h +++ b/src/playlist/playlistfilterparser.h @@ -88,7 +88,7 @@ class FilterParser { FilterTree *parseSearchTerm(); FilterTree *createSearchTermTreeNode(const QString &col, const QString &prefix, const QString &search) const; - int parseTime(const QString &time_str) const; + static int parseTime(const QString &time_str) ; QString::const_iterator iter_; QString::const_iterator end_; diff --git a/src/playlist/playlistlistmodel.cpp b/src/playlist/playlistlistmodel.cpp index f3a990d0..9bb8da1c 100644 --- a/src/playlist/playlistlistmodel.cpp +++ b/src/playlist/playlistlistmodel.cpp @@ -56,7 +56,7 @@ bool PlaylistListModel::dropMimeData(const QMimeData *data, Qt::DropAction actio } -QString PlaylistListModel::ItemPath(const QStandardItem *item) const { +QString PlaylistListModel::ItemPath(const QStandardItem *item) { QStringList components; diff --git a/src/playlist/playlistlistmodel.h b/src/playlist/playlistlistmodel.h index d66a71a4..c9edd803 100644 --- a/src/playlist/playlistlistmodel.h +++ b/src/playlist/playlistlistmodel.h @@ -60,7 +60,7 @@ class PlaylistListModel : public QStandardItemModel { // Walks from the given item to the root, returning the / separated path of // all the parent folders. The path includes this item if it is a folder. - QString ItemPath(const QStandardItem *item) const; + static QString ItemPath(const QStandardItem *item) ; // Finds the playlist with the given ID, returns 0 if it doesn't exist. QStandardItem *PlaylistById(const int id) const; diff --git a/src/playlistparsers/cueparser.cpp b/src/playlistparsers/cueparser.cpp index 539f6194..57e8946e 100644 --- a/src/playlistparsers/cueparser.cpp +++ b/src/playlistparsers/cueparser.cpp @@ -267,7 +267,7 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const // This and the kFileLineRegExp do most of the "dirty" work, namely: splitting the raw .cue // line into logical parts and getting rid of all the unnecessary whitespaces and quoting. -QStringList CueParser::SplitCueLine(const QString &line) const { +QStringList CueParser::SplitCueLine(const QString &line) { QRegularExpression line_regexp(kFileLineRegExp); QRegularExpressionMatch re_match = line_regexp.match(line.trimmed()); @@ -281,7 +281,7 @@ QStringList CueParser::SplitCueLine(const QString &line) const { } // Updates the song with data from the .cue entry. This one mustn't be used for the last song in the .cue file. -bool CueParser::UpdateSong(const CueEntry &entry, const QString &next_index, Song *song) const { +bool CueParser::UpdateSong(const CueEntry &entry, const QString &next_index, Song *song) { qint64 beginning = IndexToMarker(entry.index); qint64 end = IndexToMarker(next_index); @@ -307,7 +307,7 @@ bool CueParser::UpdateSong(const CueEntry &entry, const QString &next_index, Son } // Updates the song with data from the .cue entry. This one must be used only for the last song in the .cue file. -bool CueParser::UpdateLastSong(const CueEntry &entry, Song *song) const { +bool CueParser::UpdateLastSong(const CueEntry &entry, Song *song) { qint64 beginning = IndexToMarker(entry.index); @@ -338,7 +338,7 @@ bool CueParser::UpdateLastSong(const CueEntry &entry, Song *song) const { } -qint64 CueParser::IndexToMarker(const QString &index) const { +qint64 CueParser::IndexToMarker(const QString &index) { QRegularExpression index_regexp(kIndexRegExp); QRegularExpressionMatch re_match = index_regexp.match(index); diff --git a/src/playlistparsers/cueparser.h b/src/playlistparsers/cueparser.h index d017bb79..4012d113 100644 --- a/src/playlistparsers/cueparser.h +++ b/src/playlistparsers/cueparser.h @@ -96,11 +96,11 @@ class CueParser : public ParserBase { file(_file), index(_index), title(_title), artist(_artist), album_artist(_album_artist), album(_album), composer(_composer), album_composer(_album_composer), genre(_genre), date(_date), disc(_disc) {} }; - bool UpdateSong(const CueEntry &entry, const QString &next_index, Song *song) const; - bool UpdateLastSong(const CueEntry &entry, Song *song) const; + static bool UpdateSong(const CueEntry &entry, const QString &next_index, Song *song) ; + static bool UpdateLastSong(const CueEntry &entry, Song *song) ; - QStringList SplitCueLine(const QString &line) const; - qint64 IndexToMarker(const QString &index) const; + static QStringList SplitCueLine(const QString &line); + static qint64 IndexToMarker(const QString &index); }; #endif // CUEPARSER_H diff --git a/src/playlistparsers/m3uparser.cpp b/src/playlistparsers/m3uparser.cpp index 6ba3605b..6ceefae0 100644 --- a/src/playlistparsers/m3uparser.cpp +++ b/src/playlistparsers/m3uparser.cpp @@ -99,7 +99,7 @@ SongList M3UParser::Load(QIODevice *device, const QString &playlist_path, const } -bool M3UParser::ParseMetadata(const QString &line, M3UParser::Metadata *metadata) const { +bool M3UParser::ParseMetadata(const QString &line, M3UParser::Metadata *metadata) { // Extended info, eg. // #EXTINF:123,Sample Artist - Sample title diff --git a/src/playlistparsers/m3uparser.h b/src/playlistparsers/m3uparser.h index 68504607..f4a2f150 100644 --- a/src/playlistparsers/m3uparser.h +++ b/src/playlistparsers/m3uparser.h @@ -66,7 +66,7 @@ class M3UParser : public ParserBase { qint64 length; }; - bool ParseMetadata(const QString &line, Metadata *metadata) const; + static bool ParseMetadata(const QString &line, Metadata *metadata) ; }; diff --git a/src/playlistparsers/parserbase.cpp b/src/playlistparsers/parserbase.cpp index d56c4505..46e8dde1 100644 --- a/src/playlistparsers/parserbase.cpp +++ b/src/playlistparsers/parserbase.cpp @@ -100,7 +100,7 @@ Song ParserBase::LoadSong(const QString &filename_or_url, const qint64 beginning } -QString ParserBase::URLOrFilename(const QUrl &url, const QDir &dir, Playlist::Path path_type) const { +QString ParserBase::URLOrFilename(const QUrl &url, const QDir &dir, Playlist::Path path_type) { if (!url.isLocalFile()) return url.toString(); diff --git a/src/playlistparsers/parserbase.h b/src/playlistparsers/parserbase.h index 409be9e0..874d0cc9 100644 --- a/src/playlistparsers/parserbase.h +++ b/src/playlistparsers/parserbase.h @@ -67,7 +67,7 @@ class ParserBase : public QObject { // If the URL is a file:// URL then returns its path, absolute or relative to the directory depending on the path_type option. // Otherwise returns the URL as is. This function should always be used when saving a playlist. - QString URLOrFilename(const QUrl &url, const QDir &dir, Playlist::Path path_type) const; + static QString URLOrFilename(const QUrl &url, const QDir &dir, Playlist::Path path_type) ; private: CollectionBackendInterface *collection_; diff --git a/src/playlistparsers/playlistparser.cpp b/src/playlistparsers/playlistparser.cpp index 3926c335..b7f663dd 100644 --- a/src/playlistparsers/playlistparser.cpp +++ b/src/playlistparsers/playlistparser.cpp @@ -100,7 +100,7 @@ QString PlaylistParser::filters() const { } -QString PlaylistParser::FilterForParser(const ParserBase *parser, QStringList *all_extensions) const { +QString PlaylistParser::FilterForParser(const ParserBase *parser, QStringList *all_extensions) { const QStringList file_extensions = parser->file_extensions(); QStringList extensions; diff --git a/src/playlistparsers/playlistparser.h b/src/playlistparsers/playlistparser.h index fc30da7f..a4f3ce34 100644 --- a/src/playlistparsers/playlistparser.h +++ b/src/playlistparsers/playlistparser.h @@ -61,7 +61,7 @@ class PlaylistParser : public QObject { void Save(const SongList &songs, const QString &filename, const Playlist::Path) const; private: - QString FilterForParser(const ParserBase *parser, QStringList *all_extensions = nullptr) const; + static QString FilterForParser(const ParserBase *parser, QStringList *all_extensions = nullptr) ; private: QList parsers_; diff --git a/src/playlistparsers/wplparser.cpp b/src/playlistparsers/wplparser.cpp index a0364e1b..66379dde 100644 --- a/src/playlistparsers/wplparser.cpp +++ b/src/playlistparsers/wplparser.cpp @@ -121,7 +121,7 @@ void WplParser::Save(const SongList &songs, QIODevice *device, const QDir &dir, } } -void WplParser::WriteMeta(const QString &name, const QString &content, QXmlStreamWriter *writer) const { +void WplParser::WriteMeta(const QString &name, const QString &content, QXmlStreamWriter *writer) { writer->writeStartElement("meta"); writer->writeAttribute("name", name); diff --git a/src/playlistparsers/wplparser.h b/src/playlistparsers/wplparser.h index b73ff625..66844f37 100644 --- a/src/playlistparsers/wplparser.h +++ b/src/playlistparsers/wplparser.h @@ -55,7 +55,7 @@ class WplParser : public XMLParser { private: void ParseSeq(const QDir &dir, QXmlStreamReader *reader, SongList *songs, const bool collection_search = true) const; - void WriteMeta(const QString &name, const QString &content, QXmlStreamWriter *writer) const; + static void WriteMeta(const QString &name, const QString &content, QXmlStreamWriter *writer) ; }; #endif // WPLPARSER_H diff --git a/src/qobuz/qobuzbaserequest.h b/src/qobuz/qobuzbaserequest.h index a2e28eea..8d8ae3dd 100644 --- a/src/qobuz/qobuzbaserequest.h +++ b/src/qobuz/qobuzbaserequest.h @@ -71,7 +71,7 @@ class QobuzBaseRequest : public QObject { QJsonValue ExtractItems(QJsonObject &json_obj); virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; - QString ErrorsToHTML(const QStringList &errors); + static QString ErrorsToHTML(const QStringList &errors); QString api_url() { return QString(kApiUrl); } QString app_id() { return service_->app_id(); } diff --git a/src/qobuz/qobuzfavoriterequest.h b/src/qobuz/qobuzfavoriterequest.h index 1cb5c203..d97ebc97 100644 --- a/src/qobuz/qobuzfavoriterequest.h +++ b/src/qobuz/qobuzfavoriterequest.h @@ -69,7 +69,7 @@ class QobuzFavoriteRequest : public QobuzBaseRequest { private: void Error(const QString &error, const QVariant &debug = QVariant()); - QString FavoriteText(const FavoriteType type); + static QString FavoriteText(const FavoriteType type); void AddFavorites(const FavoriteType type, const SongList &songs); void RemoveFavorites(const FavoriteType type, const SongList &songs); diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h index 96bfd190..7756f14a 100644 --- a/src/qobuz/qobuzrequest.h +++ b/src/qobuz/qobuzrequest.h @@ -139,7 +139,7 @@ class QobuzRequest : public QobuzBaseRequest { void AlbumCoverFinishCheck(); void FinishCheck(); - void Warn(const QString &error, const QVariant &debug = QVariant()); + static void Warn(const QString &error, const QVariant &debug = QVariant()); void Error(const QString &error, const QVariant &debug = QVariant()) override; static const int kMaxConcurrentArtistsRequests; diff --git a/src/settings/appearancesettingspage.h b/src/settings/appearancesettingspage.h index 6f3da4d9..e9f5d7fb 100644 --- a/src/settings/appearancesettingspage.h +++ b/src/settings/appearancesettingspage.h @@ -115,7 +115,7 @@ class AppearanceSettingsPage : public SettingsPage { private: // Set the widget's background to new_color - void UpdateColorSelectorColor(QWidget *color_selector, const QColor &new_color); + static void UpdateColorSelectorColor(QWidget *color_selector, const QColor &new_color); // Init (or refresh) the colorSelectors colors void InitColorSelectorsColors(); diff --git a/src/settings/contextsettingspage.h b/src/settings/contextsettingspage.h index 9a5c72e5..17f5c63b 100644 --- a/src/settings/contextsettingspage.h +++ b/src/settings/contextsettingspage.h @@ -65,7 +65,7 @@ public: private slots: void InsertVariableFirstLine(QAction *action); void InsertVariableSecondLine(QAction *action); - void ShowMenuTooltip(QAction *action); + static void ShowMenuTooltip(QAction *action); void HeadlineFontChanged(); void NormalFontChanged(); diff --git a/src/settings/settingspage.h b/src/settings/settingspage.h index f5cf7ea3..bf7588ea 100644 --- a/src/settings/settingspage.h +++ b/src/settings/settingspage.h @@ -67,8 +67,8 @@ class SettingsPage : public QWidget { void set_changed() { changed_ = true; } - void ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const QString &default_value); - void ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const int default_value); + static void ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const QString &default_value); + static void ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const int default_value); private: virtual void Save() = 0; diff --git a/src/smartplaylists/smartplaylistsmodel.cpp b/src/smartplaylists/smartplaylistsmodel.cpp index 0622c6d1..39734d79 100644 --- a/src/smartplaylists/smartplaylistsmodel.cpp +++ b/src/smartplaylists/smartplaylistsmodel.cpp @@ -243,7 +243,7 @@ void SmartPlaylistsModel::DeleteGenerator(const QModelIndex &idx) { } -void SmartPlaylistsModel::SaveGenerator(QSettings *s, const int i, PlaylistGeneratorPtr generator) const { +void SmartPlaylistsModel::SaveGenerator(QSettings *s, const int i, PlaylistGeneratorPtr generator) { s->setArrayIndex(i); s->setValue("name", generator->name()); diff --git a/src/smartplaylists/smartplaylistsmodel.h b/src/smartplaylists/smartplaylistsmodel.h index 118fb2ed..7ec8e092 100644 --- a/src/smartplaylists/smartplaylistsmodel.h +++ b/src/smartplaylists/smartplaylistsmodel.h @@ -80,7 +80,7 @@ class SmartPlaylistsModel : public SimpleTreeModel { static const char *kSmartPlaylistsMimeType; static const int kSmartPlaylistsVersion; - void SaveGenerator(QSettings *s, const int i, PlaylistGeneratorPtr generator) const; + static void SaveGenerator(QSettings *s, const int i, PlaylistGeneratorPtr generator); void ItemFromSmartPlaylist(const QSettings &s, const bool notify); private: diff --git a/src/subsonic/subsonicbaserequest.h b/src/subsonic/subsonicbaserequest.h index 0493cca3..9fca8a2d 100644 --- a/src/subsonic/subsonicbaserequest.h +++ b/src/subsonic/subsonicbaserequest.h @@ -59,7 +59,7 @@ class SubsonicBaseRequest : public QObject { QJsonObject ExtractJsonObj(QByteArray &data); virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; - QString ErrorsToHTML(const QStringList &errors); + static QString ErrorsToHTML(const QStringList &errors); QString client_name() const { return service_->client_name(); } QString api_version() const { return service_->api_version(); } diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h index 67f1a8fb..5485eda4 100644 --- a/src/subsonic/subsonicrequest.h +++ b/src/subsonic/subsonicrequest.h @@ -108,7 +108,7 @@ class SubsonicRequest : public SubsonicBaseRequest { void AlbumCoverFinishCheck(); void FinishCheck(); - void Warn(const QString &error, const QVariant &debug = QVariant()); + static void Warn(const QString &error, const QVariant &debug = QVariant()); void Error(const QString &error, const QVariant &debug = QVariant()) override; static const int kMaxConcurrentAlbumsRequests; diff --git a/src/tidal/tidalbaserequest.h b/src/tidal/tidalbaserequest.h index 55407713..41e6e00e 100644 --- a/src/tidal/tidalbaserequest.h +++ b/src/tidal/tidalbaserequest.h @@ -69,7 +69,7 @@ class TidalBaseRequest : public QObject { QJsonValue ExtractItems(const QJsonObject &json_obj); virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; - QString ErrorsToHTML(const QStringList &errors); + static QString ErrorsToHTML(const QStringList &errors); QString api_url() { return QString(kApiUrl); } bool oauth() { return service_->oauth(); } diff --git a/src/tidal/tidalfavoriterequest.h b/src/tidal/tidalfavoriterequest.h index 60b36ab9..86e2c73c 100644 --- a/src/tidal/tidalfavoriterequest.h +++ b/src/tidal/tidalfavoriterequest.h @@ -74,7 +74,7 @@ class TidalFavoriteRequest : public TidalBaseRequest { private: void Error(const QString &error, const QVariant &debug = QVariant()) override; - QString FavoriteText(const FavoriteType type); + static QString FavoriteText(const FavoriteType type); void AddFavorites(const FavoriteType type, const SongList &songs); void RemoveFavorites(const FavoriteType type, const SongList &songs); void RemoveFavorites(const FavoriteType type, const QString &id, const SongList &songs); diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h index dbc935a9..eb509988 100644 --- a/src/tidal/tidalrequest.h +++ b/src/tidal/tidalrequest.h @@ -143,7 +143,7 @@ class TidalRequest : public TidalBaseRequest { void AlbumCoverFinishCheck(); void FinishCheck(); - void Warn(const QString &error, const QVariant &debug = QVariant()); + static void Warn(const QString &error, const QVariant &debug = QVariant()); void Error(const QString &error, const QVariant &debug = QVariant()) override; static const char *kResourcesUrl; diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp index e9f217a1..d49890ee 100644 --- a/src/transcoder/transcodedialog.cpp +++ b/src/transcoder/transcodedialog.cpp @@ -446,7 +446,7 @@ void TranscodeDialog::AddDestination() { } // Returns the rightmost non-empty part of 'path'. -QString TranscodeDialog::TrimPath(const QString &path) const { +QString TranscodeDialog::TrimPath(const QString &path) { return path.section('/', -1, -1, QString::SectionSkipEmpty); } diff --git a/src/transcoder/transcodedialog.h b/src/transcoder/transcodedialog.h index 0063c1d2..761669a6 100644 --- a/src/transcoder/transcodedialog.h +++ b/src/transcoder/transcodedialog.h @@ -65,7 +65,7 @@ class TranscodeDialog : public QDialog { void SetWorking(bool working); void UpdateStatusText(); void UpdateProgress(); - QString TrimPath(const QString &path) const; + static QString TrimPath(const QString &path) ; QString GetOutputFileName(const QString &input, const TranscoderPreset &preset) const; private slots: diff --git a/src/transcoder/transcoder.h b/src/transcoder/transcoder.h index 726ce6db..c4458780 100644 --- a/src/transcoder/transcoder.h +++ b/src/transcoder/transcoder.h @@ -64,7 +64,7 @@ class Transcoder : public QObject { int max_threads() const { return max_threads_; } void set_max_threads(int count) { max_threads_ = count; } - QString GetFile(const QString &input, const TranscoderPreset &preset, const QString &output = QString()); + static QString GetFile(const QString &input, const TranscoderPreset &preset, const QString &output = QString()); void AddJob(const QString &input, const TranscoderPreset &preset, const QString &output); QMap GetProgress() const; diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp index 278fab79..1ea64973 100644 --- a/src/widgets/freespacebar.cpp +++ b/src/widgets/freespacebar.cpp @@ -231,7 +231,7 @@ void FreeSpaceBar::DrawText(QPainter *p, const QRect r) { } -QString FreeSpaceBar::TextForSize(const QString &prefix, const qint64 size) const { +QString FreeSpaceBar::TextForSize(const QString &prefix, const qint64 size) { QString ret; if (size > 0) { diff --git a/src/widgets/freespacebar.h b/src/widgets/freespacebar.h index 90d63b8d..bcc657c4 100644 --- a/src/widgets/freespacebar.h +++ b/src/widgets/freespacebar.h @@ -77,7 +77,7 @@ class FreeSpaceBar : public QWidget { QColor color; }; - QString TextForSize(const QString &prefix, const qint64 size) const; + static QString TextForSize(const QString &prefix, const qint64 size); void DrawBar(QPainter *p, const QRect r); void DrawText(QPainter *p, const QRect r); diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h index 7e78cc6b..d532b2d3 100644 --- a/src/widgets/trackslider.h +++ b/src/widgets/trackslider.h @@ -80,7 +80,7 @@ class TrackSlider : public QWidget { private: void UpdateTimes(const int elapsed); void UpdateLabelWidth(); - void UpdateLabelWidth(QLabel *label, const QString &text); + static void UpdateLabelWidth(QLabel *label, const QString &text); private: Ui_TrackSlider *ui_; diff --git a/tests/src/collectionbackend_test.cpp b/tests/src/collectionbackend_test.cpp index eb76eeb7..846dfde6 100644 --- a/tests/src/collectionbackend_test.cpp +++ b/tests/src/collectionbackend_test.cpp @@ -49,7 +49,7 @@ class CollectionBackendTest : public ::testing::Test { backend_->Init(database_.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); } - Song MakeDummySong(int directory_id) { + static Song MakeDummySong(int directory_id) { // Returns a valid song with all the required fields set Song ret; ret.set_directory_id(directory_id); diff --git a/tests/src/concurrentrun_test.cpp b/tests/src/concurrentrun_test.cpp index 08a8828d..7b4f6884 100644 --- a/tests/src/concurrentrun_test.cpp +++ b/tests/src/concurrentrun_test.cpp @@ -154,7 +154,7 @@ TEST(ConcurrentRunTest, ConcurrentRunVoidFunction3Start) { class A { public: - void f(int* i) { + static void f(int* i) { *i = *i + 1; } }; diff --git a/tests/src/testobjectdecorators.h b/tests/src/testobjectdecorators.h index 46e23838..00ef6af0 100644 --- a/tests/src/testobjectdecorators.h +++ b/tests/src/testobjectdecorators.h @@ -30,7 +30,7 @@ class TestObjectDecorators : public QObject { Q_OBJECT public slots: - void initStyleOption(QProgressBar *self, QStyleOptionProgressBar *opt); + static void initStyleOption(QProgressBar *self, QStyleOptionProgressBar *opt); }; #endif // TESTOBJECTDECORATORS_H