From 0c14a675380de0f0fe5f21f07ed554038c90668a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Tue, 26 Nov 2019 09:49:28 +0000
Subject: [PATCH] avoid temporary map in WriteIncludes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 src/tools/uic/cpp/cppwriteincludes.cpp | 28 +++++++++++++++++---------
 src/tools/uic/cpp/cppwriteincludes.h   |  3 ---
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 2702dc35e..fd3e223e4 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -756,9 +756,6 @@ static const qint16 ClassTblSize = sizeof(ClassTbl) / sizeof(ClassTblData);
 WriteIncludes::WriteIncludes(Uic *uic)
     : m_uic(uic), m_output(uic->output()), m_scriptsActivated(false), m_laidOut(false)
 {
-    for (qint16 i = 0; i < ClassTblSize; i++) {
-        m_classToHeader.insert(ClassTbl[i].klass, ClassTbl[i].header);
-    }
 }
 
 void WriteIncludes::acceptUI(DomUI *node)
@@ -839,11 +836,17 @@ void WriteIncludes::insertIncludeForClass(const QString &className, QString head
         if (!header.isEmpty())
             break;
 
-        // Known class        
-        const StringMap::const_iterator it = m_classToHeader.constFind(className);
-        if (it != m_classToHeader.constEnd()) {
-            header = it.value();
-            global =  true;
+        // Known class
+        bool isknown = false;
+        for (qint16 i = 0; i < ClassTblSize; i++) {
+            if (ClassTbl[i].klass == className) {
+                header = ClassTbl[i].header;
+                global =  true;
+                isknown = true;
+                break;
+            }
+        }
+        if (isknown) {
             break;
         }
 
@@ -915,7 +918,14 @@ void WriteIncludes::acceptCustomWidget(DomCustomWidget *node)
         // custom header unless it is a built-in qt class
         QString header;
         bool global = false;
-        if (!m_classToHeader.contains(className)) {
+        bool isknown = false;
+        for (qint16 i = 0; i < ClassTblSize; i++) {
+            if (ClassTbl[i].klass == className) {
+                isknown = true;
+                break;
+            }
+        }
+        if (!isknown) {
             global = node->elementHeader()->attributeLocation().toLower() == QLatin1String("global");
             header = node->elementHeader()->text();
         }
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index b7f968f72..94b0bfeb7 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -94,9 +94,6 @@ private:
 
     QSet<QString> m_knownClasses;
 
-    typedef QMap<QString, QString> StringMap;
-    StringMap m_classToHeader;
-
     bool m_scriptsActivated;
     bool m_laidOut;
 };