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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
This commit is contained in:
Eike Ziller
2016-04-12 10:43:10 +02:00
parent 04acb9d643 8dadafb9e0
commit 5c87432260
341 changed files with 2512 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,12 +36,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,
@@ -71,32 +69,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