diff --git a/src/blackgui/ecosystemcombobox.cpp b/src/blackgui/ecosystemcombobox.cpp
index 595ed03f9..e33adbeb3 100644
--- a/src/blackgui/ecosystemcombobox.cpp
+++ b/src/blackgui/ecosystemcombobox.cpp
@@ -43,7 +43,7 @@ namespace BlackGui
this->clear();
for (const CEcosystem &e : m_systems)
{
- this->addItem(BlackMisc::CIcon(e.toIcon()).toPixmap(), e.getSystemString());
+ this->addItem(e.getSystemString());
}
}
} // ns
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index d2ff17d82..5454b1099 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -127,8 +127,8 @@ namespace BlackMisc::Aviation
if (QStringView(u"FSS") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleFss); }
if (QStringView(u"ATIS") == sfx) { return CIcon::iconByIndex(CIcons::AviationAtis); }
if (QStringView(u"EXAM") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleMnt); }
- if (QStringView(u"VATSIM") == sfx) { return CIcon::iconByIndex(CIcons::NetworkVatsimLogoWhite); }
- if (QStringView(u"VATGOV") == sfx) { return CIcon::iconByIndex(CIcons::NetworkVatsimLogoWhite); }
+ if (QStringView(u"VATSIM") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleSup); }
+ if (QStringView(u"VATGOV") == sfx) { return CIcon::iconByIndex(CIcons::NetworkRoleSup); }
return CIcon::iconByIndex(CIcons::NetworkRoleUnknown);
}
diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc
index 7e131e63e..1a2b299ee 100644
--- a/src/blackmisc/blackmisc.qrc
+++ b/src/blackmisc/blackmisc.qrc
@@ -136,10 +136,6 @@
icons/vatsim/S2.png
icons/vatsim/S3.png
icons/vatsim/SUP.png
- icons/vatsim/VatsimLogo16.png
- icons/vatsim/VatsimLogo32.png
- icons/vatsim/VatsimLogoWhite16.png
- icons/vatsim/VatsimLogoWhite32.png
icons/diagona/icons/application-cloud.png
diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp
index 99277841c..48c85b99e 100644
--- a/src/blackmisc/icon.cpp
+++ b/src/blackmisc/icon.cpp
@@ -148,8 +148,6 @@ namespace BlackMisc
CIcon(CIcons::NetworkRoleSup, "supervisor"),
CIcon(CIcons::NetworkRoleTower, "ATC tower"),
CIcon(CIcons::NetworkRoleUnknown, "unknown"),
- CIcon(CIcons::NetworkVatsimLogo, "VATSIM"),
- CIcon(CIcons::NetworkVatsimLogoWhite, "VATSIM"),
CIcon(CIcons::NotSet, "?"),
CIcon(CIcons::OSAll, "All OS"),
CIcon(CIcons::OSLinux, "Linux"),
diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp
index cca9c8fed..5d02f2a2d 100644
--- a/src/blackmisc/icons.cpp
+++ b/src/blackmisc/icons.cpp
@@ -993,30 +993,6 @@ namespace BlackMisc
return pm;
}
- const QPixmap &CIcons::vatsimLogo16()
- {
- static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogo16.png");
- return pm;
- }
-
- const QPixmap &CIcons::vatsimLogo32()
- {
- static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogo32.png");
- return pm;
- }
-
- const QPixmap &CIcons::vatsimLogoWhite16()
- {
- static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite16.png");
- return pm;
- }
-
- const QPixmap &CIcons::vatsimLogoWhite32()
- {
- static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite32.png");
- return pm;
- }
-
const QPixmap &CIcons::capabilityVoice()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/headphone.png");
@@ -1146,8 +1122,6 @@ namespace BlackMisc
case NetworkRoleSup: return roleSup();
case NetworkRoleTower: return roleTower();
case NetworkRoleUnknown: return roleUnknown();
- case NetworkVatsimLogo: return vatsimLogo16();
- case NetworkVatsimLogoWhite: return vatsimLogoWhite16();
case NotSet: return empty();
case OSAll: return osAll();
case OSLinux: return osLinux();
diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h
index 32dbb80b8..a671e257f 100644
--- a/src/blackmisc/icons.h
+++ b/src/blackmisc/icons.h
@@ -84,8 +84,6 @@ namespace BlackMisc
NetworkRoleSup,
NetworkRoleTower,
NetworkRoleUnknown,
- NetworkVatsimLogo,
- NetworkVatsimLogoWhite,
NotSet,
OSAll,
OSLinux,
@@ -676,18 +674,6 @@ namespace BlackMisc
//! Unknown
static const QPixmap &roleUnknown();
- //! VATSIM logo
- static const QPixmap &vatsimLogo16();
-
- //! VATSIM logo
- static const QPixmap &vatsimLogo32();
-
- //! VATSIM logo
- static const QPixmap &vatsimLogoWhite16();
-
- //! VATSIM logo
- static const QPixmap &vatsimLogoWhite32();
-
//! Full voice capability
static const QPixmap &capabilityVoice();
diff --git a/src/blackmisc/icons/vatsim/VatsimLogo16.png b/src/blackmisc/icons/vatsim/VatsimLogo16.png
deleted file mode 100644
index f0bfe32fa..000000000
Binary files a/src/blackmisc/icons/vatsim/VatsimLogo16.png and /dev/null differ
diff --git a/src/blackmisc/icons/vatsim/VatsimLogo32.png b/src/blackmisc/icons/vatsim/VatsimLogo32.png
deleted file mode 100644
index 27c4624b5..000000000
Binary files a/src/blackmisc/icons/vatsim/VatsimLogo32.png and /dev/null differ
diff --git a/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png b/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png
deleted file mode 100644
index fc428253f..000000000
Binary files a/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png and /dev/null differ
diff --git a/src/blackmisc/icons/vatsim/VatsimLogoWhite32.png b/src/blackmisc/icons/vatsim/VatsimLogoWhite32.png
deleted file mode 100644
index 2b6acf0a3..000000000
Binary files a/src/blackmisc/icons/vatsim/VatsimLogoWhite32.png and /dev/null differ
diff --git a/src/blackmisc/network/ecosystem.cpp b/src/blackmisc/network/ecosystem.cpp
index 982ecd0d4..ee91e32fc 100644
--- a/src/blackmisc/network/ecosystem.cpp
+++ b/src/blackmisc/network/ecosystem.cpp
@@ -67,20 +67,6 @@ namespace BlackMisc::Network
}
}
- CIcons::IconIndex CEcosystem::toIcon() const
- {
- switch (this->getSystem())
- {
- case VATSIM: return CIcons::NetworkVatsimLogo;
- case Swift: return CIcons::Swift24;
- case SwiftTest: return CIcons::Swift24;
- case PrivateFSD: return CIcons::StandardIconAppAircraft16;
- case NoSystem: return CIcons::StandardIconCrossCircle16;
- case Unspecified:
- default: return CIcons::StandardIconUnknown16;
- }
- }
-
QVariant CEcosystem::propertyByIndex(BlackMisc::CPropertyIndexRef index) const
{
if (index.isMyself()) { return QVariant::fromValue(*this); }
diff --git a/src/blackmisc/network/ecosystem.h b/src/blackmisc/network/ecosystem.h
index 3063b5152..e9b47b8da 100644
--- a/src/blackmisc/network/ecosystem.h
+++ b/src/blackmisc/network/ecosystem.h
@@ -59,9 +59,6 @@ namespace BlackMisc::Network
//! Get the system string
const QString &getSystemString() const;
- //! \copydoc BlackMisc::Mixin::Icon::toIcon()
- CIcons::IconIndex toIcon() const;
-
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex
QVariant propertyByIndex(BlackMisc::CPropertyIndexRef index) const;