From cc85cdf8d1631ca821d16c0d75b2438f0332822d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 15 Nov 2019 18:53:02 +0100
Subject: [PATCH] CPlusPlus: Use a namespace instead a dummy class for
 functions

Change-Id: Iaa364ef5fcd6f635fa07f0c43719b7b8feb1a428
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/libs/cplusplus/Icons.cpp                     | 15 +++++++++------
 src/libs/cplusplus/Icons.h                       | 16 ++++++----------
 .../clangcodemodel/clangassistproposalitem.cpp   |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp
index 5f2397d0e5c..e0d681563bd 100644
--- a/src/libs/cplusplus/Icons.cpp
+++ b/src/libs/cplusplus/Icons.cpp
@@ -30,25 +30,25 @@
 #include <cplusplus/Symbols.h>
 #include <cplusplus/Type.h>
 
-using namespace CPlusPlus;
-using CPlusPlus::Icons;
+namespace CPlusPlus {
+namespace Icons {
 
-QIcon Icons::iconForSymbol(const Symbol *symbol)
+QIcon iconForSymbol(const Symbol *symbol)
 {
     return iconForType(iconTypeForSymbol(symbol));
 }
 
-QIcon Icons::keywordIcon()
+QIcon keywordIcon()
 {
     return iconForType(Utils::CodeModelIcon::Keyword);
 }
 
-QIcon Icons::macroIcon()
+QIcon macroIcon()
 {
     return iconForType(Utils::CodeModelIcon::Macro);
 }
 
-Utils::CodeModelIcon::Type Icons::iconTypeForSymbol(const Symbol *symbol)
+Utils::CodeModelIcon::Type iconTypeForSymbol(const Symbol *symbol)
 {
     using namespace Utils::CodeModelIcon;
     if (const Template *templ = symbol->asTemplate()) {
@@ -116,3 +116,6 @@ Utils::CodeModelIcon::Type Icons::iconTypeForSymbol(const Symbol *symbol)
 
     return Unknown;
 }
+
+} // Icons
+} // CPlusPlus
diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h
index 05b067f246f..352248bfc10 100644
--- a/src/libs/cplusplus/Icons.h
+++ b/src/libs/cplusplus/Icons.h
@@ -34,18 +34,14 @@ namespace CPlusPlus {
 
 class Symbol;
 
-class CPLUSPLUS_EXPORT Icons
-{
-public:
-    static QIcon iconForSymbol(const Symbol *symbol);
+namespace Icons {
 
-    static QIcon keywordIcon();
-    static QIcon macroIcon();
+CPLUSPLUS_EXPORT QIcon iconForSymbol(const Symbol *symbol);
 
-    static Utils::CodeModelIcon::Type iconTypeForSymbol(const Symbol *symbol);
+CPLUSPLUS_EXPORT QIcon keywordIcon();
+CPLUSPLUS_EXPORT QIcon macroIcon();
 
-private:
-    Icons() {}
-};
+CPLUSPLUS_EXPORT Utils::CodeModelIcon::Type iconTypeForSymbol(const Symbol *symbol);
 
+} // namespace Icons
 } // namespace CPlusPlus
diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
index 7c289523897..aafef3c5a07 100644
--- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
@@ -423,7 +423,7 @@ int ClangAssistProposalItem::fixItsShift(const TextDocumentManipulatorInterface
 
 QIcon ClangAssistProposalItem::icon() const
 {
-    using CPlusPlus::Icons;
+    using namespace CPlusPlus::Icons;
     static const char SNIPPET_ICON_PATH[] = ":/texteditor/images/snippet.png";
     static const QIcon snippetIcon = QIcon(QLatin1String(SNIPPET_ICON_PATH));