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

Icons: Remove transition helper

Browse Source 
Change-Id: Iff8b3d50cc212ec5f40b494e455e36909fee0c80
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Arnold Dumas
2018-03-03 09:50:19 +01:00
parent 41a8e410be
commit 66548fdb76
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/todo/settings.cpp
View File

@@ -61,17 +61,6 @@ void Settings::save(QSettings *settings) const
settings->sync(); settings->sync();
} }
// Compatibility helper for transition from 3.6 to higher
// TODO: remove in 4.0
IconType resourceToTypeKey(const QString &key)
{
if (key.contains("error"))
return IconType::Error;
else if (key.contains("warning"))
return IconType::Warning;
return IconType::Info;
}
void Settings::load(QSettings *settings) void Settings::load(QSettings *settings)
{ {
setDefault(); setDefault();
@@ -88,16 +77,13 @@ void Settings::load(QSettings *settings)
if (keywordsSize > 0) { if (keywordsSize > 0) {
const QString nameKey = "name"; const QString nameKey = "name";
const QString colorKey = "color"; const QString colorKey = "color";
const QString iconResourceKey = "iconResource"; // Legacy since 3.7 TODO: remove in 4.0
const QString iconTypeKey = "iconType"; const QString iconTypeKey = "iconType";
for (int i = 0; i < keywordsSize; ++i) { for (int i = 0; i < keywordsSize; ++i) {
settings->setArrayIndex(i); settings->setArrayIndex(i);
Keyword keyword; Keyword keyword;
keyword.name = settings->value(nameKey).toString(); keyword.name = settings->value(nameKey).toString();
keyword.color = settings->value(colorKey).value<QColor>(); keyword.color = settings->value(colorKey).value<QColor>();
keyword.iconType = settings->contains(iconTypeKey) ? keyword.iconType = static_cast<IconType>(settings->value(iconTypeKey).toInt());
static_cast<IconType>(settings->value(iconTypeKey).toInt())
: resourceToTypeKey(settings->value(iconResourceKey).toString());
newKeywords << keyword; newKeywords << keyword;
} }
keywords = newKeywords; keywords = newKeywords;