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

CPlusPlus: Use a namespace instead a dummy class for functions

Browse Source 
Change-Id: Iaa364ef5fcd6f635fa07f0c43719b7b8feb1a428
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2019-11-15 18:53:02 +01:00
parent 3c6c61d1c8
commit cc85cdf8d1
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/cplusplus/Icons.cpp
View File

@@ -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

16
src/libs/cplusplus/Icons.h
View File

@@ -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

2
src/plugins/clangcodemodel/clangassistproposalitem.cpp
View File

@@ -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));