dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use C++11 enum class

Browse Source
This commit is contained in:
Jonas Kvinge
2023-02-18 14:09:27 +01:00
parent e6c5f76872
commit dd72fb4ca5
237 changed files with 2915 additions and 2840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/musicbrainz/musicbrainzclient.cpp
View File

@@ -230,7 +230,7 @@ void MusicBrainzClient::RequestFinished(QNetworkReply *reply, const int id, cons
for (const PendingResults &result_list : result_list_list) {
ret << result_list.results_;
}
emit Finished(id, UniqueResults(ret, KeepOriginalOrder), error);
emit Finished(id, UniqueResults(ret, UniqueResultsSortOption::KeepOriginalOrder), error);
}
}
@@ -312,7 +312,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep
}
}
emit DiscIdFinished(artist, album, UniqueResults(ret, SortResults));
emit DiscIdFinished(artist, album, UniqueResults(ret, UniqueResultsSortOption::SortResults));
}
@@ -492,7 +492,7 @@ MusicBrainzClient::Release MusicBrainzClient::ParseRelease(QXmlStreamReader *rea
MusicBrainzClient::ResultList MusicBrainzClient::UniqueResults(const ResultList &results, UniqueResultsSortOption opt) {
ResultList ret;
if (opt == SortResults) {
if (opt == UniqueResultsSortOption::SortResults) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
ret = QSet<Result>(results.begin(), results.end()).values();
#else

28
src/musicbrainz/musicbrainzclient.h
View File

@@ -124,22 +124,22 @@ class MusicBrainzClient : public QObject {
};
// Used as parameter for UniqueResults
enum UniqueResultsSortOption {
enum class UniqueResultsSortOption {
SortResults = 0,
KeepOriginalOrder
};
struct Release {
enum Status {
Status_Unknown = 0,
Status_PseudoRelease,
Status_Bootleg,
Status_Promotional,
Status_Official
enum class Status {
Unknown = 0,
PseudoRelease,
Bootleg,
Promotional,
Official
};
Release() : track_(0), year_(0), status_(Status_Unknown) {}
Release() : track_(0), year_(0), status_(Status::Unknown) {}
Result CopyAndMergeInto(const Result &orig) const {
Result ret(orig);
@@ -151,19 +151,19 @@ class MusicBrainzClient : public QObject {
void SetStatusFromString(const QString &s) {
if (s.compare("Official", Qt::CaseInsensitive) == 0) {
status_ = Status_Official;
status_ = Status::Official;
}
else if (s.compare("Promotion", Qt::CaseInsensitive) == 0) {
status_ = Status_Promotional;
status_ = Status::Promotional;
}
else if (s.compare("Bootleg", Qt::CaseInsensitive) == 0) {
status_ = Status_Bootleg;
status_ = Status::Bootleg;
}
else if (s.compare("Pseudo-release", Qt::CaseInsensitive) == 0) {
status_ = Status_PseudoRelease;
status_ = Status::PseudoRelease;
}
else {
status_ = Status_Unknown;
status_ = Status::Unknown;
}
}
@@ -196,7 +196,7 @@ class MusicBrainzClient : public QObject {
static ResultList ParseTrack(QXmlStreamReader *reader);
static void ParseArtist(QXmlStreamReader *reader, QString *artist);
static Release ParseRelease(QXmlStreamReader *reader);
static ResultList UniqueResults(const ResultList &results, UniqueResultsSortOption opt = SortResults);
static ResultList UniqueResults(const ResultList &results, UniqueResultsSortOption opt = UniqueResultsSortOption::SortResults);
static void Error(const QString &error, const QVariant &debug = QVariant());
private: