From 574ab3c07b5b273b3a88a9a56583a2e39901ccbf Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@theqtcompany.com>
Date: Wed, 6 Apr 2016 23:18:59 +0200
Subject: [PATCH] AutoTest: Remove duplicated icons

This change makes AutoTest reuse the equivalent icons from CPlusPlus.

Change-Id: I01f8c30798c7f1b622469ae1f25418e9d1bd8a93
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/autotest/autotest.qrc     |   2 --
 src/plugins/autotest/images/class.png | Bin 573 -> 0 bytes
 src/plugins/autotest/images/func.png  | Bin 468 -> 0 bytes
 src/plugins/autotest/testtreeitem.cpp |   6 ++++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 src/plugins/autotest/images/class.png
 delete mode 100644 src/plugins/autotest/images/func.png

diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc
index 698a86950e4..7c8539f4b2c 100644
--- a/src/plugins/autotest/autotest.qrc
+++ b/src/plugins/autotest/autotest.qrc
@@ -1,8 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>images/autotest.png</file>
-        <file>images/class.png</file>
-        <file>images/func.png</file>
         <file>images/expand.png</file>
         <file>images/expand@2x.png</file>
         <file>images/collapse.png</file>
diff --git a/src/plugins/autotest/images/class.png b/src/plugins/autotest/images/class.png
deleted file mode 100644
index 88432d2cb10c43de91fdb7ec7989285090747b0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 573
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFy8lcaSW-rHD&U7Z)r!7<NNbtKQ8*Z?c)>A7c1La
z{;|7iR0MxnBB1-_-NG+Rn%d*M_`hbX5?}g{q1WDV;;+^0j)n^ymn@CY`k`znSZ2PF
z<#AvBvAYx2*mv;D8SnmVXMF$rJswWQfSmWYPCR&c=kFTnSt6b`sYT4^cSj{|uztCD
zzEbHfy(cmMwEI5perEsk^8vNc>w6l?_O{-e#~-rfnd9a6hqs<sCZ0IY|B#WcKx0Mh
z;}99i+uppYnpxi;Twyva%rpCklx5OPjvo&TN+#SZYnf{Gm+xM{CgYWrthc8f{a}CO
z|30UGZvHJ!iXl%~rFNz~%xF2Y)b`0D_9FjF9ljRkCt?h0%=k_liJlR=aqs5z<qBfm
zfysBo<{IBW5!a>sxmG-TrmX1VLRDt@-S;0n$p|^fJTZA|z#Y43>k17uZ1?uQiQv)x
zHm&QWc>N@m=!e%7A0C^2KquaVHSb@m1m|j*J>4qWy6)=}{_)zV#?OkA4iBBWJWl+>
z71fDyJZ!Dz?!~(gzB?oLPwaht4wvQiz&20OpIm%v>pOS)*G8D<u1PJ{V*a$h^>|N|
zl}uaa;eCe=9aXL4<vm?4aN%@I=<ey0r$_vquYDjXOXa5wD;u}p4*h_Gs<9g3osX8g
gan0Q&n!s>~&vMP;?~fH37#J8lUHx3vIVCg!04d1;cmMzZ

diff --git a/src/plugins/autotest/images/func.png b/src/plugins/autotest/images/func.png
deleted file mode 100644
index 3f5f62a5f6c907273f25556f332e9bbf253bc163..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7XM4IhhFF|VPFP^NA~irP
z@8Olodq>uNWjrCK?EQIR&$N2|U)TTUCtX&#ComyRLOSEbe{<t)fA`P3@^$~j(B=(_
z0ki)rcQ^jvuL}QXFBR}@f1|7Hc1449d5`>G?8YoE@#p7$_}`Iz@BiCh6aR;6RsUa~
z9`?H>x;X0ce*b8{zx8&7f9oea`}|Jz|M!_{f9|i6{#W0->ivJ#puYdFB}4Z!UG;wW
z<@4V?D-(L%*BbxR5C8Dv|C<*(|8Fms`L*BUF87K^)?nikX(jgZn|%K6zpU`<|7GRp
z|Jd2s{!O1exj9)te%%hq6_x%qyj}Ahx8+~%{;@yotbC5Khw!Ge3U+rI+{}9Yw{tE3
zv;RR9)A!F}b2t279a{5Ge^TK;d-s!~ISiXN2l6nuavEgWy*2jzv;VfnxBqTyAN<#z
zvgbgfsqck9^(}jE$EQ3$ykY<T|C%Ar4S}1zZhrr7#QOdJXO%bq{RItv#<Q1fTfO>q
zeGXg0k&BB1c|`UbyR7-=|Hzyzo6S=CCc})+8>JcyT)qa&1~p7fVVLCjfq~iWW?)Vn
cLnkvsp&Yx*F*ikC1_lNOPgg&ebxsLQ0Fb8QDF6Tf

diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp
index 50ca4c899f7..7e50905b6d5 100644
--- a/src/plugins/autotest/testtreeitem.cpp
+++ b/src/plugins/autotest/testtreeitem.cpp
@@ -33,6 +33,8 @@
 
 #include <texteditor/texteditor.h>
 
+#include <cplusplus/Icons.h>
+
 namespace Autotest {
 namespace Internal {
 
@@ -51,8 +53,8 @@ static QIcon testTreeIcon(TestTreeItem::Type type)
 {
     static QIcon icons[] = {
         QIcon(),
-        QIcon(QLatin1String(":/images/class.png")),
-        QIcon(QLatin1String(":/images/func.png")),
+        CPlusPlus::Icons::iconForType(CPlusPlus::Icons::ClassIconType),
+        CPlusPlus::Icons::iconForType(CPlusPlus::Icons::SlotPrivateIconType),
         QIcon(QLatin1String(":/images/data.png"))
     };