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

Help: Remove reading of old settings

Browse Source 
Change-Id: Icb479dd0c558f45e70cb1ff0665b1e51e131d0b6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2018-08-16 16:56:29 +02:00
parent 0c58248894
commit c81070aa7d
2 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/helpmanager.h
View File

@@ -67,22 +67,19 @@ public:
static void registerUserDocumentation(const QStringList &filePaths); static void registerUserDocumentation(const QStringList &filePaths);
static QSet<QString> userDocumentationPaths(); static QSet<QString> userDocumentationPaths();
static QMap<QString, QUrl> linksForKeyword(const QString &key);
static QMap<QString, QUrl> linksForIdentifier(const QString &id);
static QUrl findFile(const QUrl &url); static QUrl findFile(const QUrl &url);
static QByteArray fileData(const QUrl &url); static QByteArray fileData(const QUrl &url);
static QMap<QString, QUrl> linksForKeyword(const QString &key);
static QMap<QString, QUrl> linksForIdentifier(const QString &id);
static QStringList registeredNamespaces(); static QStringList registeredNamespaces();
static QString namespaceFromFile(const QString &file); static QString namespaceFromFile(const QString &file);
static QString fileFromNamespace(const QString &nameSpace); static QString fileFromNamespace(const QString &nameSpace);
static void setCustomValue(const QString &key, const QVariant &value); static void setCustomValue(const QString &key, const QVariant &value);
static QVariant customValue(const QString &key, const QVariant &value = QVariant()); static QVariant customValue(const QString &key, const QVariant &value = QVariant());
static Filters filters(); static Filters filters();
static Filters fixedFilters(); static Filters fixedFilters();
static Filters userDefinedFilters(); static Filters userDefinedFilters();
static void removeUserDefinedFilter(const QString &filter); static void removeUserDefinedFilter(const QString &filter);
static void addUserDefinedFilter(const QString &filter, const QStringList &attr); static void addUserDefinedFilter(const QString &filter, const QStringList &attr);

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

@@ -68,12 +68,6 @@ static const char kLastShownPagesKey[] = "Help/LastShownPages";
static const char kLastShownPagesZoomKey[] = "Help/LastShownPagesZoom"; static const char kLastShownPagesZoomKey[] = "Help/LastShownPagesZoom";
static const char kLastSelectedTabKey[] = "Help/LastSelectedTab"; 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 const int kDefaultFallbackFontSize = 14;
static QString defaultFallbackFontFamily() static QString defaultFallbackFontFamily()
@@ -151,28 +145,14 @@ QFont LocalHelpManager::fallbackFont()
const QString family = settings->value(kFontFamilyKey, defaultFallbackFontFamily()).toString(); const QString family = settings->value(kFontFamilyKey, defaultFallbackFontFamily()).toString();
const int size = settings->value(kFontSizeKey, kDefaultFallbackFontSize).toInt(); const int size = settings->value(kFontSizeKey, kDefaultFallbackFontSize).toInt();
QFont font(family, size); 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, const QString styleName = settings->value(kFontStyleNameKey,
defaultFallbackFontStyleName(font.family())).toString(); defaultFallbackFontStyleName(font.family())).toString();
font.setStyleName(styleName); font.setStyleName(styleName);
}
return font; return font;
} }
void LocalHelpManager::setFallbackFont(const QFont &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(kFontFamilyKey, font.family(), defaultFallbackFontFamily());
setOrRemoveSetting(kFontStyleNameKey, font.styleName(), defaultFallbackFontStyleName(font.family())); setOrRemoveSetting(kFontStyleNameKey, font.styleName(), defaultFallbackFontStyleName(font.family()));
setOrRemoveSetting(kFontSizeKey, font.pointSize(), kDefaultFallbackFontSize); setOrRemoveSetting(kFontSizeKey, font.pointSize(), kDefaultFallbackFontSize);