diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-08-16 16:56:29 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-03 09:38:50 +0000 |
commit | c81070aa7d233eaf34982fbde0e847c4fdfe33c8 (patch) | |
tree | 6adbab3045a80ae4b90b889b660f0ba7cba971b5 /src/plugins/help | |
parent | 0c58248894630aed7837efaf65e3215d0b2c23c0 (diff) | |
download | qt-creator-c81070aa7d233eaf34982fbde0e847c4fdfe33c8.tar.gz |
Help: Remove reading of old settings
Change-Id: Icb479dd0c558f45e70cb1ff0665b1e51e131d0b6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/help')
-rw-r--r-- | src/plugins/help/localhelpmanager.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 5142a72877..ed17596399 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -68,12 +68,6 @@ static const char kLastShownPagesKey[] = "Help/LastShownPages"; static const char kLastShownPagesZoomKey[] = "Help/LastShownPagesZoom"; static const char kLastSelectedTabKey[] = "Help/LastSelectedTab"; -// TODO remove some time after 4.1 -static const char kFontStyleKey[] = "Help/FallbackFontStyle"; -static const char kFontWeightKey[] = "Help/FallbackFontWeight"; -static const QFont::Style kDefaultFallbackFontStyle = QFont::StyleNormal; -static const int kDefaultFallbackFontWeight = QFont::Normal; - static const int kDefaultFallbackFontSize = 14; static QString defaultFallbackFontFamily() @@ -151,28 +145,14 @@ QFont LocalHelpManager::fallbackFont() const QString family = settings->value(kFontFamilyKey, defaultFallbackFontFamily()).toString(); const int size = settings->value(kFontSizeKey, kDefaultFallbackFontSize).toInt(); QFont font(family, size); - // TODO remove reading of old settings some time after 4.1 - if (settings->contains(kFontStyleKey) && settings->contains(kFontWeightKey)) { - const QFont::Style style = QFont::Style(settings->value(kFontStyleKey, kDefaultFallbackFontStyle).toInt()); - const int weight = settings->value(kFontWeightKey, kDefaultFallbackFontWeight).toInt(); - font.setStyle(style); - font.setWeight(weight); - } else { - const QString styleName = settings->value(kFontStyleNameKey, - defaultFallbackFontStyleName(font.family())).toString(); - font.setStyleName(styleName); - } + const QString styleName = settings->value(kFontStyleNameKey, + defaultFallbackFontStyleName(font.family())).toString(); + font.setStyleName(styleName); return font; } void LocalHelpManager::setFallbackFont(const QFont &font) { - { - // TODO remove removal of old settings some time after 4.1 - QSettings *settings = Core::ICore::settings(); - settings->remove(kFontStyleKey); - settings->remove(kFontWeightKey); - } setOrRemoveSetting(kFontFamilyKey, font.family(), defaultFallbackFontFamily()); setOrRemoveSetting(kFontStyleNameKey, font.styleName(), defaultFallbackFontStyleName(font.family())); setOrRemoveSetting(kFontSizeKey, font.pointSize(), kDefaultFallbackFontSize); |