1 files changed, 35 insertions, 37 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index c9e29a8325..d14c3f5436 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -26,29 +26,28 @@
 const static struct {
    SystemInfo::SystemInfos info;
    const char* name;
-    const char* def;
 } SystemInfosList[] = {
-    { SystemInfo::ManualUrl,            "manual_url",           "" },
+    { SystemInfo::ManualUrl,            "manual_url"          },
-    { SystemInfo::BleedingUrl,          "bleeding_url",         "" },
+    { SystemInfo::BleedingUrl,          "bleeding_url"        },
-    { SystemInfo::BootloaderUrl,        "bootloader_url",       "" },
+    { SystemInfo::BootloaderUrl,        "bootloader_url"      },
-    { SystemInfo::BootloaderInfoUrl,    "bootloader_info_url",  "" },
+    { SystemInfo::BootloaderInfoUrl,    "bootloader_info_url" },
-    { SystemInfo::ReleaseFontUrl,       "release_font_url",     "" },
+    { SystemInfo::ReleaseFontUrl,       "release_font_url"    },
-    { SystemInfo::DailyFontUrl,         "daily_font_url",       "" },
+    { SystemInfo::DailyFontUrl,         "daily_font_url"      },
-    { SystemInfo::DailyVoiceUrl,        "daily_voice_url",      "" },
+    { SystemInfo::DailyVoiceUrl,        "daily_voice_url"     },
-    { SystemInfo::ReleaseVoiceUrl,      "release_voice_url",    "" },
+    { SystemInfo::ReleaseVoiceUrl,      "release_voice_url"   },
-    { SystemInfo::DoomUrl,              "doom_url",             "" },
+    { SystemInfo::DoomUrl,              "doom_url"            },
-    { SystemInfo::Duke3DUrl,            "duke3d_url",           "" },
+    { SystemInfo::Duke3DUrl,            "duke3d_url"          },
-    { SystemInfo::PuzzFontsUrl,         "puzzfonts_url",        "" },
+    { SystemInfo::PuzzFontsUrl,         "puzzfonts_url"       },
-    { SystemInfo::QuakeUrl,             "quake_url",            "" },
+    { SystemInfo::QuakeUrl,             "quake_url"           },
-    { SystemInfo::Wolf3DUrl,            "wolf3d_url",           "" },
+    { SystemInfo::Wolf3DUrl,            "wolf3d_url"          },
-    { SystemInfo::XWorldUrl,            "xworld_url",           "" },
+    { SystemInfo::XWorldUrl,            "xworld_url"          },
-    { SystemInfo::ReleaseUrl,           "release_url",          "" },
+    { SystemInfo::ReleaseUrl,           "release_url"         },
-    { SystemInfo::DailyUrl,             "daily_url",            "" },
+    { SystemInfo::DailyUrl,             "daily_url"           },
-    { SystemInfo::BuildInfoUrl,         "build_info_url",       "" },
+    { SystemInfo::BuildInfoUrl,         "build_info_url"      },
-    { SystemInfo::GenlangUrl,           "genlang_url",          "" },
+    { SystemInfo::GenlangUrl,           "genlang_url"         },
-    { SystemInfo::ThemesUrl,            "themes_url",           "" },
+    { SystemInfo::ThemesUrl,            "themes_url"          },
-    { SystemInfo::ThemesInfoUrl,        "themes_info_url",      "" },
+    { SystemInfo::ThemesInfoUrl,        "themes_info_url"     },
-    { SystemInfo::RbutilUrl,            "rbutil_url",           "" },
+    { SystemInfo::RbutilUrl,            "rbutil_url"          },
 };
 const static struct {
@@ -56,18 +55,18 @@ const static struct {
    const char* name;
    const char* def;
 } PlatformInfosList[] = {
-    { SystemInfo::CurPlatformName,      ":platform:/name",      "" },
+    { SystemInfo::PlatformName,     ":platform:/name",      "" },
-    { SystemInfo::CurManual,            ":platform:/manualname","rockbox-:platform:" },
+    { SystemInfo::Manual,           ":platform:/manualname","rockbox-:platform:" },
-    { SystemInfo::CurBootloaderMethod,  ":platform:/bootloadermethod", "none" },
+    { SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" },
-    { SystemInfo::CurBootloaderName,    ":platform:/bootloadername", "" },
+    { SystemInfo::BootloaderName,   ":platform:/bootloadername", "" },
-    { SystemInfo::CurBootloaderFile,    ":platform:/bootloaderfile", "" },
+    { SystemInfo::BootloaderFile,   ":platform:/bootloaderfile", "" },
-    { SystemInfo::CurBootloaderFilter,  ":platform:/bootloaderfilter", "" },
+    { SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter", "" },
-    { SystemInfo::CurEncoder,           ":platform:/encoder",   "" },
+    { SystemInfo::Encoder,          ":platform:/encoder",   "" },
-    { SystemInfo::CurBrand,             ":platform:/brand",     "" },
+    { SystemInfo::Brand,            ":platform:/brand",     "" },
-    { SystemInfo::CurName,              ":platform:/name",      "" },
+    { SystemInfo::Name,             ":platform:/name",      "" },
-    { SystemInfo::CurBuildserverModel,  ":platform:/buildserver_modelname", "" },
+    { SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" },
-    { SystemInfo::CurConfigureModel,    ":platform:/configure_modelname", "" },
+    { SystemInfo::ConfigureModel,   ":platform:/configure_modelname", "" },
-    { SystemInfo::CurPlayerPicture,     ":platform:/playerpic", "" },
+    { SystemInfo::PlayerPicture,    ":platform:/playerpic", "" },
 };
 //! pointer to setting object to NULL
@@ -93,9 +92,8 @@ QVariant SystemInfo::value(enum SystemInfos info)
    while(SystemInfosList[i].info != info)
        i++;
    QString s = SystemInfosList[i].name;
-    QString d = SystemInfosList[i].def;
+    LOG_INFO() << "GET:" << s << systemInfos->value(s).toString();
-    LOG_INFO() << "GET:" << s << systemInfos->value(s, d).toString();
+    return systemInfos->value(s);
-    return systemInfos->value(s, d);
 }
 QVariant SystemInfo::platformValue(enum PlatformInfo info, QString platform)

diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index c9e29a8325..d14c3f5436 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -26,29 +26,28 @@
26	const static struct {	26	const static struct {
27	SystemInfo::SystemInfos info;	27	SystemInfo::SystemInfos info;
28	const char* name;	28	const char* name;
29	const char* def;
30	} SystemInfosList[] = {	29	} SystemInfosList[] = {
31	{ SystemInfo::ManualUrl, "manual_url", "" },	30	{ SystemInfo::ManualUrl, "manual_url" },
32	{ SystemInfo::BleedingUrl, "bleeding_url", "" },	31	{ SystemInfo::BleedingUrl, "bleeding_url" },
33	{ SystemInfo::BootloaderUrl, "bootloader_url", "" },	32	{ SystemInfo::BootloaderUrl, "bootloader_url" },
34	{ SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" },	33	{ SystemInfo::BootloaderInfoUrl, "bootloader_info_url" },
35	{ SystemInfo::ReleaseFontUrl, "release_font_url", "" },	34	{ SystemInfo::ReleaseFontUrl, "release_font_url" },
36	{ SystemInfo::DailyFontUrl, "daily_font_url", "" },	35	{ SystemInfo::DailyFontUrl, "daily_font_url" },
37	{ SystemInfo::DailyVoiceUrl, "daily_voice_url", "" },	36	{ SystemInfo::DailyVoiceUrl, "daily_voice_url" },
38	{ SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" },	37	{ SystemInfo::ReleaseVoiceUrl, "release_voice_url" },
39	{ SystemInfo::DoomUrl, "doom_url", "" },	38	{ SystemInfo::DoomUrl, "doom_url" },
40	{ SystemInfo::Duke3DUrl, "duke3d_url", "" },	39	{ SystemInfo::Duke3DUrl, "duke3d_url" },
41	{ SystemInfo::PuzzFontsUrl, "puzzfonts_url", "" },	40	{ SystemInfo::PuzzFontsUrl, "puzzfonts_url" },
42	{ SystemInfo::QuakeUrl, "quake_url", "" },	41	{ SystemInfo::QuakeUrl, "quake_url" },
43	{ SystemInfo::Wolf3DUrl, "wolf3d_url", "" },	42	{ SystemInfo::Wolf3DUrl, "wolf3d_url" },
44	{ SystemInfo::XWorldUrl, "xworld_url", "" },	43	{ SystemInfo::XWorldUrl, "xworld_url" },
45	{ SystemInfo::ReleaseUrl, "release_url", "" },	44	{ SystemInfo::ReleaseUrl, "release_url" },
46	{ SystemInfo::DailyUrl, "daily_url", "" },	45	{ SystemInfo::DailyUrl, "daily_url" },
47	{ SystemInfo::BuildInfoUrl, "build_info_url", "" },	46	{ SystemInfo::BuildInfoUrl, "build_info_url" },
48	{ SystemInfo::GenlangUrl, "genlang_url", "" },	47	{ SystemInfo::GenlangUrl, "genlang_url" },
49	{ SystemInfo::ThemesUrl, "themes_url", "" },	48	{ SystemInfo::ThemesUrl, "themes_url" },
50	{ SystemInfo::ThemesInfoUrl, "themes_info_url", "" },	49	{ SystemInfo::ThemesInfoUrl, "themes_info_url" },
51	{ SystemInfo::RbutilUrl, "rbutil_url", "" },	50	{ SystemInfo::RbutilUrl, "rbutil_url" },
52	};	51	};
53		52
54	const static struct {	53	const static struct {
@@ -56,18 +55,18 @@ const static struct {
56	const char* name;	55	const char* name;
57	const char* def;	56	const char* def;
58	} PlatformInfosList[] = {	57	} PlatformInfosList[] = {
59	{ SystemInfo::CurPlatformName, ":platform:/name", "" },	58	{ SystemInfo::PlatformName, ":platform:/name", "" },
60	{ SystemInfo::CurManual, ":platform:/manualname","rockbox-:platform:" },	59	{ SystemInfo::Manual, ":platform:/manualname","rockbox-:platform:" },
61	{ SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" },	60	{ SystemInfo::BootloaderMethod, ":platform:/bootloadermethod", "none" },
62	{ SystemInfo::CurBootloaderName, ":platform:/bootloadername", "" },	61	{ SystemInfo::BootloaderName, ":platform:/bootloadername", "" },
63	{ SystemInfo::CurBootloaderFile, ":platform:/bootloaderfile", "" },	62	{ SystemInfo::BootloaderFile, ":platform:/bootloaderfile", "" },
64	{ SystemInfo::CurBootloaderFilter, ":platform:/bootloaderfilter", "" },	63	{ SystemInfo::BootloaderFilter, ":platform:/bootloaderfilter", "" },
65	{ SystemInfo::CurEncoder, ":platform:/encoder", "" },	64	{ SystemInfo::Encoder, ":platform:/encoder", "" },
66	{ SystemInfo::CurBrand, ":platform:/brand", "" },	65	{ SystemInfo::Brand, ":platform:/brand", "" },
67	{ SystemInfo::CurName, ":platform:/name", "" },	66	{ SystemInfo::Name, ":platform:/name", "" },
68	{ SystemInfo::CurBuildserverModel, ":platform:/buildserver_modelname", "" },	67	{ SystemInfo::BuildserverModel, ":platform:/buildserver_modelname", "" },
69	{ SystemInfo::CurConfigureModel, ":platform:/configure_modelname", "" },	68	{ SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" },
70	{ SystemInfo::CurPlayerPicture, ":platform:/playerpic", "" },	69	{ SystemInfo::PlayerPicture, ":platform:/playerpic", "" },
71	};	70	};
72		71
73	//! pointer to setting object to NULL	72	//! pointer to setting object to NULL
@@ -93,9 +92,8 @@ QVariant SystemInfo::value(enum SystemInfos info)
93	while(SystemInfosList[i].info != info)	92	while(SystemInfosList[i].info != info)
94	i++;	93	i++;
95	QString s = SystemInfosList[i].name;	94	QString s = SystemInfosList[i].name;
96	QString d = SystemInfosList[i].def;	95	LOG_INFO() << "GET:" << s << systemInfos->value(s).toString();
97	LOG_INFO() << "GET:" << s << systemInfos->value(s, d).toString();	96	return systemInfos->value(s);
98	return systemInfos->value(s, d);
99	}	97	}
100		98
101	QVariant SystemInfo::platformValue(enum PlatformInfo info, QString platform)	99	QVariant SystemInfo::platformValue(enum PlatformInfo info, QString platform)