rbutil: make RbSettings a static class. (FS#10183 with improvements)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20890 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2009-05-09 16:59:14 +00:00
parent 8e63df19cb
commit 33d9cf091a
28 changed files with 395 additions and 444 deletions

View file

@ -19,6 +19,7 @@
#include <QtCore>
#include "autodetection.h"
#include "rbsettings.h"
#include "../ipodpatcher/ipodpatcher.h"
#include "../sansapatcher/sansapatcher.h"
@ -396,9 +397,9 @@ bool Autodetection::detectUsb()
// usbids holds the mapping in the form
// ((VID<<16)|(PID)), targetname
// the ini file needs to hold the IDs as hex values.
QMap<int, QString> usbids = settings->usbIdMap(RbSettings::MapDevice);
QMap<int, QString> usberror = settings->usbIdMap(RbSettings::MapError);
QMap<int, QString> usbincompat = settings->usbIdMap(RbSettings::MapIncompatible);
QMap<int, QString> usbids = RbSettings::usbIdMap(RbSettings::MapDevice);
QMap<int, QString> usberror = RbSettings::usbIdMap(RbSettings::MapError);
QMap<int, QString> usbincompat = RbSettings::usbIdMap(RbSettings::MapIncompatible);
// usb pid detection
QList<uint32_t> attached;