From 2509def164ee7f4aecbe6a786df57140f19e35f2 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 14 Nov 2020 16:23:56 +0100 Subject: rbutil: Rework player configuration. - Split internal configuration into player specific and common parts. Always require passing the player for player specific data instead of implicitly assuming the currently selected one; only use the currently selected one if the player name is explicitly passed as empty. - Similarly adjust handling of server info data; prepare for splitting into build type specific values so the naming becomes cleaner. Change-Id: I894e694f83bd9fe2d22ad46b3f8f7df3e2c68033 --- rbutil/rbutilqt/base/serverinfo.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'rbutil/rbutilqt/base/serverinfo.h') diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h index 94b2818f73..b12a437c34 100644 --- a/rbutil/rbutilqt/base/serverinfo.h +++ b/rbutil/rbutilqt/base/serverinfo.h @@ -45,16 +45,14 @@ class ServerInfo : public QObject //! read in buildinfo file static void readBuildInfo(QString file); - //! get a value from server info - static QVariant value(enum ServerInfos setting); //! get a value from server info for a named platform. - static QVariant platformValue(QString platform, enum ServerInfos setting); + static QVariant platformValue(enum ServerInfos setting, QString platform = ""); private: //! set a server info value static void setValue(enum ServerInfos setting, QVariant value); //! set a value for a server info for a named platform. - static void setPlatformValue(QString platform, enum ServerInfos setting, QVariant value); + static void setPlatformValue(enum ServerInfos setting, QString platform, QVariant value); //! you shouldnt call this, its a fully static class ServerInfo() {} -- cgit v1.2.3