1 files changed, 13 insertions, 51 deletions

diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp
index 909dba4951..560b9ab5fc 100644
--- a/rbutil/rbutilqt/rbsettings.cpp
+++ b/rbutil/rbutilqt/rbsettings.cpp
@@ -388,7 +388,7 @@ QString RbSettings::brand(QString plattform)
     return brand;
 }
 
-QMap<int, QString> RbSettings::usbIdMap()
+QMap<int, QString> RbSettings::usbIdMap(enum MapType type)
 {
     QMap<int, QString> map;
      // get a list of ID -> target name
@@ -397,31 +397,18 @@ QMap<int, QString> RbSettings::usbIdMap()
     platforms = devices->childKeys();
     devices->endGroup();
 
-    for(int i = 0; i < platforms.size(); i++)
-    {
-        devices->beginGroup("platforms");
-        QString target = devices->value(platforms.at(i)).toString();
-        devices->endGroup();
-        devices->beginGroup(target);
-        QStringList ids = devices->value("usbid").toStringList();
-        int j = ids.size();
-        while(j--)
-            map.insert(ids.at(j).toInt(0, 16), target);
-
-        devices->endGroup();
+    QString t;
+    switch(type) {
+        case MapDevice:
+            t = "usbid";
+            break;
+        case MapError:
+            t = "usberror";
+            break;
+        case MapIncompatible:
+            t = "usbincompat";
+            break;
     }
-    return map;
-}
-
-QMap<int, QString> RbSettings::usbIdErrorMap()
-{
-
-    QMap<int, QString> map;
-     // get a list of ID -> target name
-    QStringList platforms;
-    devices->beginGroup("platforms");
-    platforms = devices->childKeys();
-    devices->endGroup();
 
     for(int i = 0; i < platforms.size(); i++)
     {
@@ -429,36 +416,11 @@ QMap<int, QString> RbSettings::usbIdErrorMap()
         QString target = devices->value(platforms.at(i)).toString();
         devices->endGroup();
         devices->beginGroup(target);
-        QStringList ids = devices->value("usberror").toStringList();
+        QStringList ids = devices->value(t).toStringList();
         int j = ids.size();
         while(j--)
             map.insert(ids.at(j).toInt(0, 16), target);
-        devices->endGroup();
-    }
-    return map;
-}
-
-
-QMap<int, QString> RbSettings::usbIdIncompatMap()
-{
-
-    QMap<int, QString> map;
-     // get a list of ID -> target name
-    QStringList platforms;
-    devices->beginGroup("platforms");
-    platforms = devices->childKeys();
-    devices->endGroup();
 
-    for(int i = 0; i < platforms.size(); i++)
-    {
-        devices->beginGroup("platforms");
-        QString target = devices->value(platforms.at(i)).toString();
-        devices->endGroup();
-        devices->beginGroup(target);
-        QStringList ids = devices->value("usbincompat").toStringList();
-        int j = ids.size();
-        while(j--)
-            map.insert(ids.at(j).toInt(0, 16), target);
         devices->endGroup();
     }
     return map;