Merge remote-tracking branch 'origin/4.0'

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

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f

src/libs/cplusplus/Icons.cpp

@@ -30,49 +30,24 @@
 #include <cplusplus/Symbols.h>
 #include <cplusplus/Type.h>
 
+#include <utils/icon.h>
+
 using namespace CPlusPlus;
 using CPlusPlus::Icons;
 
-Icons::Icons()
-    : _classIcon(QLatin1String(":/codemodel/images/class.png")),
-      _structIcon(QLatin1String(":/codemodel/images/struct.png")),
-      _enumIcon(QLatin1String(":/codemodel/images/enum.png")),
-      _enumeratorIcon(QLatin1String(":/codemodel/images/enumerator.png")),
-      _funcPublicIcon(QLatin1String(":/codemodel/images/func.png")),
-      _funcProtectedIcon(QLatin1String(":/codemodel/images/func_prot.png")),
-      _funcPrivateIcon(QLatin1String(":/codemodel/images/func_priv.png")),
-      _funcPublicStaticIcon(QLatin1String(":/codemodel/images/func_st.png")),
-      _funcProtectedStaticIcon(QLatin1String(":/codemodel/images/func_prot_st.png")),
-      _funcPrivateStaticIcon(QLatin1String(":/codemodel/images/func_priv_st.png")),
-      _namespaceIcon(QLatin1String(":/codemodel/images/namespace.png")),
-      _varPublicIcon(QLatin1String(":/codemodel/images/var.png")),
-      _varProtectedIcon(QLatin1String(":/codemodel/images/var_prot.png")),
-      _varPrivateIcon(QLatin1String(":/codemodel/images/var_priv.png")),
-      _varPublicStaticIcon(QLatin1String(":/codemodel/images/var_st.png")),
-      _varProtectedStaticIcon(QLatin1String(":/codemodel/images/var_prot_st.png")),
-      _varPrivateStaticIcon(QLatin1String(":/codemodel/images/var_priv_st.png")),
-      _signalIcon(QLatin1String(":/codemodel/images/signal.png")),
-      _slotPublicIcon(QLatin1String(":/codemodel/images/slot.png")),
-      _slotProtectedIcon(QLatin1String(":/codemodel/images/slot_prot.png")),
-      _slotPrivateIcon(QLatin1String(":/codemodel/images/slot_priv.png")),
-      _keywordIcon(QLatin1String(":/codemodel/images/keyword.png")),
-      _macroIcon(QLatin1String(":/codemodel/images/macro.png"))
-{
-}
-
-QIcon Icons::iconForSymbol(const Symbol *symbol) const
+QIcon Icons::iconForSymbol(const Symbol *symbol)
 {
     return iconForType(iconTypeForSymbol(symbol));
 }
 
-QIcon Icons::keywordIcon() const
+QIcon Icons::keywordIcon()
 {
-    return _keywordIcon;
+    return iconForType(KeywordIconType);
 }
 
-QIcon Icons::macroIcon() const
+QIcon Icons::macroIcon()
 {
-    return _macroIcon;
+    return iconForType(MacroIconType);
 }
 
 Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol)
@@ -141,55 +116,181 @@ Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol)
     return UnknownIconType;
 }
 
