From 57f31cb89b6fc74754e80eefb3813f9a5c57fa3c Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@theqtcompany.com>
Date: Wed, 6 Apr 2016 23:24:49 +0200
Subject: [PATCH] ClassView: Remove duplicated icon

This change makes ClassView reuse the equivalent icon from CPlusPlus.

Change-Id: I2c83d8869dfdb3d8e8f229fc7cf768dee15442ca
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
---
 src/plugins/classview/classview.pro               |   3 ---
 src/plugins/classview/classview.qbs               |   1 -
 src/plugins/classview/classview.qrc               |   5 -----
 .../classview/classviewnavigationwidget.cpp       |   5 ++++-
 src/plugins/classview/images/hierarchicalmode.png | Bin 573 -> 0 bytes
 5 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 src/plugins/classview/classview.qrc
 delete mode 100644 src/plugins/classview/images/hierarchicalmode.png

diff --git a/src/plugins/classview/classview.pro b/src/plugins/classview/classview.pro
index b5d89be118e..6d709d18f5b 100644
--- a/src/plugins/classview/classview.pro
+++ b/src/plugins/classview/classview.pro
@@ -24,6 +24,3 @@ SOURCES += \
     classviewsymbollocation.cpp \
     classviewtreeitemmodel.cpp \
     classviewutils.cpp
-
-RESOURCES += \
-    classview.qrc
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index d564800f117..bc22d5ce687 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     files: [
-        "classview.qrc",
         "classviewconstants.h",
         "classviewmanager.cpp", "classviewmanager.h",
         "classviewnavigationwidget.cpp", "classviewnavigationwidget.h",
diff --git a/src/plugins/classview/classview.qrc b/src/plugins/classview/classview.qrc
deleted file mode 100644
index 189357bc0be..00000000000
--- a/src/plugins/classview/classview.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/classview">
-        <file>images/hierarchicalmode.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp
index 2499f968c22..bd8d72776a8 100644
--- a/src/plugins/classview/classviewnavigationwidget.cpp
+++ b/src/plugins/classview/classviewnavigationwidget.cpp
@@ -31,6 +31,9 @@
 #include "classviewconstants.h"
 
 #include <coreplugin/find/itemviewfind.h>
+
+#include <cplusplus/Icons.h>
+
 #include <utils/navigationtreeview.h>
 #include <utils/qtcassert.h>
 
@@ -170,7 +173,7 @@ QList<QToolButton *> NavigationWidget::createToolButtons()
         // create a button
         fullProjectsModeButton = new QToolButton();
         fullProjectsModeButton->setIcon(
-                QIcon(QLatin1String(":/classview/images/hierarchicalmode.png")));
+                    CPlusPlus::Icons::iconForType(CPlusPlus::Icons::ClassIconType));
         fullProjectsModeButton->setCheckable(true);
         fullProjectsModeButton->setToolTip(tr("Show Subprojects"));
 
diff --git a/src/plugins/classview/images/hierarchicalmode.png b/src/plugins/classview/images/hierarchicalmode.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