cplusplus: Make functions of Icons static

This avoids multiple instatiations and reloading of the same image files.

Change-Id: I4d0bb955e23c1cb817671c25bff4e74fb7b3d0f4
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

9 files changed, 35 insertions, 57 deletions

diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
index 6d0307903f..8ec96a8098 100644
--- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
@@ -219,7 +219,6 @@ QString ClangAssistProposalItem::text() const
 QIcon ClangAssistProposalItem::icon() const
 {
     using CPlusPlus::Icons;
-    static const CPlusPlus::Icons m_icons;
     static const char SNIPPET_ICON_PATH[] = ":/texteditor/images/snippet.png";
     static const QIcon snippetIcon = QIcon(QLatin1String(SNIPPET_ICON_PATH));
 
@@ -227,11 +226,11 @@ QIcon ClangAssistProposalItem::icon() const
         case CodeCompletion::ClassCompletionKind:
         case CodeCompletion::TemplateClassCompletionKind:
         case CodeCompletion::TypeAliasCompletionKind:
-            return m_icons.iconForType(Icons::ClassIconType);
+            return Icons::iconForType(Icons::ClassIconType);
         case CodeCompletion::EnumerationCompletionKind:
-            return m_icons.iconForType(Icons::EnumIconType);
+            return Icons::iconForType(Icons::EnumIconType);
         case CodeCompletion::EnumeratorCompletionKind:
-            return m_icons.iconForType(Icons::EnumeratorIconType);
+            return Icons::iconForType(Icons::EnumeratorIconType);
         case CodeCompletion::ConstructorCompletionKind:
         case CodeCompletion::DestructorCompletionKind:
         case CodeCompletion::FunctionCompletionKind:
@@ -240,39 +239,39 @@ QIcon ClangAssistProposalItem::icon() const
             switch (m_codeCompletion.availability()) {
                 case CodeCompletion::Available:
                 case CodeCompletion::Deprecated:
-                    return m_icons.iconForType(Icons::FuncPublicIconType);
+                    return Icons::iconForType(Icons::FuncPublicIconType);
                 default:
-                    return m_icons.iconForType(Icons::FuncPrivateIconType);
+                    return Icons::iconForType(Icons::FuncPrivateIconType);
             }
         case CodeCompletion::SignalCompletionKind:
-            return m_icons.iconForType(Icons::SignalIconType);
+            return Icons::iconForType(Icons::SignalIconType);
         case CodeCompletion::SlotCompletionKind:
             switch (m_codeCompletion.availability()) {
                 case CodeCompletion::Available:
                 case CodeCompletion::Deprecated:
-                    return m_icons.iconForType(Icons::SlotPublicIconType);
+                    return Icons::iconForType(Icons::SlotPublicIconType);
                 case CodeCompletion::NotAccessible:
                 case CodeCompletion::NotAvailable:
-                    return m_icons.iconForType(Icons::SlotPrivateIconType);
+                    return Icons::iconForType(Icons::SlotPrivateIconType);
             }
         case CodeCompletion::NamespaceCompletionKind:
-            return m_icons.iconForType(Icons::NamespaceIconType);
+            return Icons::iconForType(Icons::NamespaceIconType);
         case CodeCompletion::PreProcessorCompletionKind:
-            return m_icons.iconForType(Icons::MacroIconType);
+            return Icons::iconForType(Icons::MacroIconType);
         case CodeCompletion::VariableCompletionKind:
             switch (m_codeCompletion.availability()) {
                 case CodeCompletion::Available:
                 case CodeCompletion::Deprecated:
-                    return m_icons.iconForType(Icons::VarPublicIconType);
+                    return Icons::iconForType(Icons::VarPublicIconType);
                 default:
-                    return m_icons.iconForType(Icons::VarPrivateIconType);
+                    return Icons::iconForType(Icons::VarPrivateIconType);
             }
         case CodeCompletion::KeywordCompletionKind:
-            return m_icons.iconForType(Icons::KeywordIconType);
+            return Icons::iconForType(Icons::KeywordIconType);
         case CodeCompletion::ClangSnippetKind:
             return snippetIcon;
         case CodeCompletion::Other:
-            return m_icons.iconForType(Icons::UnknownIconType);
+            return Icons::iconForType(Icons::UnknownIconType);
     }
 
     return QIcon();
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
index c0e8904d1b..d19c12035d 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
@@ -46,6 +46,7 @@
 
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/ExpressionUnderCursor.h>
+#include <cplusplus/Icons.h>
 #include <cplusplus/SimpleLexer.h>
 
 #include <clangbackendipc/filecontainer.h>
@@ -454,7 +455,7 @@ void ClangCompletionAssistProcessor::completeIncludePath(const QString &realPath
             auto *item = new ClangPreprocessorAssistProposalItem;
             item->setText(text);
             item->setDetail(hint);
-            item->setIcon(m_icons.keywordIcon());
+            item->setIcon(Icons::keywordIcon());
             item->setCompletionOperator(m_completionOperator);
             m_completions.append(item);
         }
@@ -465,11 +466,11 @@ bool ClangCompletionAssistProcessor::completePreprocessorDirectives()
 {
     foreach (const QString &preprocessorCompletion, m_preprocessorCompletions)
         addCompletionItem(preprocessorCompletion,
-                          m_icons.iconForType(Icons::MacroIconType));
+                          Icons::iconForType(Icons::MacroIconType));
 
     if (m_interface->objcEnabled())
         addCompletionItem(QLatin1String("import"),
-                          m_icons.iconForType(Icons::MacroIconType));
+                          Icons::iconForType(Icons::MacroIconType));
 
     return !m_completions.isEmpty();
 }
@@ -477,7 +478,7 @@ bool ClangCompletionAssistProcessor::completePreprocessorDirectives()
 bool ClangCompletionAssistProcessor::completeDoxygenKeywords()
 {
     for (int i = 1; i < CppTools::T_DOXY_LAST_TAG; ++i)
-        addCompletionItem(QString::fromLatin1(CppTools::doxygenTagSpell(i)), m_icons.keywordIcon());
+        addCompletionItem(QString::fromLatin1(CppTools::doxygenTagSpell(i)), Icons::keywordIcon());
     return !m_completions.isEmpty();
 }
 
diff --git a/src/plugins/classview/classviewtreeitemmodel.cpp b/src/plugins/classview/classviewtreeitemmodel.cpp
index 2ce88dc31b..b00f8e3020 100644
--- a/src/plugins/classview/classviewtreeitemmodel.cpp
+++ b/src/plugins/classview/classviewtreeitemmodel.cpp
@@ -34,21 +34,6 @@
 namespace ClassView {
 namespace Internal {
 
-///////////////////////////////// TreeItemModelPrivate //////////////////////////////////
-
-/*!
-   \class TreeItemModelPrivate
-   \brief The TreeItemModelPrivate class contains private class data for
-   the TreeItemModel class.
-   \sa TreeItemModel
- */
-class TreeItemModelPrivate
-{
-public:
-    //! icon provider
-    CPlusPlus::Icons icons;
-};
-
 ///////////////////////////////// TreeItemModel //////////////////////////////////
 
 /*!
@@ -57,14 +42,12 @@ public:
 */
 
 TreeItemModel::TreeItemModel(QObject *parent)
-    : QStandardItemModel(parent),
-    d(new TreeItemModelPrivate())
+    : QStandardItemModel(parent)
 {
 }
 
 TreeItemModel::~TreeItemModel()
 {
-    delete d;
 }
 
 QVariant TreeItemModel::data(const QModelIndex &index, int role) const
@@ -79,7 +62,7 @@ QVariant TreeItemModel::data(const QModelIndex &index, int role) const
                 bool ok = false;
                 int type = iconType.toInt(&ok);
                 if (ok && type >= 0)
-                    return d->icons.iconForType(static_cast<CPlusPlus::Icons::IconType>(type));
+                    return CPlusPlus::Icons::iconForType(static_cast<CPlusPlus::Icons::IconType>(type));
             }
         }
         break;
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index 04a3a6096e..1800ddde7b 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -284,7 +284,7 @@ CppMacro::CppMacro(const Macro &macro)
 CppDeclarableElement::CppDeclarableElement(Symbol *declaration)
     : CppElement()
     , declaration(declaration)