-QIcon Icons::iconForType(IconType type) const
+QIcon Icons::iconForType(IconType type)
 {
+    using namespace Utils;
+
+    static const IconMaskAndColor classRelationIcon {
+        QLatin1String(":/codemodel/images/classrelation.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor classRelationBackgroundIcon {
+        QLatin1String(":/codemodel/images/classrelationbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+    static const IconMaskAndColor classMemberFunctionIcon {
+        QLatin1String(":/codemodel/images/classmemberfunction.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor classMemberVariableIcon {
+        QLatin1String(":/codemodel/images/classmembervariable.png"), Theme::IconsCodeModelVariableColor};
+    static const IconMaskAndColor functionIcon {
+        QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor variableIcon {
+        QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelVariableColor};
+    static const IconMaskAndColor signalIcon {
+        QLatin1String(":/codemodel/images/signal.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor slotIcon {
+        QLatin1String(":/codemodel/images/slot.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor protectedIcon {
+        QLatin1String(":/codemodel/images/protected.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor protectedBackgroundIcon {
+        QLatin1String(":/codemodel/images/protectedbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+    static const IconMaskAndColor privateIcon {
+        QLatin1String(":/codemodel/images/private.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor privateBackgroundIcon {
+        QLatin1String(":/codemodel/images/privatebackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+    static const IconMaskAndColor staticIcon {
+        QLatin1String(":/codemodel/images/static.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor staticBackgroundIcon {
+        QLatin1String(":/codemodel/images/staticbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+
     switch (type) {
-    case ClassIconType:
-        return _classIcon;
-    case StructIconType:
-        return _structIcon;
-    case EnumIconType:
-        return _enumIcon;
-    case EnumeratorIconType:
-        return _enumeratorIcon;
-    case FuncPublicIconType:
-        return _funcPublicIcon;
-    case FuncProtectedIconType:
-        return _funcProtectedIcon;
-    case FuncPrivateIconType:
-        return _funcPrivateIcon;
-    case FuncPublicStaticIconType:
-        return _funcPublicStaticIcon;
-    case FuncProtectedStaticIconType:
-        return _funcProtectedStaticIcon;
-    case FuncPrivateStaticIconType:
-        return _funcPrivateStaticIcon;
-    case NamespaceIconType:
-        return _namespaceIcon;
-    case VarPublicIconType:
-        return _varPublicIcon;
-    case VarProtectedIconType:
-        return _varProtectedIcon;
-    case VarPrivateIconType:
-        return _varPrivateIcon;
-    case VarPublicStaticIconType:
-        return _varPublicStaticIcon;
-    case VarProtectedStaticIconType:
-        return _varProtectedStaticIcon;
-    case VarPrivateStaticIconType:
-        return _varPrivateStaticIcon;
-    case SignalIconType:
-        return _signalIcon;
-    case SlotPublicIconType:
-        return _slotPublicIcon;
-    case SlotProtectedIconType:
-        return _slotProtectedIcon;
-    case SlotPrivateIconType:
-        return _slotPrivateIcon;
-    case KeywordIconType:
-        return _keywordIcon;
-    case MacroIconType:
-        return _macroIcon;
+    case ClassIconType: {
+        const static QIcon icon(Icon({
+            classRelationBackgroundIcon, classRelationIcon,
+            {QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelClassColor},
+            classMemberFunctionIcon, classMemberVariableIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case StructIconType: {
+        const static QIcon icon(Icon({
+            classRelationBackgroundIcon, classRelationIcon,
+            {QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelStructColor},
+            classMemberFunctionIcon, classMemberVariableIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case EnumIconType: {
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/enum.png"), Theme::IconsCodeModelEnumColor}
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case EnumeratorIconType: {
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/enumerator.png"), Theme::IconsCodeModelEnumColor}
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case FuncPublicIconType: {
+        const static QIcon icon(Icon({
+                functionIcon}, Icon::Tint).icon());
+        return icon;
+    }
+    case FuncProtectedIconType: {
+        const static QIcon icon(Icon({
+                functionIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case FuncPrivateIconType: {
+        const static QIcon icon(Icon({
+            functionIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case FuncPublicStaticIconType: {
+        const static QIcon icon(Icon({
+            functionIcon, staticBackgroundIcon, staticIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case FuncProtectedStaticIconType: {
+        const static QIcon icon(Icon({
+            functionIcon, staticBackgroundIcon, staticIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case FuncPrivateStaticIconType: {
+        const static QIcon icon(Icon({
+            functionIcon, staticBackgroundIcon, staticIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case NamespaceIconType: {
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/namespace.png"), Theme::IconsCodeModelKeywordColor}
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case VarPublicIconType: {
+        const static QIcon icon(Icon({
+            variableIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case VarProtectedIconType: {
+        const static QIcon icon(Icon({
+            variableIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case VarPrivateIconType: {
+        const static QIcon icon(Icon({
+            variableIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case VarPublicStaticIconType: {
+        const static QIcon icon(Icon({
+            variableIcon, staticBackgroundIcon, staticIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case VarProtectedStaticIconType: {
+        const static QIcon icon(Icon({
+            variableIcon, staticBackgroundIcon, staticIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case VarPrivateStaticIconType: {
+        const static QIcon icon(Icon({
+            variableIcon, staticBackgroundIcon, staticIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case SignalIconType: {
+        const static QIcon icon(Icon({
+            signalIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case SlotPublicIconType: {
+        const static QIcon icon(Icon({
+            slotIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case SlotProtectedIconType: {
+        const static QIcon icon(Icon({
+            slotIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case SlotPrivateIconType: {
+        const static QIcon icon(Icon({
+            slotIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case KeywordIconType: {
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/keyword.png"), Theme::IconsCodeModelKeywordColor}
+        }, Icon::Tint).icon());
+        return icon;
+    }
+    case MacroIconType: {
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/macro.png"), Theme::IconsCodeModelMacroColor}
+        }, Icon::Tint).icon());
+        return icon;
+    }
     default:
         break;
     }

src/libs/cplusplus/Icons.h

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

src/libs/cplusplus/OverviewModel.cpp

@@ -27,6 +27,7 @@
 
 #include "Overview.h"
 
+#include <cplusplus/Icons.h>
 #include <cplusplus/Scope.h>
 #include <cplusplus/Literals.h>
 #include <cplusplus/Symbols.h>
@@ -210,7 +211,7 @@ QVariant OverviewModel::data(const QModelIndex &index, int role) const
 
     case Qt::DecorationRole: {
         Symbol *symbol = static_cast<Symbol *>(index.internalPointer());
-        return _icons.iconForSymbol(symbol);
+        return Icons::iconForSymbol(symbol);
     } break;
 
     case FileNameRole: {

src/libs/cplusplus/OverviewModel.h

@@ -27,7 +27,6 @@
 
 #include "CppDocument.h"
 #include "Overview.h"
-#include "Icons.h"
 
 #include <QAbstractItemModel>
 
@@ -72,7 +71,6 @@ private:
 private:
     Document::Ptr _cppDocument;
     Overview _overview;
-    Icons _icons;
 };
 
 } // namespace CPlusPlus

src/libs/cplusplus/cplusplus.qbs

@@ -126,30 +126,6 @@ QtcLibrary {
         ]
     }
 
-    Group {
-        name: "Images"
-        prefix: "images/"
-        files: [
-            "class.png",
-            "struct.png",
-            "enum.png",
-            "enumerator.png",
-            "func.png",
-            "func_priv.png",
-            "func_prot.png",
-            "keyword.png",
-            "macro.png",
-            "namespace.png",
-            "signal.png",
-            "slot.png",
-            "slot_priv.png",
-            "slot_prot.png",
-            "var.png",
-            "var_priv.png",
-            "var_prot.png",
-        ]
-    }
-
     Export {
         cpp.includePaths: [
             "../3rdparty"

src/libs/cplusplus/cplusplus.qrc

@@ -1,27 +1,42 @@
 <RCC>
     <qresource prefix="/codemodel">
-        <file>images/class.png</file>
-        <file>images/struct.png</file>
         <file>images/enum.png</file>
+        <file>images/enum@2x.png</file>
         <file>images/enumerator.png</file>
-        <file>images/func.png</file>
-        <file>images/func_priv.png</file>
-        <file>images/func_prot.png</file>
+        <file>images/enumerator@2x.png</file>
         <file>images/keyword.png</file>
+        <file>images/keyword@2x.png</file>
         <file>images/macro.png</file>
+        <file>images/macro@2x.png</file>
         <file>images/namespace.png</file>
+        <file>images/namespace@2x.png</file>
         <file>images/signal.png</file>
+        <file>images/signal@2x.png</file>
         <file>images/slot.png</file>
-        <file>images/slot_priv.png</file>
-        <file>images/slot_prot.png</file>
-        <file>images/var.png</file>
-        <file>images/var_priv.png</file>
-        <file>images/var_prot.png</file>
-        <file>images/func_priv_st.png</file>
-        <file>images/func_prot_st.png</file>
-        <file>images/func_st.png</file>
-        <file>images/var_priv_st.png</file>
-        <file>images/var_prot_st.png</file>
-        <file>images/var_st.png</file>
+        <file>images/slot@2x.png</file>
+        <file>images/member.png</file>
+        <file>images/member@2x.png</file>
+        <file>images/private.png</file>
+        <file>images/private@2x.png</file>
+        <file>images/privatebackground.png</file>
+        <file>images/privatebackground@2x.png</file>
+        <file>images/protected.png</file>
+        <file>images/protected@2x.png</file>
+        <file>images/protectedbackground.png</file>
+        <file>images/protectedbackground@2x.png</file>
+        <file>images/static.png</file>
+        <file>images/static@2x.png</file>
+        <file>images/staticbackground.png</file>
+        <file>images/staticbackground@2x.png</file>
+        <file>images/classmemberfunction.png</file>
+        <file>images/classmemberfunction@2x.png</file>
+        <file>images/classmembervariable.png</file>
+        <file>images/classmembervariable@2x.png</file>
+        <file>images/classparent.png</file>
+        <file>images/classparent@2x.png</file>
+        <file>images/classrelation.png</file>
+        <file>images/classrelation@2x.png</file>
+        <file>images/classrelationbackground.png</file>
+        <file>images/classrelationbackground@2x.png</file>
     </qresource>
 </RCC>