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>
This commit is contained in:
Alessandro Portale
2016-04-06 10:08:01 +02:00
parent 44aaec767f
commit 984a6eca73
13 changed files with 140 additions and 168 deletions

View File

@@ -37,12 +37,10 @@ class Symbol;
class CPLUSPLUS_EXPORT Icons
{
public:
Icons();
static QIcon iconForSymbol(const Symbol *symbol);
QIcon iconForSymbol(const Symbol *symbol) const;
QIcon keywordIcon() const;
QIcon macroIcon() const;
static QIcon keywordIcon();
static QIcon macroIcon();
enum IconType {
ClassIconType = 0,
@@ -72,32 +70,10 @@ public:
};
static IconType iconTypeForSymbol(const Symbol *symbol);
QIcon iconForType(IconType type) const;
static QIcon iconForType(IconType type);
private:
QIcon _classIcon;
QIcon _structIcon;
QIcon _enumIcon;
QIcon _enumeratorIcon;
QIcon _funcPublicIcon;
QIcon _funcProtectedIcon;
QIcon _funcPrivateIcon;
QIcon _funcPublicStaticIcon;
QIcon _funcProtectedStaticIcon;
QIcon _funcPrivateStaticIcon;
QIcon _namespaceIcon;
QIcon _varPublicIcon;
QIcon _varProtectedIcon;
QIcon _varPrivateIcon;
QIcon _varPublicStaticIcon;
QIcon _varProtectedStaticIcon;
QIcon _varPrivateStaticIcon;
QIcon _signalIcon;
QIcon _slotPublicIcon;
QIcon _slotProtectedIcon;
QIcon _slotPrivateIcon;
QIcon _keywordIcon;
QIcon _macroIcon;
Icons() {}
};
} // namespace CPlusPlus