devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Store server info in RbSettings volatile in a QMap instead of putting it into the user settings.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24312 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2010-01-21 17:50:47 +00:00
parent b1dfdd4c7a
commit 329ea014e8
2 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rbutil/rbutilqt/base/rbsettings.cpp
View file

@ -111,7 +111,7 @@ const static struct {
//! pointer to setting object to NULL //! pointer to setting object to NULL
QSettings* RbSettings::systemSettings = NULL; QSettings* RbSettings::systemSettings = NULL;
QSettings* RbSettings::userSettings = NULL; QSettings* RbSettings::userSettings = NULL;
QSettings* RbSettings::serverSettings = NULL; QMap<QString, QVariant> RbSettings::serverSettings;
void RbSettings::ensureRbSettingsExists() void RbSettings::ensureRbSettingsExists()
{ {
@ -122,12 +122,6 @@ void RbSettings::ensureRbSettingsExists()
systemSettings = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0); systemSettings = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0);
} }
if(serverSettings == NULL)
{
serverSettings = new QSettings(QSettings::IniFormat,
QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL);
}
if(userSettings == NULL) if(userSettings == NULL)
{ {
// portable installation: // portable installation:
@ -231,8 +225,8 @@ QVariant RbSettings::value(enum ServerSettings setting)
i++; i++;
QString s = constructSettingPath(ServerSettingsList[i].name); QString s = constructSettingPath(ServerSettingsList[i].name);
qDebug() << "[Settings] GET SERV:" << s << serverSettings->value(s, ServerSettingsList[i].def).toString(); qDebug() << "[Settings] GET SERV:" << s << serverSettings.value(s, ServerSettingsList[i].def).toString();
return serverSettings->value(s, ServerSettingsList[i].def); return serverSettings.value(s);
} }
void RbSettings::setValue(enum UserSettings setting , QVariant value) void RbSettings::setValue(enum UserSettings setting , QVariant value)
@ -257,8 +251,8 @@ void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant va
void RbSettings::setValue(enum ServerSettings setting, QVariant value) void RbSettings::setValue(enum ServerSettings setting, QVariant value)
{ {
QString empty; QString empty;
return setPlatformValue(empty, setting, value); return setPlatformValue(empty, setting, value);
} }
void RbSettings::setPlatformValue(QString platform, enum ServerSettings setting, QVariant value) void RbSettings::setPlatformValue(QString platform, enum ServerSettings setting, QVariant value)
@ -272,8 +266,8 @@ void RbSettings::setPlatformValue(QString platform, enum ServerSettings setting,
QString s = ServerSettingsList[i].name; QString s = ServerSettingsList[i].name;
s.replace(":platform:", platform); s.replace(":platform:", platform);
serverSettings->setValue(s, value); serverSettings.insert(s, value);
qDebug() << "[Settings] SET SERV:" << s << serverSettings->value(s).toString(); qDebug() << "[Settings] SET SERV:" << s << serverSettings.value(s).toString();
} }

2
rbutil/rbutilqt/base/rbsettings.h
View file

@ -151,7 +151,7 @@ class RbSettings : public QObject
//! pointers to our setting objects //! pointers to our setting objects
static QSettings *systemSettings; static QSettings *systemSettings;
static QSettings *userSettings; static QSettings *userSettings;
static QSettings *serverSettings; static QMap<QString, QVariant> serverSettings;
}; };
#endif #endif