rbutil: Rework and merge player and build server info handling.

Handling the data for players from rbutil.ini and the build-info data
from the server is closely related. Splitting things up into different
classes only creates tightly coupling, which is unnecessary, and the
need to differentiate between them in the application.

Merge both classes into a single one and rework handling so the
application doesn't have to deal with two separate classes anymore.

Furthermore, change URL templates to use new values from build-info
instead of hard coding them.

Change-Id: Ica550973ce23d1559110782add52bc214eba552d

1 files changed, 0 insertions, 44 deletions

diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index 67863c2268..7b5b68131b 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -34,47 +34,6 @@ class SystemInfo : public QObject
             MapIncompatible,
         };
 
-        enum BuildType {
-            BuildCurrent,
-            BuildDaily,
-            BuildRelease,
-            BuildCandidate
-        };
-
-        //! All system settings
-        enum SystemInfos {
-            BuildUrl,
-            FontUrl,
-            VoiceUrl,
-            ManualUrl,
-            BootloaderUrl,
-            BootloaderInfoUrl,
-            DoomUrl,
-            Duke3DUrl,
-            QuakeUrl,
-            PuzzFontsUrl,
-            Wolf3DUrl,
-            XWorldUrl,
-            ReleaseUrl,
-            BuildInfoUrl,
-            GenlangUrl,
-            ThemesUrl,
-            ThemesInfoUrl,
-            RbutilUrl,
-        };
-
-        enum PlatformInfo {
-            Manual,
-            BootloaderMethod,
-            BootloaderName,
-            BootloaderFile,
-            BootloaderFilter,
-            Encoder,
-            Brand,
-            Name,
-            PlayerPicture,
-        };
-
         enum PlatformType {
             PlatformAll,
             PlatformAllDisabled,
@@ -93,9 +52,6 @@ class SystemInfo : public QObject
         //! returns a map of usb-ids and their targets
         static QMap<int, QStringList> usbIdMap(enum MapType type);
         //! get a value from system settings
-        static QVariant value(enum SystemInfos info, BuildType type = BuildCurrent);
-        //! get a value from system settings for a named platform.
-        static QVariant platformValue(enum PlatformInfo info, QString platform = "");
 
     private:
         //! you shouldnt call this, its a fully static calls