diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-29 23:00:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-29 23:00:13 (GMT) |
| commit | 4d144f84300fb2613391fbe3de9fc9fdba5c6691 (patch) | |
| tree | 16115abf9c185096cc9c928d8686873fd35a5fa2 /src | |
| parent | 0b8a04253e4842465427b3fcf6918a220905db0c (diff) | |
| parent | 4973e73c064f706aaadbda4c4cb27ff5c577702e (diff) | |
| download | Qt-4d144f84300fb2613391fbe3de9fc9fdba5c6691.zip Qt-4d144f84300fb2613391fbe3de9fc9fdba5c6691.tar.gz Qt-4d144f84300fb2613391fbe3de9fc9fdba5c6691.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 7b75d40..92f53ff 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -698,7 +698,7 @@ void QS60StylePrivate::deleteStoredSettings() { QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); settings.beginGroup(QLatin1String("QS60Style")); - settings.remove(""); + settings.remove(QString()); settings.endGroup(); } @@ -717,7 +717,6 @@ QColor QS60StylePrivate::colorFromFrameGraphics(SkinFrameElements frame) const QT_TRAP_THROWING( CRepository *themeRepository = CRepository::NewLC(personalisationUID); if (themeRepository) { - static const TInt KThemePkgIDDesSize = 23; //size of the stored theme package ID TBuf<32> value; //themeID is currently max of 8 + 1 + 8 characters, but lets have some extra space const TUint32 key = 0x00000002; //active theme key in the repository error = themeRepository->Get(key, value); @@ -747,7 +746,7 @@ QColor QS60StylePrivate::colorFromFrameGraphics(SkinFrameElements frame) const return storedColor; } } - settings.remove(""); //if color was invalid, or theme has been changed, just delete all stored settings + settings.remove(QString()); //if color was invalid, or theme has been changed, just delete all stored settings } } #endif |