summaryrefslogtreecommitdiff
path: root/src/plugins/classview
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2016-04-06 23:24:49 +0200
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2016-04-07 11:04:34 +0000
commit57f31cb89b6fc74754e80eefb3813f9a5c57fa3c (patch)
tree97264054fa0d727e188627733c2088ee988067b3 /src/plugins/classview
parent1b921e95b7433c1ae7be5ee1f7b3157f8ad1f961 (diff)
downloadqt-creator-57f31cb89b6fc74754e80eefb3813f9a5c57fa3c.tar.gz
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>
Diffstat (limited to 'src/plugins/classview')
-rw-r--r--src/plugins/classview/classview.pro3
-rw-r--r--src/plugins/classview/classview.qbs1
-rw-r--r--src/plugins/classview/classview.qrc5
-rw-r--r--src/plugins/classview/classviewnavigationwidget.cpp5
-rw-r--r--src/plugins/classview/images/hierarchicalmode.pngbin573 -> 0 bytes
5 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/classview/classview.pro b/src/plugins/classview/classview.pro
index b5d89be118..6d709d18f5 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 d564800f11..bc22d5ce68 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 189357bc0b..0000000000
--- 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 2499f968c2..bd8d72776a 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 88432d2cb1..0000000000
--- a/src/plugins/classview/images/hierarchicalmode.png
+++ /dev/null
Binary files differ