-    , icon(Icons().iconForSymbol(declaration))
+    , icon(Icons::iconForSymbol(declaration))
 {
     Overview overview;
     overview.showArgumentNames = true;
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
index 1e14ad1294..b4886d9ea0 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
@@ -182,14 +182,13 @@ private:
 
         auto *item = new VirtualFunctionProposalItem(link, m_params.openInNextSplit);
         item->setText(text);
-        item->setIcon(m_icons.iconForSymbol(func));
+        item->setIcon(Icons::iconForSymbol(func));
 
         return item;
     }
 
     VirtualFunctionAssistProvider::Parameters m_params;
     Overview m_overview;
-    Icons m_icons;
     mutable SymbolFinder m_finder;
 };
 
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index c801fd7100..1e87bbebf8 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -1010,7 +1010,7 @@ int InternalCppCompletionAssistProcessor::startCompletionHelper()
 
     if (m_model->m_completionOperator == T_DOXY_COMMENT) {
         for (int i = 1; i < T_DOXY_LAST_TAG; ++i)
-            addCompletionItem(QString::fromLatin1(doxygenTagSpell(i)), m_icons.keywordIcon());
+            addCompletionItem(QString::fromLatin1(doxygenTagSpell(i)), Icons::keywordIcon());
         return m_positionForProposal;
     }
 
@@ -1193,7 +1193,7 @@ void InternalCppCompletionAssistProcessor::addCompletionItem(Symbol *symbol, int
     ConvertToCompletionItem toCompletionItem;
     AssistProposalItem *item = toCompletionItem(symbol);
     if (item) {
-        item->setIcon(m_icons.iconForSymbol(symbol));
+        item->setIcon(Icons::iconForSymbol(symbol));
         item->setOrder(order);
         m_completions.append(item);
     }
@@ -1300,7 +1300,7 @@ void InternalCppCompletionAssistProcessor::completeInclude(const QString &realPa
             QString text = fileName.mid(realPath.length() + 1);
             if (fileInfo.isDir())
                 text += QLatin1Char('/');
-            addCompletionItem(text, m_icons.keywordIcon());
+            addCompletionItem(text, Icons::keywordIcon());
         }
     }
 }
