From 40bba1b2e0dd6973abc877d795154f9c4be595d9 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 19 Aug 2016 17:08:02 +0200 Subject: [PATCH] activate new icons and remove old icons --- src/Gui/BitmapFactory.cpp | 4 ---- src/Gui/Icons/BmpFactoryIcons.cpp | 7 ------- src/Gui/Icons/images.cpp | 30 ------------------------------ src/Gui/Icons/resource.qrc | 1 + 4 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 src/Gui/Icons/BmpFactoryIcons.cpp delete mode 100644 src/Gui/Icons/images.cpp diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp index f26981df7..affb1ae96 100644 --- a/src/Gui/BitmapFactory.cpp +++ b/src/Gui/BitmapFactory.cpp @@ -53,8 +53,6 @@ #include #include "BitmapFactory.h" -#include "Icons/images.cpp" -#include "Icons/BmpFactoryIcons.cpp" using namespace Gui; @@ -118,8 +116,6 @@ BitmapFactoryInst& BitmapFactoryInst::instance(void) _pcSingleton->addPath(QString::fromLatin1("%1/icons").arg(QString::fromUtf8(App::GetApplication().Config()["UserAppData"].c_str()))); _pcSingleton->addPath(QLatin1String(":/icons/")); _pcSingleton->addPath(QLatin1String(":/Icons/")); - - RegisterIcons(); } return *_pcSingleton; diff --git a/src/Gui/Icons/BmpFactoryIcons.cpp b/src/Gui/Icons/BmpFactoryIcons.cpp deleted file mode 100644 index 3ea312239..000000000 --- a/src/Gui/Icons/BmpFactoryIcons.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -void RegisterIcons() -{ - Gui::BitmapFactoryInst& rclBmpFactory = Gui::BitmapFactory(); - rclBmpFactory.addXPM("WhatsThis", WhatsThis); -} - diff --git a/src/Gui/Icons/images.cpp b/src/Gui/Icons/images.cpp deleted file mode 100644 index 1fc94af38..000000000 --- a/src/Gui/Icons/images.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* XPM */ -static const char * WhatsThis[] = { -"24 24 3 1", -" c None", -"o c #000000", -"a c #000080", -"........................", -"........................", -"........................", -"........................", -"....o aaaaa ", -"....oo aaa aaa ", -"....ooo aaa aaa ", -"....oooo aa aa ", -"....ooooo aa aa ", -"....oooooo a aaa ", -"....ooooooo aaa ", -"....oooooooo aaa ", -"....ooooooooo aaa ", -"....ooooo aaa ", -"....oo ooo ", -"....o ooo aaa ", -".... ooo aaa ", -".... ooo ", -".... ooo ", -".... ooo ", -"........................", -"........................", -"........................", -"........................"}; diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc index b8cf5c8b4..4c052c06e 100644 --- a/src/Gui/Icons/resource.qrc +++ b/src/Gui/Icons/resource.qrc @@ -146,6 +146,7 @@ Std_WindowNext.svg Std_WindowPrev.svg Std_WindowTileVer.svg + WhatsThis.svg colors.svg px.svg