rbutil: Use pattern replacement for SystemInfo build type.

Use pattern replacement for lookup instead of expanded values. Will
allow simplifying things later for better handling of different build
types.

Change-Id: Iaad67a6c8654d27c3206cf95a379acab169565bc

1 files changed, 11 insertions, 8 deletions

diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index c4afe4b27d..12b9eb4bfb 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -34,15 +34,21 @@ class SystemInfo : public QObject
             MapIncompatible,
         };
 
+        enum BuildType {
+            BuildCurrent,
+            BuildDaily,
+            BuildRelease,
+            BuildCandidate
+        };
+
         //! All system settings
         enum SystemInfos {
+            BuildUrl,
+            FontUrl,
+            VoiceUrl,
             ManualUrl,
-            BleedingUrl,
             BootloaderUrl,
             BootloaderInfoUrl,
-            DailyUrl,
-            DailyFontUrl,
-            DailyVoiceUrl,
             DoomUrl,
             Duke3DUrl,
             QuakeUrl,
@@ -50,9 +56,6 @@ class SystemInfo : public QObject
             Wolf3DUrl,
             XWorldUrl,
             ReleaseUrl,
-            CandidateUrl,
-            ReleaseVoiceUrl,
-            ReleaseFontUrl,
             BuildInfoUrl,
             GenlangUrl,
             ThemesUrl,
@@ -92,7 +95,7 @@ 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);
+        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 = "");