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

Help: Remove reading of fallback settings from 3.4

Browse Source 
Change-Id: I1a029f7cdfd067e5b3c180d9aca889a09c5ae2b2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2016-07-19 11:39:50 +02:00
parent 343d72fd3b
commit 6e730fd79c
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/help/localhelpmanager.cpp
View File

@@ -91,19 +91,6 @@ static void setOrRemoveSetting(const char *key, const T &value, const T &default
settings->setValue(QLatin1String(key), value); settings->setValue(QLatin1String(key), value);
} }
// TODO remove some time after Qt Creator 3.5
static QVariant getSettingWithFallback(const QString &settingsKey,
const QString &fallbackSettingsKey,
const QVariant &fallbackSettingsValue)
{
QSettings *settings = Core::ICore::settings();
if (settings->contains(settingsKey))
return settings->value(settingsKey);
// read from help engine for old settings
// TODO remove some time after Qt Creator 3.5
return LocalHelpManager::helpEngine().customValue(fallbackSettingsKey, fallbackSettingsValue);
}
LocalHelpManager::LocalHelpManager(QObject *parent) LocalHelpManager::LocalHelpManager(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
@@ -171,8 +158,8 @@ void LocalHelpManager::setFallbackFont(const QFont &font)
LocalHelpManager::StartOption LocalHelpManager::startOption() LocalHelpManager::StartOption LocalHelpManager::startOption()
{ {
const QVariant value = getSettingWithFallback(QLatin1String(kStartOptionKey), const QVariant value = Core::ICore::settings()->value(QLatin1String(kStartOptionKey),
QLatin1String("StartOption"), ShowLastPages); ShowLastPages);
bool ok; bool ok;
int optionValue = value.toInt(&ok); int optionValue = value.toInt(&ok);
if (!ok) if (!ok)
@@ -197,9 +184,8 @@ void LocalHelpManager::setStartOption(LocalHelpManager::StartOption option)
Core::HelpManager::HelpViewerLocation LocalHelpManager::contextHelpOption() Core::HelpManager::HelpViewerLocation LocalHelpManager::contextHelpOption()
{ {
const QVariant value = getSettingWithFallback(QLatin1String(kContextHelpOptionKey), const QVariant value = Core::ICore::settings()->value(QLatin1String(kContextHelpOptionKey),
QLatin1String("ContextHelpOption"), Core::HelpManager::SideBySideIfPossible);
Core::HelpManager::SideBySideIfPossible);
bool ok; bool ok;
int optionValue = value.toInt(&ok); int optionValue = value.toInt(&ok);
if (!ok) if (!ok)
@@ -226,8 +212,7 @@ void LocalHelpManager::setContextHelpOption(Core::HelpManager::HelpViewerLocatio
bool LocalHelpManager::returnOnClose() bool LocalHelpManager::returnOnClose()
{ {
const QVariant value = getSettingWithFallback(QLatin1String(kReturnOnCloseKey), const QVariant value = Core::ICore::settings()->value(QLatin1String(kReturnOnCloseKey), false);
QLatin1String("ReturnOnClose"), false);
return value.toBool(); return value.toBool();
} }
@@ -239,8 +224,8 @@ void LocalHelpManager::setReturnOnClose(bool returnOnClose)
QStringList LocalHelpManager::lastShownPages() QStringList LocalHelpManager::lastShownPages()
{ {
const QVariant value = getSettingWithFallback(QLatin1String(kLastShownPagesKey), const QVariant value = Core::ICore::settings()->value(QLatin1String(kLastShownPagesKey),
QLatin1String("LastShownPages"), QVariant()); QVariant());
return value.toString().split(Constants::ListSeparator, QString::SkipEmptyParts); return value.toString().split(Constants::ListSeparator, QString::SkipEmptyParts);
} }
@@ -252,8 +237,8 @@ void LocalHelpManager::setLastShownPages(const QStringList &pages)
QList<float> LocalHelpManager::lastShownPagesZoom() QList<float> LocalHelpManager::lastShownPagesZoom()
{ {
const QVariant value = getSettingWithFallback(QLatin1String(kLastShownPagesZoomKey), const QVariant value = Core::ICore::settings()->value(QLatin1String(kLastShownPagesZoomKey),
QLatin1String("LastShownPagesZoom"), QVariant()); QVariant());
const QStringList stringValues = value.toString().split(Constants::ListSeparator, const QStringList stringValues = value.toString().split(Constants::ListSeparator,
QString::SkipEmptyParts); QString::SkipEmptyParts);
return Utils::transform(stringValues, [](const QString &str) { return str.toFloat(); }); return Utils::transform(stringValues, [](const QString &str) { return str.toFloat(); });
@@ -269,8 +254,7 @@ void LocalHelpManager::setLastShownPagesZoom(const QList<float> &zoom)
int LocalHelpManager::lastSelectedTab() int LocalHelpManager::lastSelectedTab()
{ {
const QVariant value = getSettingWithFallback(QLatin1String(kLastSelectedTabKey), const QVariant value = Core::ICore::settings()->value(QLatin1String(kLastSelectedTabKey), 0);
QLatin1String("LastTabPage"), 0);
return value.toInt(); return value.toInt();
} }