From 8986975a17247ad73c37b1d669165c5d12c043b8 Mon Sep 17 00:00:00 2001 From: Camila Date: Wed, 7 Apr 2021 12:07:53 +0200 Subject: [PATCH] Use enum class instead of enum. Signed-off-by: Camila --- src/gui/userstatus.cpp | 28 ++++++++++++++-------------- src/gui/userstatus.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gui/userstatus.cpp b/src/gui/userstatus.cpp index 3637b4fd9..9e4bbf65a 100644 --- a/src/gui/userstatus.cpp +++ b/src/gui/userstatus.cpp @@ -36,27 +36,27 @@ UserStatus::UserStatus(QObject *parent) UserStatus::Status UserStatus::stringToEnum(const QString &status) const { // it needs to match the Status enum - const QHash preDefinedStatus{{"online", Online}, - {"dnd", DoNotDisturb}, //DoNotDisturb - {"away", Away}, - {"offline", Offline}, - {"invisible", Invisible}}; + const QHash preDefinedStatus{{"online", Status::Online}, + {"dnd", Status::DoNotDisturb}, //DoNotDisturb + {"away", Status::Away}, + {"offline", Status::Offline}, + {"invisible", Status::Invisible}}; // api should return invisible, dnd,... toLower() it is to make sure // it matches _preDefinedStatus, otherwise the default is online (0) const auto statusKey = status.isEmpty() ? QStringLiteral("online") : status.toLower(); - return preDefinedStatus.value(statusKey, Online); + return preDefinedStatus.value(statusKey, Status::Online); } QString UserStatus::enumToUserString(Status status) const { switch (status) { - case Away: + case Status::Away: return tr("Away"); - case DoNotDisturb: + case Status::DoNotDisturb: return tr("Do not disturb"); - case Invisible: - case Offline: + case Status::Invisible: + case Status::Offline: return tr("Offline"); default: return tr("Online"); @@ -113,12 +113,12 @@ QString UserStatus::message() const QUrl UserStatus::icon() const { switch (_status) { - case Away: + case Status::Away: return Theme::instance()->statusAwayImageSource(); - case DoNotDisturb: + case Status::DoNotDisturb: return Theme::instance()->statusDoNotDisturbImageSource(); - case Invisible: - case Offline: + case Status::Invisible: + case Status::Offline: return Theme::instance()->statusInvisibleImageSource(); default: return Theme::instance()->statusOnlineImageSource(); diff --git a/src/gui/userstatus.h b/src/gui/userstatus.h index c8ca3d310..5d40e03be 100644 --- a/src/gui/userstatus.h +++ b/src/gui/userstatus.h @@ -28,7 +28,7 @@ class UserStatus : public QObject public: explicit UserStatus(QObject *parent = nullptr); - enum Status { + enum class Status { Online, DoNotDisturb, Away, -- 2.39.5