From a0c4502f0d62b732639e5732ff70817c5214745a Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sat, 30 Nov 2024 12:19:01 +0100 Subject: [PATCH] refactor: Remove MCX icon --- src/gui/menus/aircraftmodelmenus.cpp | 6 +++--- src/misc/icons.cpp | 6 ------ src/misc/icons.h | 3 --- src/misc/icons/misc/mcx.jpg | Bin 3934 -> 0 bytes src/misc/icons/misc/mcx.png | Bin 6420 -> 0 bytes src/misc/misc.qrc | 2 -- 6 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 src/misc/icons/misc/mcx.jpg delete mode 100644 src/misc/icons/misc/mcx.png diff --git a/src/gui/menus/aircraftmodelmenus.cpp b/src/gui/menus/aircraftmodelmenus.cpp index 19ccfcea5..793d8d0e5 100644 --- a/src/gui/menus/aircraftmodelmenus.cpp +++ b/src/gui/menus/aircraftmodelmenus.cpp @@ -92,9 +92,9 @@ namespace swift::gui::menus added = true; if (CModelConverterX::supportsModelConverterX()) { - m_modelConverterX = menuActions.addAction(m_modelConverterX, CIcons::modelConverterX(), - "ModelConverterX", CMenuAction::pathSimulator(), - { this, &CShowSimulatorFileMenu::startModelConverterX }); + m_modelConverterX = + menuActions.addAction(m_modelConverterX, "ModelConverterX", CMenuAction::pathSimulator(), + { this, &CShowSimulatorFileMenu::startModelConverterX }); } } diff --git a/src/misc/icons.cpp b/src/misc/icons.cpp index 81cf2912c..7742419b2 100644 --- a/src/misc/icons.cpp +++ b/src/misc/icons.cpp @@ -939,12 +939,6 @@ namespace swift::misc const QPixmap &CIcons::modelExclude16() { return cross16(); } - const QPixmap &CIcons::modelConverterX() - { - static const QPixmap pm(":/misc/icons/misc/mcx.png"); - return pm; - } - const QPixmap &CIcons::pixmapByIndex(CIcons::IconIndex index) { switch (index) diff --git a/src/misc/icons.h b/src/misc/icons.h index 5dd68cc2a..b50da41dd 100644 --- a/src/misc/icons.h +++ b/src/misc/icons.h @@ -701,9 +701,6 @@ namespace swift::misc //! Model exclude static const QPixmap &modelExclude16(); - //! Model Converter X - static const QPixmap &modelConverterX(); - // ------------------------------------------------------------- // By index // ------------------------------------------------------------- diff --git a/src/misc/icons/misc/mcx.jpg b/src/misc/icons/misc/mcx.jpg deleted file mode 100644 index 62fd495ac06df72a3ef5168b01c1e25ee2316c3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3934 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 i74_%Z17rCAbo?Iicons/misc/skull512.png icons/misc/toolWizard64.png icons/misc/toolWizard128.png - icons/misc/mcx.jpg - icons/misc/mcx.png icons/misc/cn.png icons/misc/ru.png