@@ -1814,7 +1814,7 @@ bool InternalCppCompletionAssistProcessor::completeQtMethod(const QList<LookupIt
                             break;
                         signatures.insert(completionText);
                         ci->setText(completionText); // fix the completion item.
-                        ci->setIcon(m_icons.iconForSymbol(fun));
+                        ci->setIcon(Icons::iconForSymbol(fun));
                         if (wantQt5SignalOrSlot && fun->isSlot())
                             ci->setOrder(1);
                         m_completions.append(ci);
@@ -1841,7 +1841,7 @@ bool InternalCppCompletionAssistProcessor::completeQtMethodClassName(
         return false;
 
     const LookupContext &context = m_model->m_typeOfExpression->context();
-    const QIcon classIcon = m_icons.iconForType(Icons::ClassIconType);
+    const QIcon classIcon = Icons::iconForType(Icons::ClassIconType);
     Overview overview;
 
     foreach (const LookupItem &lookupItem, results) {
@@ -1866,16 +1866,16 @@ void InternalCppCompletionAssistProcessor::addKeywords()
 
     // keyword completion items.
     for (int i = T_FIRST_KEYWORD; i < keywordLimit; ++i)
-        addCompletionItem(QLatin1String(Token::name(i)), m_icons.keywordIcon(), KeywordsOrder);
+        addCompletionItem(QLatin1String(Token::name(i)), Icons::keywordIcon(), KeywordsOrder);
 
     // primitive type completion items.
     for (int i = T_FIRST_PRIMITIVE; i <= T_LAST_PRIMITIVE; ++i)
-        addCompletionItem(QLatin1String(Token::name(i)), m_icons.keywordIcon(), KeywordsOrder);
+        addCompletionItem(QLatin1String(Token::name(i)), Icons::keywordIcon(), KeywordsOrder);
 
     // "Identifiers with special meaning"
     if (m_interface->languageFeatures().cxx11Enabled) {
-        addCompletionItem(QLatin1String("override"), m_icons.keywordIcon(), KeywordsOrder);
-        addCompletionItem(QLatin1String("final"), m_icons.keywordIcon(), KeywordsOrder);
+        addCompletionItem(QLatin1String("override"), Icons::keywordIcon(), KeywordsOrder);
+        addCompletionItem(QLatin1String("final"), Icons::keywordIcon(), KeywordsOrder);
     }
 }
 
@@ -1888,7 +1888,7 @@ void InternalCppCompletionAssistProcessor::addMacros(const QString &fileName,
     addMacros_helper(snapshot, fileName, &processed, &definedMacros);
 
     foreach (const QString &macroName, definedMacros)
-        addCompletionItem(macroName, m_icons.macroIcon(), MacrosOrder);
+        addCompletionItem(macroName, Icons::macroIcon(), MacrosOrder);
 }
 
 void InternalCppCompletionAssistProcessor::addMacros_helper(const Snapshot &snapshot,
diff --git a/src/plugins/cpptools/cppcompletionassistprocessor.h b/src/plugins/cpptools/cppcompletionassistprocessor.h
index a550d66742..4f46be0b00 100644
--- a/src/plugins/cpptools/cppcompletionassistprocessor.h
+++ b/src/plugins/cpptools/cppcompletionassistprocessor.h
@@ -31,8 +31,6 @@
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/snippets/snippetassistcollector.h>
 
-#include <cplusplus/Icons.h>
-
 #include <functional>
 
 QT_BEGIN_NAMESPACE
@@ -67,7 +65,6 @@ protected:
     QList<TextEditor::AssistProposalItemInterface *> m_completions;
     QStringList m_preprocessorCompletions;
     TextEditor::IAssistProposal *m_hintProposal;
-    CPlusPlus::Icons m_icons;
 
 private:
     TextEditor::SnippetAssistCollector m_snippetCollector;
diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp
index 654e77a952..68988d099c 100644
--- a/src/plugins/cpptools/searchsymbols.cpp
+++ b/src/plugins/cpptools/searchsymbols.cpp
@@ -25,6 +25,7 @@
 
 #include "searchsymbols.h"
 
+#include <cplusplus/Icons.h>
 #include <cplusplus/LookupContext.h>
 #include <utils/qtcassert.h>
 #include <utils/scopedswap.h>
@@ -292,7 +293,7 @@ IndexItem::Ptr SearchSymbols::addChildItem(const QString &symbolName, const QStr
         m_paths.insert(symbol->fileId(), path);
     }
 
-    const QIcon icon = icons.iconForSymbol(symbol);
+    const QIcon icon = Icons::iconForSymbol(symbol);
     IndexItem::Ptr newItem = IndexItem::create(findOrInsert(symbolName),
                                                findOrInsert(symbolType),
                                                findOrInsert(symbolScope),
diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h
index e0c669bb07..680e1ab51b 100644
--- a/src/plugins/cpptools/searchsymbols.h
+++ b/src/plugins/cpptools/searchsymbols.h
@@ -32,7 +32,6 @@
 #include "stringtable.h"
 
 #include <cplusplus/CppDocument.h>
-#include <cplusplus/Icons.h>
 #include <cplusplus/Overview.h>
 
 #include <QString>
@@ -108,7 +107,6 @@ private:
     IndexItem::Ptr _parent;
     QString _scope;
     CPlusPlus::Overview overview;
-    CPlusPlus::Icons icons;
     SymbolTypes symbolsToSearchFor;
     QHash<const CPlusPlus::StringLiteral *, QString> m_paths;
 };