From daa2f25e3cffc8fd144716b530a2ee98e61b8cbe Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 14 Jul 2021 01:15:27 +0200 Subject: [PATCH] Replace Q_ENUMS with Q_ENUM Q_ENUMS is obsolete. See: https://doc.qt.io/qt-5/qobject-obsolete.html The replacement is Q_ENUM which was introduced in Qt 5.5, and Clementine requires Qt 5.6. --- src/internet/subsonic/subsonicservice.h | 4 ++-- src/library/librarymodel.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/internet/subsonic/subsonicservice.h b/src/internet/subsonic/subsonicservice.h index 6f9e18f18..dbc694764 100644 --- a/src/internet/subsonic/subsonicservice.h +++ b/src/internet/subsonic/subsonicservice.h @@ -39,8 +39,6 @@ class SubsonicLibraryScanner; class SubsonicService : public InternetService { Q_OBJECT - Q_ENUMS(LoginState) - Q_ENUMS(ApiError) public: SubsonicService(Application* app, InternetModel* parent); @@ -63,6 +61,7 @@ class SubsonicService : public InternetService { LoginState_RedirectLimitExceeded, LoginState_RedirectNoUrl, }; + Q_ENUM(LoginState) enum ApiError { ApiError_Generic = 0, @@ -74,6 +73,7 @@ class SubsonicService : public InternetService { ApiError_Unlicensed = 60, ApiError_NotFound = 70, }; + Q_ENUM(ApiError) enum Type { Type_Artist = InternetModel::TypeCount, diff --git a/src/library/librarymodel.h b/src/library/librarymodel.h index b45ce0239..259e322f7 100644 --- a/src/library/librarymodel.h +++ b/src/library/librarymodel.h @@ -46,7 +46,6 @@ class QSettings; class LibraryModel : public SimpleTreeModel { Q_OBJECT - Q_ENUMS(GroupBy) public: LibraryModel(std::shared_ptr backend, Application* app, @@ -91,6 +90,7 @@ class LibraryModel : public SimpleTreeModel { GroupBy_OriginalYearAlbum = 13, GroupBy_OriginalYear = 14, }; + Q_ENUM(GroupBy) struct Grouping { Grouping(GroupBy f = GroupBy_None, GroupBy s = GroupBy_None,