refactor: Remove outdated VATSIM logo

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

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);
     }
 

src/blackmisc/blackmisc.qrc

@@ -136,10 +136,6 @@
         <file>icons/vatsim/S2.png</file>
         <file>icons/vatsim/S3.png</file>
         <file>icons/vatsim/SUP.png</file>
-        <file>icons/vatsim/VatsimLogo16.png</file>
-        <file>icons/vatsim/VatsimLogo32.png</file>
-        <file>icons/vatsim/VatsimLogoWhite16.png</file>
-        <file>icons/vatsim/VatsimLogoWhite32.png</file>
     </qresource>
     <qresource prefix="/diagona">
         <file>icons/diagona/icons/application-cloud.png</file>

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"),

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();

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();
 

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); }

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;