rbutil: Get rid of configure_modelname in rbutil.ini.

The target selection string used for configure is the same as the
internally used player string, minus the (optional) variant suffix.
Don't duplicate things, simply strip the suffix.

Change-Id: Ic34bd5f933fab0d837adce0d0ae9c403868d720d

5 files changed, 2 insertions, 68 deletions

diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index 959a073757..8868ba937b 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -59,7 +59,6 @@ const static struct {
     { SystemInfo::Encoder,          ":platform:/encoder",           "" },
     { SystemInfo::Brand,            ":platform:/brand",             "" },
     { SystemInfo::Name,             ":platform:/name",              "" },
-    { SystemInfo::ConfigureModel,   ":platform:/configure_modelname", "" },
     { SystemInfo::PlayerPicture,    ":platform:/playerpic",         "" },
 };
 
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index 23288a1999..67863c2268 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -72,7 +72,6 @@ class SystemInfo : public QObject
             Encoder,
             Brand,
             Name,
-            ConfigureModel,
             PlayerPicture,
         };
 
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp
index 83c189b8a2..2f01f42e2c 100644
--- a/rbutil/rbutilqt/base/utils.cpp
+++ b/rbutil/rbutilqt/base/utils.cpp
@@ -381,7 +381,7 @@ QString Utils::checkEnvironment(bool permission)
     RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString());
     QString installed = rbinfo.target();
     if(!installed.isEmpty() && installed !=
-       SystemInfo::platformValue(SystemInfo::ConfigureModel).toString())
+       RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0))
     {
         text += tr("<li>Target mismatch detected.<br/>"
                 "Installed target: %1<br/>Selected target: %2.</li>")
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 1c865cb233..321d4bd096 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -147,7 +147,6 @@ bootloadername=
 manualname=
 brand=Archos
 usbid=0x05ab0031
-configure_modelname=archosplayer
 playerpic=archosplayer
 encoder=lame
 
@@ -158,7 +157,6 @@ bootloadername=
 manualname=
 brand=Archos
 usbid=0x05ab0031,0x05ab0060
-configure_modelname=archosrecorder
 playerpic=archosrecorder
 encoder=lame
 
@@ -169,7 +167,6 @@ bootloadername=
 manualname=archosfmrecorder
 brand=Archos
 usbid=0x05ab0060
-configure_modelname=archosrecorderv2
 playerpic=archosrecorderv2
 encoder=lame
 
@@ -180,7 +177,6 @@ bootloadername=
 manualname=
 brand=Archos
 usbid=0x05ab0060
-configure_modelname=archosfmrecorder
 playerpic=archosfmrecorder
 encoder=lame
 
@@ -191,7 +187,6 @@ bootloadername=
 manualname=
 brand=Archos
 usbid=0x058f9330
-configure_modelname=archosondiosp
 playerpic=archosondiosp
 encoder=lame
 
@@ -202,7 +197,6 @@ bootloadername=
 manualname=
 brand=Archos
 usbid=0x058f9330
-configure_modelname=archosondiofm
 playerpic=archosondiofm
 encoder=lame
 
@@ -215,7 +209,6 @@ bootloaderfilter=*.hex *.zip
 manualname=iriverh100
 brand=Iriver
 usbid=0x10063001
-configure_modelname=iriverh100
 playerpic=iriverh100
 encoder=rbspeex
 
@@ -228,7 +221,6 @@ bootloaderfilter=*.hex *.zip
 manualname=iriverh100
 brand=Iriver
 usbid=0x10063002
-configure_modelname=iriverh120
 playerpic=iriverh100
 encoder=rbspeex
 
@@ -241,7 +233,6 @@ bootloaderfilter=*.hex *.zip
 manualname=iriverh300
 brand=Iriver
 usbid=0x10063003
-configure_modelname=iriverh300
 playerpic=iriverh300
 encoder=rbspeex
 
@@ -253,7 +244,6 @@ bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022002
-configure_modelname=iriverh10_5gb
 playerpic=iriverh10_5gb
 encoder=rbspeex
 
@@ -265,7 +255,6 @@ bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022105, 0x41022102
-configure_modelname=iriverh10_5gb
 playerpic=iriverh10_5gb
 encoder=rbspeex
 
@@ -278,7 +267,6 @@ manualname=
 brand=Iriver
 usbid=0x0b7000ba
 usberror=0x41022101
-configure_modelname=iriverh10
 playerpic=iriverh10
 encoder=rbspeex
 
@@ -289,7 +277,6 @@ bootloadername=/ipod/bootloader-ipod1g2g.ipod
 manualname=
 brand=Apple
 ; no usb
-configure_modelname=ipod1g2g
 playerpic=ipod1g2g
 encoder=rbspeex
 
@@ -300,7 +287,6 @@ bootloadername=/ipod/bootloader-ipodcolor.ipod
 manualname=
 brand=Apple
 usbid=0x05ac1204
-configure_modelname=ipodcolor
 playerpic=ipodcolor
 encoder=rbspeex
 
@@ -311,7 +297,6 @@ bootloadername=/ipod/bootloader-ipodnano1g.ipod
 manualname=
 brand=Apple
 usbid=0x05ac120a
-configure_modelname=ipodnano1g
 playerpic=ipodnano1g
 encoder=rbspeex
 
@@ -322,7 +307,6 @@ bootloadername=/ipod/bootloader-ipodnano2g.ipodx
 manualname=
 brand=Apple
 usbid=0x05ac1260
-configure_modelname=ipodnano2g
 playerpic=ipodnano2g
 encoder=rbspeex
 
@@ -333,7 +317,6 @@ bootloadername=/ipod/bootloader-ipod4g.ipod
 manualname=
 brand=Apple
 usbid=0x05ac1203
-configure_modelname=ipod4g
 playerpic=ipod4g
 encoder=rbspeex
 
@@ -344,7 +327,6 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod
 manualname=
 brand=Apple
 usbid=0x05ac1209
-configure_modelname=ipodvideo
 playerpic=ipodvideo
 encoder=rbspeex
 
@@ -355,7 +337,6 @@ bootloadername=/ipod/bootloader-ipod6g.ipod
 manualname=
 brand=Apple
 usbid=0x05ac1261
-configure_modelname=ipod6g
 playerpic=ipod6g
 encoder=rbspeex
 
@@ -366,7 +347,6 @@ bootloadername=/ipod/bootloader-ipod3g.ipod
 manualname=
 brand=Apple
 usbid=0x05ac1201
-configure_modelname=ipod3g
 playerpic=ipod3g
 encoder=rbspeex
 
@@ -376,7 +356,6 @@ bootloadermethod=ipod
 bootloadername=/ipod/bootloader-ipodmini1g.ipod
 brand=Apple
 usbid=0x05ac1205
-configure_modelname=ipodmini1g
 playerpic=ipodmini1g
 encoder=rbspeex
 
@@ -387,7 +366,6 @@ bootloadername=/ipod/bootloader-ipodmini2g.ipod
 manualname=ipodmini1g
 brand=Apple
 usbid=0x05ac1205
-configure_modelname=ipodmini2g
 playerpic=ipodmini1g
 encoder=rbspeex
 
@@ -399,7 +377,6 @@ bootloaderfile=/FIRMWARE/x5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210510, 0x0e210513
-configure_modelname=iaudiox5
 playerpic=iaudiox5
 encoder=rbspeex
 
@@ -411,7 +388,6 @@ bootloaderfile=/FIRMWARE/x5v_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210510, 0x0e210513
-configure_modelname=iaudiox5
 playerpic=iaudiox5
 encoder=rbspeex
 
@@ -423,7 +399,6 @@ bootloaderfile=/FIRMWARE/m5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210520
-configure_modelname=iaudiom5
 playerpic=iaudiom5
 encoder=rbspeex
 
@@ -435,7 +410,6 @@ bootloaderfile=/FIRMWARE/cowon_m3.bin
 manualname=
 brand=Cowon
 usbid=0x0e210500
-configure_modelname=iaudiom3
 playerpic=iaudiom3
 encoder=rbspeex
 
@@ -447,7 +421,6 @@ bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT
 manualname=
 brand=Toshiba
 usbid=0x09300009
-configure_modelname=gigabeatfx
 playerpic=gigabeatfx
 encoder=rbspeex
 
@@ -457,7 +430,6 @@ bootloadermethod=none
 manualname=
 brand=Toshiba
 usbid=0x09300010
-configure_modelname=gigabeats
 playerpic=gigabeats
 encoder=rbspeex
 status=disabled
@@ -470,7 +442,6 @@ manualname=
 brand=Sandisk
 usbid=0x07817421
 usberror=0x07817420
-configure_modelname=sansae200
 playerpic=sansae200
 encoder=rbspeex
 
@@ -481,7 +452,6 @@ bootloadername=/sandisk-sansa/c200/firmware.mi4
 manualname=
 brand=Sandisk
 usbid=0x07817450, 0x07817451
-configure_modelname=sansac200
 playerpic=sansac200
 encoder=rbspeex
 
@@ -495,7 +465,6 @@ manualname=
 brand=Sandisk
 usbid=0x07817423
 usberror=0x07817422
-configure_modelname=sansae200v2
 playerpic=sansae200
 encoder=rbspeex
 
@@ -509,7 +478,6 @@ manualname=
 brand=Sandisk
 usbid=0x07817453
 usberror=0x07817452
-configure_modelname=sansac200v2
 playerpic=sansac200
 encoder=rbspeex
 
@@ -523,7 +491,6 @@ manualname=
 brand=Sandisk
 usbid=0x078174c1
 usberror=0x078174c0
-configure_modelname=sansafuze
 playerpic=sansafuze
 encoder=rbspeex
 
@@ -537,7 +504,6 @@ manualname=
 brand=Sandisk
 usbid=0x078174c3
 usberror=0x078174c2
-configure_modelname=sansafuzev2
 playerpic=sansafuze
 encoder=rbspeex
 
@@ -551,7 +517,6 @@ manualname=
 brand=Sandisk
 usbid=0x078174e1
 usberror=
-configure_modelname=sansafuzeplus
 playerpic=sansafuzeplus
 encoder=rbspeex
 
@@ -565,7 +530,6 @@ manualname=
 brand=Sandisk
 usbid=
 usberror=
-configure_modelname=sansam200v4
 playerpic=sansam200v4
 encoder=rbspeex
 status=disabled
@@ -580,7 +544,6 @@ manualname=
 brand=Sandisk
 usbid=0x07817433
 usberror=0x07817432
-configure_modelname=sansaclip
 playerpic=sansaclip
 encoder=rbspeex
 
@@ -594,7 +557,6 @@ manualname=
 brand=Sandisk
 usbid=0x07817435
 usberror=0x07817434
-configure_modelname=sansaclipv2
 playerpic=sansaclip
 encoder=rbspeex
 
@@ -608,7 +570,6 @@ manualname=
 brand=Sandisk
 usbid=0x078174d1
 usberror=0x078174d0
-configure_modelname=sansaclipplus
 playerpic=sansaclipplus
 encoder=rbspeex
 
@@ -622,7 +583,6 @@ manualname=
 brand=Sandisk
 usbid=0x078174e5
 usberror=0x078174e4
-configure_modelname=sansaclipzip
 playerpic=sansaclipzip
 encoder=rbspeex
 
@@ -634,7 +594,6 @@ bootloaderfile=/System/pp5020.mi4
 manualname=
 brand=Olympus
 usbid=0x07b40280
-configure_modelname=mrobe100
 playerpic=mrobe100
 encoder=rbspeex
 
@@ -647,7 +606,6 @@ bootloaderfilter=*.hxf *.zip
 manualname=
 brand=Onda
 usbid=0x07c4a4a5
-configure_modelname=ondavx747
 playerpic=vx747
 encoder=rbspeex
 status=disabled
@@ -661,7 +619,6 @@ bootloaderfilter=*.hxf *.zip
 manualname=
 brand=Onda
 usbid=0x07c4a4a5
-configure_modelname=ondavx747p
 playerpic=vx747
 encoder=rbspeex
 status=disabled
@@ -675,7 +632,6 @@ bootloaderfilter=*.hxf *.zip
 manualname=
 brand=Onda
 usbid=0x07c4a4a5
-configure_modelname=ondavx777
 playerpic=vx777
 encoder=rbspeex
 status=disabled
@@ -688,7 +644,6 @@ bootloaderfile=/SYSTEM/FW_YH820.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85023
-configure_modelname=samsungyh820
 playerpic=samsungyh820
 encoder=rbspeex
 
@@ -700,7 +655,6 @@ bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85022, 0x04e8501d
-configure_modelname=samsungyh920
 playerpic=samsungyh920
 encoder=rbspeex
 
@@ -712,7 +666,6 @@ bootloaderfile=/SYSTEM/FW_YH925.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85024
-configure_modelname=samsungyh925
 playerpic=samsungyh925
 encoder=rbspeex
 
@@ -726,7 +679,6 @@ manualname=
 brand=Cowon
 usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890
 usberror=0x0e210801, 0x0e210861, 0x0e210871, 0x0e210881, 0x0e210891
-configure_modelname=cowond2
 playerpic=cowond2
 encoder=rbspeex
 status=disabled
@@ -740,7 +692,6 @@ manualname=
 brand=Packard Bell
 usbid=0x04098038
 usberror=0x04098039
-configure_modelname=vibe500
 playerpic=vibe500
 encoder=rbspeex
 
@@ -753,7 +704,6 @@ bootloaderfilter=*.bin *.zip
 manualname=
 brand=MPIO
 usbid=0x27351004
-configure_modelname=mpiohd200
 playerpic=mpiohd200
 encoder=rbspeex
 
@@ -766,7 +716,6 @@ bootloaderfilter=*.bin *.zip
 manualname=
 brand=MPIO
 usbid=0x27351005
-configure_modelname=mpiohd300
 playerpic=mpiohd300
 encoder=rbspeex
 
@@ -778,7 +727,6 @@ bootloaderfile=/System/FWImage.ebn
 manualname=
 brand=Philips
 usbid=0x0471014c
-configure_modelname=gogearhdd1630
 playerpic=gogearhdd1630
 encoder=rbspeex
 
@@ -790,7 +738,6 @@ bootloaderfile=/System/FWImage.ebn
 manualname=
 brand=Philips
 usbid=0x0471014b
-configure_modelname=gogearhdd6330
 playerpic=gogearhdd6330
 encoder=rbspeex
 
@@ -801,7 +748,6 @@ bootloaderfile=/System/FWImage.ebn
 manualname=
 brand=Philips
 usbid=0x0471014f
-configure_modelname=gogearsa9200
 playerpic=gogearsa9200
 encoder=rbspeex
 status=disabled
@@ -816,7 +762,6 @@ manualname=
 brand=Creative
 usbid=0x041e2020
 usberror=
-configure_modelname=creativezenxfi3
 playerpic=creativezenxfi3
 encoder=rbspeex
 
@@ -830,7 +775,6 @@ manualname=
 brand=xDuoo
 usbid=0x0525a4a5
 usberror=
-configure_modelname=xduoox3
 playerpic=xduoox3
 encoder=rbspeex
 
@@ -844,7 +788,6 @@ manualname=
 brand=xDuoo
 usbid=0xc502003c ; shared with X20
 usberror=
-configure_modelname=xduoox3ii
 playerpic=xduoox3ii
 encoder=rbspeex
 
@@ -858,7 +801,6 @@ manualname=
 brand=xDuoo
 usbid=0xc502003c ; shared with X3ii
 usberror=
-configure_modelname=xduoox20
 playerpic=xduoox20
 encoder=rbspeex
 
@@ -872,7 +814,6 @@ manualname=
 brand=AGPTek
 usbid=0xc5020029
 usberror=
-configure_modelname=agptekrocker
 playerpic=agptekrocker
 encoder=rbspeex
 
@@ -886,7 +827,6 @@ manualname=
 brand=AIGO/EROS
 usbid=0xc5020023 ; shared across EROS Q/K series
 usberror=
-configure_modelname=aigoerosq
 playerpic=aigoerosq
 encoder=rbspeex
 
@@ -900,7 +840,6 @@ manualname=
 brand=AIGO/EROS
 usbid=0xc5020023 ; shared across EROS Q/K series
 usberror=
-configure_modelname=aigoerosq
 playerpic=aigoerosk
 encoder=rbspeex
 
@@ -914,7 +853,6 @@ manualname=aigoerosk
 brand=AGPTek
 usbid=0xc5020023 ; shared across EROS Q / K series
 usberror=
-configure_modelname=aigoerosq
 playerpic=aigoerosk
 encoder=rbspeex
 
@@ -928,7 +866,6 @@ manualname=aigoerosq
 brand=Surfans
 usbid=0xc5020023 ; shared across EROS Q / K series
 usberror=
-configure_modelname=aigoerosq
 playerpic=aigoerosk
 encoder=rbspeex
 
@@ -942,7 +879,6 @@ manualname=erosq
 brand=HIFI WALKER
 usbid=0xc5020023 ; shared across EROS Q / K series
 usberror=
-configure_modelname=aigoerosq
 playerpic=aigoerosq
 encoder=rbspeex
 
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index 71e90cb7c8..e87d530c8c 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -86,7 +86,7 @@ void ThemesInstallWindow::downloadInfo()
 
     QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString();
     infoUrl.replace("%TARGET%",
-            SystemInfo::platformValue(SystemInfo::ConfigureModel).toString());
+            RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0));
     infoUrl.replace("%REVISION%", installInfo.revision());
     infoUrl.replace("%RELEASE%", installInfo.release());
     infoUrl.replace("%RBUTILVER%", VERSION);