From 6db5faa2e8a4fcbb9bd29635989a806aa4d1ec96 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Thu, 2 Dec 2021 22:56:27 +0100
Subject: [PATCH] CppEditor: Use ProjectExplorer's file icon overlays

Replace the own three overlays with those from ProjectExplorer.

Change-Id: I9eceef4b7b321a47d2b7bd3e86bd758395043a37
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/cppeditor/cppeditor.qrc       |   3 ---
 src/plugins/cppeditor/cppeditorplugin.cpp |   9 ++++++---
 src/plugins/cppeditor/images/qt_c.png     | Bin 211 -> 0 bytes
 src/plugins/cppeditor/images/qt_cpp.png   | Bin 188 -> 0 bytes
 src/plugins/cppeditor/images/qt_h.png     | Bin 416 -> 0 bytes
 5 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 src/plugins/cppeditor/images/qt_c.png
 delete mode 100644 src/plugins/cppeditor/images/qt_cpp.png
 delete mode 100644 src/plugins/cppeditor/images/qt_h.png

diff --git a/src/plugins/cppeditor/cppeditor.qrc b/src/plugins/cppeditor/cppeditor.qrc
index 4ce051f0d54..b66e10aeed6 100644
--- a/src/plugins/cppeditor/cppeditor.qrc
+++ b/src/plugins/cppeditor/cppeditor.qrc
@@ -1,8 +1,5 @@
 <RCC>
     <qresource prefix="/cppeditor">
-        <file>images/qt_cpp.png</file>
-        <file>images/qt_h.png</file>
-        <file>images/qt_c.png</file>
         <file>images/dark_qt_cpp.png</file>
         <file>images/dark_qt_h.png</file>
         <file>images/dark_qt_c.png</file>
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index bb60fb921a1..2ca9a96253f 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -451,13 +451,16 @@ void CppEditorPlugin::extensionsInitialized()
     d->m_cppEditorFactory.addHoverHandler(new ResourcePreviewHoverHandler);
 
     FileIconProvider::registerIconOverlayForMimeType(
-        creatorTheme()->imageFile(Theme::IconOverlayCppSource, ":/cppeditor/images/qt_cpp.png"),
+        creatorTheme()->imageFile(Theme::IconOverlayCppSource,
+                                  ProjectExplorer::Constants::FILEOVERLAY_CPP),
         Constants::CPP_SOURCE_MIMETYPE);
     FileIconProvider::registerIconOverlayForMimeType(
-        creatorTheme()->imageFile(Theme::IconOverlayCSource, ":/cppeditor/images/qt_c.png"),
+        creatorTheme()->imageFile(Theme::IconOverlayCSource,
+                                  ProjectExplorer::Constants::FILEOVERLAY_C),
         Constants::C_SOURCE_MIMETYPE);
     FileIconProvider::registerIconOverlayForMimeType(
-        creatorTheme()->imageFile(Theme::IconOverlayCppHeader, ":/cppeditor/images/qt_h.png"),
+        creatorTheme()->imageFile(Theme::IconOverlayCppHeader,
+                                  ProjectExplorer::Constants::FILEOVERLAY_H),
         Constants::CPP_HEADER_MIMETYPE);
 }
 
diff --git a/src/plugins/cppeditor/images/qt_c.png b/src/plugins/cppeditor/images/qt_c.png
deleted file mode 100644
index 751f2ec62f5cb7b3b7ca798de26ada98e851ad50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 211
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7W_h|ehFF|VPLN<dESORu
zpRUnytI+UL-QQG&fBZ+RJFm@oRMw+to^v~S!m;Az>sN;?&97%m+0XE3uZuK8$R6pG
z12-p|OLi&u8?n5QV@Vd6uyI$*eTE563!b$rFefA__`Z->&lq_yy1$V}quc&W!0f$$
zO-y8_2|sO8dA>Mdj_9V;>Xx@|GoJl5&=+8x6w}wRasRhOk^lU03=DC9L#EtwsC>)7
Pz`)??>gTe~DWM4fv4>I0

diff --git a/src/plugins/cppeditor/images/qt_cpp.png b/src/plugins/cppeditor/images/qt_cpp.png
deleted file mode 100644
index 78e12ae3cba25b3973c91b89d3e53764e0c19dc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7nmt_{Lo7}wCrGd!7QE3K
zzf&W<_Ti?5=dW&`U3TxIqUYw+3r~;V>l81Sw=cbYT>s}GW99qV_dSgmGCt?!JTeNK
zp6BqA`3LWYogW0cpCvog2z7jC`lzRHujevD@c+}t4{bjGo^_+M(Yd*7nGI4!B3|(-
rFL*aMc;9a1@_$_sV`=4diI*X+#^O#$(B%aT3=9mOu6{1-oD!M<6yHp6

diff --git a/src/plugins/cppeditor/images/qt_h.png b/src/plugins/cppeditor/images/qt_h.png
deleted file mode 100644
index 47a7abe1b9cd2c05c67395f7c092bf21613a840e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7(>+}rLo7~Dop?6ukb{WZ
z{^u{(t#0ZM`0zER+e2&-hfw_r6_v<aUXyP*ZB=jz?39=|W5x;zYh$03oVE*W=alaJ
zp1ZS{{b-V4z2hIf>8C}*d?vLN+RZPtnk#Yqv0$Oh=Bkw;yC$ZvY)TMu<v2Xys`>1*
zy(-ERSeq3Nl<iI}y`|x0#3bdTI_2=g1BbegI_>K3X_)8HeC@BSa@5)lF?xox&o0p5
zT6I-RYbw{Nr$$_@PGJvz+gVTLKE`4_wQ^qj$&{w;7df`&o>pJ*_|opr7qp*SUF`BP
zk>N9x;Ca&YwW{}T-F!AX&i5_qP96pv{40I53Sy_fZ8Y!w!P5WdfAfN;Tral$z3aE9
zNi*i4vdwd@7n5FWs+jD0p`P>D&Zd_or{?9_&A+@%{LplTA8IT+nT{7GM2hhoZdmvF
z#rNMYzE-^`+nurfcE;AI471r8CQ?O>nX@jKyp?)WVigejRV`xu^}y9vpEUhf;;Lit
Yef)jeWXJ413=9kmp00i_>zopr02XDuIsgCw