d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-09 14:27:56 +00:00
Code Issues Projects Releases Wiki Activity

Keep compatibility with qBittorrent < 2.3.0 (import settings from the registry)

Browse Source
This commit is contained in:
Christophe Dumez 2010-07-16 15:11:20 +00:00
parent b9241ad5ad
commit 0c40a8ab05
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/qinisettings.h
View File

@ -35,41 +35,50 @@
class QIniSettings : public QSettings { class QIniSettings : public QSettings {
public: public:
QIniSettings(const QString &organization, const QString &application = QString(), QObject *parent = 0 ): QIniSettings(const QString &organization, const QString &application = QString(), QObject *parent = 0 ):
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
QSettings(QSettings::IniFormat, QSettings::UserScope, organization, application, parent) QSettings(QSettings::IniFormat, QSettings::UserScope, organization, application, parent)
#else #else
QSettings(organization, application, parent) QSettings(organization, application, parent)
#endif #endif
{ {
} }
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
QVariant value(const QString & key, const QVariant &defaultValue = QVariant()) const { QVariant value(const QString & key, const QVariant &defaultValue = QVariant()) const {
QVariant ret = QSettings::value(key); QVariant ret = QSettings::value(key);
if(format() == QSettings::NativeFormat) { if(format() == QSettings::NativeFormat) {
if(ret.isNull()) { if(ret.isNull()) {
// Fallback on Windows, use \ in key instead of / // Fallback on Windows, use \ in key instead of /
if(key.contains("/")) { if(key.contains("/")) {
ret = QSettings::value(key.replace("/", "\\")); ret = QSettings::value(key.replace("/", "\\"));
} else { } else {
if(key.contains("\\")) { if(key.contains("\\")) {
ret = QSettings::value(key.replace("\\", "/")); ret = QSettings::value(key.replace("\\", "/"));
} }
}
}
} }
if(ret.isNull()) }
return defaultValue; } else {
return ret; // Keep compatibility with qBittorrent < 2.3.0
// Import the setting from the registry
QSettings old_settings(organizationName(), applicationName());
ret = old_settings.value(key);
if(!ret.isEmpty()) {
setValue(key, ret);
old_settings.remove(key);
}
} }
if(ret.isNull())
return defaultValue;
return ret;
}
void setValue(const QString &key, const QVariant &val) { void setValue(const QString &key, const QVariant &val) {
if(format() == QSettings::NativeFormat) if(format() == QSettings::NativeFormat)
key = key.replace("/", "\\"); key = key.replace("/", "\\");
QSettings::setValue(key, val); QSettings::setValue(key, val);
} }
#endif #endif
}; };