Use C++11 enum class

src/subsonic/subsonicbaserequest.cpp

@@ -62,7 +62,7 @@ QUrl SubsonicBaseRequest::CreateUrl(const QUrl &server_url, const SubsonicSettin
                                  << Param("f", "json")
                                  << Param("u", username);
 
-  if (auth_method == SubsonicSettingsPage::AuthMethod_Hex) {
+  if (auth_method == SubsonicSettingsPage::AuthMethod::Hex) {
     params << Param("p", QString("enc:" + password.toUtf8().toHex()));
   }
   else {

src/subsonic/subsonicrequest.cpp

@@ -442,7 +442,7 @@ void SubsonicRequest::AlbumSongsReplyReceived(QNetworkReply *reply, const QStrin
     QJsonObject obj_song = value_song.toObject();
 
     ++songs_received;
-    Song song(Song::Source_Subsonic);
+    Song song(Song::Source::Subsonic);
     ParseSong(song, obj_song, artist_id, album_id, album_artist, created);
     if (!song.is_valid()) continue;
     if (song.disc() >= 2) multidisc = true;
@@ -637,21 +637,21 @@ QString SubsonicRequest::ParseSong(Song &song, const QJsonObject &json_obj, cons
     }
   }
 
-  Song::FileType filetype(Song::FileType_Stream);
+  Song::FileType filetype(Song::FileType::Stream);
   if (!mimetype.isEmpty()) {
     QMimeDatabase mimedb;
     QStringList suffixes = mimedb.mimeTypeForName(mimetype.toUtf8()).suffixes();
     for (const QString &suffix : suffixes) {
       filetype = Song::FiletypeByExtension(suffix);
-      if (filetype != Song::FileType_Unknown) break;
+      if (filetype != Song::FileType::Unknown) break;
     }
-    if (filetype == Song::FileType_Unknown) {
+    if (filetype == Song::FileType::Unknown) {
       qLog(Debug) << "Subsonic: Unknown mimetype" << mimetype;
-      filetype = Song::FileType_Stream;
+      filetype = Song::FileType::Stream;
     }
   }
 
-  song.set_source(Song::Source_Subsonic);
+  song.set_source(Song::Source::Subsonic);
   song.set_song_id(song_id);
   if (!album_id.isEmpty()) song.set_album_id(album_id);
   if (!artist_id.isEmpty()) song.set_artist_id(artist_id);
@@ -714,7 +714,7 @@ void SubsonicRequest::AddAlbumCoverRequest(const Song &song) {
     return;
   }
 
-  QString cover_path = Song::ImageCacheDir(Song::Source_Subsonic);
+  QString cover_path = Song::ImageCacheDir(Song::Source::Subsonic);
   QDir dir(cover_path);
   if (!dir.exists()) dir.mkpath(cover_path);
 

src/subsonic/subsonicservice.cpp

@@ -58,7 +58,7 @@
 #include "settings/settingsdialog.h"
 #include "settings/subsonicsettingspage.h"
 
-const Song::Source SubsonicService::kSource = Song::Source_Subsonic;
+const Song::Source SubsonicService::kSource = Song::Source::Subsonic;
 const char *SubsonicService::kClientName = "Strawberry";
 const char *SubsonicService::kApiVersion = "1.11.0";
 const char *SubsonicService::kSongsTable = "subsonic_songs";
@@ -66,7 +66,7 @@ const char *SubsonicService::kSongsFtsTable = "subsonic_songs_fts";
 const int SubsonicService::kMaxRedirects = 3;
 
 SubsonicService::SubsonicService(Application *app, QObject *parent)
-    : InternetService(Song::Source_Subsonic, "Subsonic", "subsonic", SubsonicSettingsPage::kSettingsGroup, SettingsDialog::Page_Subsonic, app, parent),
+    : InternetService(Song::Source::Subsonic, "Subsonic", "subsonic", SubsonicSettingsPage::kSettingsGroup, SettingsDialog::Page::Subsonic, app, parent),
       app_(app),
       url_handler_(new SubsonicUrlHandler(app, this)),
       collection_backend_(nullptr),
@@ -75,7 +75,7 @@ SubsonicService::SubsonicService(Application *app, QObject *parent)
       http2_(false),
       verify_certificate_(false),
       download_album_covers_(true),
-      auth_method_(SubsonicSettingsPage::AuthMethod_MD5),
+      auth_method_(SubsonicSettingsPage::AuthMethod::MD5),
       ping_redirects_(0) {
 
   app->player()->RegisterUrlHandler(url_handler_);
@@ -84,7 +84,7 @@ SubsonicService::SubsonicService(Application *app, QObject *parent)
 
   collection_backend_ = new CollectionBackend();
   collection_backend_->moveToThread(app_->database()->thread());
-  collection_backend_->Init(app_->database(), app->task_manager(), Song::Source_Subsonic, kSongsTable, kSongsFtsTable);
+  collection_backend_->Init(app_->database(), app->task_manager(), Song::Source::Subsonic, kSongsTable, kSongsFtsTable);
 
   // Model
 
@@ -120,7 +120,7 @@ void SubsonicService::Exit() {
 }
 
 void SubsonicService::ShowConfig() {
-  app_->OpenSettingsDialogAtPage(SettingsDialog::Page_Subsonic);
+  app_->OpenSettingsDialogAtPage(SettingsDialog::Page::Subsonic);
 }
 
 void SubsonicService::ReloadSettings() {
@@ -137,7 +137,7 @@ void SubsonicService::ReloadSettings() {
   http2_ = s.value("http2", false).toBool();
   verify_certificate_ = s.value("verifycertificate", false).toBool();
   download_album_covers_ = s.value("downloadalbumcovers", true).toBool();
-  auth_method_ = static_cast<SubsonicSettingsPage::AuthMethod>(s.value("authmethod", SubsonicSettingsPage::AuthMethod_MD5).toInt());
+  auth_method_ = static_cast<SubsonicSettingsPage::AuthMethod>(s.value("authmethod", static_cast<int>(SubsonicSettingsPage::AuthMethod::MD5)).toInt());
 
   s.endGroup();
 
@@ -163,7 +163,7 @@ void SubsonicService::SendPingWithCredentials(QUrl url, const QString &username,
                                  << Param("f", "json")
                                  << Param("u", username);
 
-  if (auth_method == SubsonicSettingsPage::AuthMethod_Hex) {
+  if (auth_method == SubsonicSettingsPage::AuthMethod::Hex) {
     params << Param("p", QString("enc:" + password.toUtf8().toHex()));
   }
   else {

src/subsonic/subsonicurlhandler.cpp

@@ -36,17 +36,17 @@ SubsonicUrlHandler::SubsonicUrlHandler(Application *app, SubsonicService *servic
 UrlHandler::LoadResult SubsonicUrlHandler::StartLoading(const QUrl &url) {
 
   if (!server_url().isValid()) {
-    return LoadResult(url, LoadResult::Error, tr("Subsonic server URL is invalid."));
+    return LoadResult(url, LoadResult::Type::Error, tr("Subsonic server URL is invalid."));
   }
 
   if (username().isEmpty() || password().isEmpty()) {
-    return LoadResult(url, LoadResult::Error, tr("Missing Subsonic username or password."));
+    return LoadResult(url, LoadResult::Type::Error, tr("Missing Subsonic username or password."));
   }
 
   using Param = QPair<QString, QString>;
   using ParamList = QList<Param>;
   const QUrl stream_url = SubsonicBaseRequest::CreateUrl(server_url(), auth_method(), username(), password(), "stream", ParamList() << Param("id", url.path()));
 
-  return LoadResult(url, LoadResult::TrackAvailable, stream_url);
+  return LoadResult(url, LoadResult::Type::TrackAvailable, stream_url);
 
 }