feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Designer: Use core settings instead of keeping QSettings instance.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-05-19 10:01:50 +02:00
parent 5cfb194134
commit 15ef6ad093
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/designer/settingsmanager.cpp
View File

@@ -33,53 +33,69 @@
#include "settingsmanager.h" #include "settingsmanager.h"
#include "designerconstants.h" #include "designerconstants.h"
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
#include <QtCore/QSettings>
#include <QtCore/QDebug> #include <QtCore/QDebug>
using namespace Designer::Internal; using namespace Designer::Internal;
static inline QSettings *coreSettings()
{
if (const Core::ICore *core = Core::ICore::instance())
return core->settings();
return 0;
}
void SettingsManager::beginGroup(const QString &prefix) void SettingsManager::beginGroup(const QString &prefix)
{ {
if (Designer::Constants::Internal::debug > 1) QSettings *settings = coreSettings();
qDebug() << Q_FUNC_INFO << addPrefix(prefix); QTC_ASSERT(settings, return; )
m_settings.beginGroup(addPrefix(prefix)); settings->beginGroup(addPrefix(prefix));
} }
void SettingsManager::endGroup() void SettingsManager::endGroup()
{ {
if (Designer::Constants::Internal::debug > 1) QSettings *settings = coreSettings();
qDebug() << Q_FUNC_INFO; QTC_ASSERT(settings, return; )
m_settings.endGroup(); settings->endGroup();
} }
bool SettingsManager::contains(const QString &key) const bool SettingsManager::contains(const QString &key) const
{ {
return m_settings.contains(addPrefix(key)); const QSettings *settings = coreSettings();
QTC_ASSERT(settings, return false; )
return settings->contains(addPrefix(key));
} }
void SettingsManager::setValue(const QString &key, const QVariant &value) void SettingsManager::setValue(const QString &key, const QVariant &value)
{ {
if (Designer::Constants::Internal::debug > 1) QSettings *settings = coreSettings();
qDebug() << Q_FUNC_INFO << addPrefix(key) << ": " << value; QTC_ASSERT(settings, return; )
m_settings.setValue(addPrefix(key), value); settings->setValue(addPrefix(key), value);
} }
QVariant SettingsManager::value(const QString &key, const QVariant &defaultValue) const QVariant SettingsManager::value(const QString &key, const QVariant &defaultValue) const
{ {
QVariant result = m_settings.value(addPrefix(key), defaultValue); const QSettings *settings = coreSettings();
if (Designer::Constants::Internal::debug > 1) QTC_ASSERT(settings, return QVariant(); )
qDebug() << Q_FUNC_INFO << addPrefix(key) << ": " << result; return settings->value(addPrefix(key), defaultValue);
return result;
} }
void SettingsManager::remove(const QString &key) void SettingsManager::remove(const QString &key)
{ {
m_settings.remove(addPrefix(key)); QSettings *settings = coreSettings();
QTC_ASSERT(settings, return; )
settings->remove(addPrefix(key));
} }
QString SettingsManager::addPrefix(const QString &name) const QString SettingsManager::addPrefix(const QString &name) const
{ {
const QSettings *settings = coreSettings();
QTC_ASSERT(settings, return name; )
QString result = name; QString result = name;
if (m_settings.group().isEmpty()) if (settings->group().isEmpty())
result.insert(0, QLatin1String("Designer")); result.prepend(QLatin1String("Designer"));
return result; return result;
} }

2
src/plugins/designer/settingsmanager.h
View File

@@ -34,7 +34,6 @@
#define SETTINGSMANAGER_H #define SETTINGSMANAGER_H
#include "qt_private/abstractsettings_p.h" #include "qt_private/abstractsettings_p.h"
#include <QtCore/QSettings>
namespace Designer { namespace Designer {
namespace Internal { namespace Internal {
@@ -55,7 +54,6 @@ public:
private: private:
QString addPrefix(const QString &name) const; QString addPrefix(const QString &name) const;
QSettings m_settings;
}; };
} // namespace Internal } // namespace Internal