From f608de723c863abc0e32cd7584c046eceb910d78 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Thu, 19 Nov 2020 19:54:25 +0100 Subject: rbutil: Convert ServerInfo to singleton. Change-Id: I29d94eb6bae084754e5e3f337c41de8354ba123c --- rbutil/rbutilqt/base/serverinfo.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'rbutil/rbutilqt/base/serverinfo.cpp') diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index 544348c3b1..08f7f770b7 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp @@ -21,7 +21,15 @@ #include "systeminfo.h" #include "Logger.h" -static QSettings* serverSettings = nullptr; +ServerInfo* ServerInfo::infoInstance = nullptr; + +ServerInfo* ServerInfo::instance() +{ + if (infoInstance == nullptr) { + infoInstance = new ServerInfo(); + } + return infoInstance; +} // server infos const static struct { @@ -131,10 +139,10 @@ QVariant ServerInfo::platformValue(enum ServerInfos info, QString platform) return value; } -QString ServerInfo::statusToString(int status) +QString ServerInfo::statusAsString(QString platform) { QString value; - switch(status) + switch(platformValue(CurStatus, platform).toInt()) { case STATUS_RETIRED: value = tr("Stable (Retired)"); -- cgit v1.2.3