From 66548fdb76ef50513a4636d884aff1c8907f3e6a Mon Sep 17 00:00:00 2001
From: Arnold Dumas <arnold@dumas.at>
Date: Sat, 3 Mar 2018 09:50:19 +0100
Subject: [PATCH] Icons: Remove transition helper

Change-Id: Iff8b3d50cc212ec5f40b494e455e36909fee0c80
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/todo/settings.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/plugins/todo/settings.cpp b/src/plugins/todo/settings.cpp
index 615081cb283..0db65d0c2d0 100644
--- a/src/plugins/todo/settings.cpp
+++ b/src/plugins/todo/settings.cpp
@@ -61,17 +61,6 @@ void Settings::save(QSettings *settings) const
     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)
 {
     setDefault();
@@ -88,16 +77,13 @@ void Settings::load(QSettings *settings)
     if (keywordsSize > 0) {
         const QString nameKey = "name";
         const QString colorKey = "color";
-        const QString iconResourceKey = "iconResource"; // Legacy since 3.7 TODO: remove in 4.0
         const QString iconTypeKey = "iconType";
         for (int i = 0; i < keywordsSize; ++i) {
             settings->setArrayIndex(i);
             Keyword keyword;
             keyword.name = settings->value(nameKey).toString();
             keyword.color = settings->value(colorKey).value<QColor>();
-            keyword.iconType = settings->contains(iconTypeKey) ?
-                        static_cast<IconType>(settings->value(iconTypeKey).toInt())
-                      : resourceToTypeKey(settings->value(iconResourceKey).toString());
+            keyword.iconType = static_cast<IconType>(settings->value(iconTypeKey).toInt());
             newKeywords << keyword;
         }
         keywords = newKeywords;