From da358058cbe74d558734fb6312f21bf092f61e05 Mon Sep 17 00:00:00 2001
From: Dominik Wenger <domonoky@googlemail.com>
Date: Sat, 22 Aug 2009 14:05:20 +0000
Subject: rbutil: use target-id from rockbox-info.txt and remove it from
 rbutil.ini

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22463 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/base/rbsettings.cpp | 1 -
 rbutil/rbutilqt/base/rbsettings.h   | 1 -
 rbutil/rbutilqt/base/voicefile.cpp  | 1 +
 rbutil/rbutilqt/base/voicefile.h    | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'rbutil/rbutilqt/base')

diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp
index 412554905a..40b2d02bfc 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/rbutil/rbutilqt/base/rbsettings.cpp
@@ -55,7 +55,6 @@ const static struct {
     { RbSettings::CurName,              ":platform:/name",      "" },
     { RbSettings::CurBuildserverModel,  ":platform:/buildserver_modelname", "" },
     { RbSettings::CurConfigureModel,    ":platform:/configure_modelname", "" },
-    { RbSettings::CurTargetId,          ":platform:/targetid",  "" },
 };
 
 // user settings
diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h
index 7325f87f8b..e178be0e52 100644
--- a/rbutil/rbutilqt/base/rbsettings.h
+++ b/rbutil/rbutilqt/base/rbsettings.h
@@ -94,7 +94,6 @@ class RbSettings : public QObject
             CurName,
             CurBuildserverModel,
             CurConfigureModel,
-            CurTargetId,
         };
         
         //! call this to flush the user Settings
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp
index 6eff308cd1..8edb240698 100644
--- a/rbutil/rbutilqt/base/voicefile.cpp
+++ b/rbutil/rbutilqt/base/voicefile.cpp
@@ -57,6 +57,7 @@ bool VoiceFileCreator::createVoiceFile()
     QString target = info.target();
     QString features = info.features();
     QString version = info.version();
+    m_targetid = info.targetID().toInt();
     version = version.left(version.indexOf("-")).remove("r");
  
     //prepare download url
diff --git a/rbutil/rbutilqt/base/voicefile.h b/rbutil/rbutilqt/base/voicefile.h
index 26c4a408f7..72f905e4f2 100644
--- a/rbutil/rbutilqt/base/voicefile.h
+++ b/rbutil/rbutilqt/base/voicefile.h
@@ -40,7 +40,6 @@ public:
     bool createVoiceFile();
 
     void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; }
-    void setTargetId(int id){m_targetid = id;}
     void setLang(QString name){m_lang =name;}
     void setWavtrimThreshold(int th){m_wavtrimThreshold = th;}
     
-- 
cgit v1.2.3