From 7875c5a18ff8e5f96c6ef95b401b3340d59fede2 Mon Sep 17 00:00:00 2001
From: Lars Toenning <dev@ltoenning.de>
Date: Mon, 25 Mar 2024 21:43:16 +0100
Subject: [PATCH] refactor: Remove not used AFV map

Always use the VATSIM online map instead of providing our own map widget
---
 src/blackgui/CMakeLists.txt              |  3 -
 src/blackgui/components/afvmapdialog.cpp | 50 ---------------
 src/blackgui/components/afvmapdialog.h   | 49 ---------------
 src/blackgui/components/afvmapdialog.ui  | 78 ------------------------
 src/swiftguistandard/swiftguistd.cpp     | 11 ----
 src/swiftguistandard/swiftguistd.h       |  2 -
 src/swiftguistandard/swiftguistd.ui      |  2 +-
 7 files changed, 1 insertion(+), 194 deletions(-)
 delete mode 100644 src/blackgui/components/afvmapdialog.cpp
 delete mode 100644 src/blackgui/components/afvmapdialog.h
 delete mode 100644 src/blackgui/components/afvmapdialog.ui

diff --git a/src/blackgui/CMakeLists.txt b/src/blackgui/CMakeLists.txt
index 90e37131d..7fac80bcd 100644
--- a/src/blackgui/CMakeLists.txt
+++ b/src/blackgui/CMakeLists.txt
@@ -591,7 +591,6 @@ add_library(gui SHARED
         components/remoteaircraftselector.ui
         components/aircraftcombinedtypeselector.ui
         components/infobarwebreadersstatuscomponent.cpp
-        components/afvmapdialog.ui
         components/dbdistributorselectorcomponent.cpp
         components/networkdetailscomponent.h
         components/otherswiftversionsdialog.h
@@ -660,7 +659,6 @@ add_library(gui SHARED
         components/coreinfoareacomponent.h
         components/rawfsdmessagesdialog.ui
         components/dbautostashingcomponent.h
-        components/afvmapdialog.h
         components/transpondermodecomponent.h
         components/remoteaircraftselector.cpp
         components/stringlistdialog.cpp
@@ -669,7 +667,6 @@ add_library(gui SHARED
         components/settingssimulatorcomponent.cpp
         components/dbairlineicaoselectorbase.h
         components/dbownmodelsdialog.ui
-        components/afvmapdialog.cpp
         components/dbmodelcomponent.ui
         components/modelmatcherlogcomponent.cpp
         components/airportcompleter.ui
diff --git a/src/blackgui/components/afvmapdialog.cpp b/src/blackgui/components/afvmapdialog.cpp
deleted file mode 100644
index 92b89c56a..000000000
--- a/src/blackgui/components/afvmapdialog.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "blackgui/guiapplication.h"
-#include "blackcore/context/contextaudioimpl.h"
-#include "blackcore/afv/clients/afvclient.h"
-#include "blackcore/afv/model/afvmapreader.h"
-
-#include "afvmapdialog.h"
-#include "ui_afvmapdialog.h"
-// #include <QQmlContext>
-// #include <QQmlEngine>
-
-using namespace BlackCore::Afv::Model;
-using namespace BlackCore::Afv::Clients;
-
-namespace BlackGui::Components
-{
-    CAfvMapDialog::CAfvMapDialog(QWidget *parent) : QDialog(parent),
-                                                    ui(new Ui::CAfvMapDialog)
-    {
-        /**
-        m_afvMapReader = new CAfvMapReader(this);
-        m_afvMapReader->updateFromMap();
-
-        CAfvClient *afvClient = nullptr;
-        if (sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
-        {
-            if (sGui->getIContextAudio()->isUsingImplementingObject())
-            {
-                afvClient = sGui->getCoreFacade()->getCContextAudio()->voiceClient();
-            }
-        }
-
-        ui->setupUi(this);
-        QQmlContext *ctxt = ui->qw_AfvMap->rootContext();
-        ctxt->setContextProperty("afvMapReader", m_afvMapReader);
-
-        if (m_afvClient)
-        {
-            ctxt->setContextProperty("voiceClient", afvClient);
-        }
-
-        // ui->qw_AfvMap->engine()->setBaseUrl(":/blackgui/qml");
-        ui->qw_AfvMap->setSource(QUrl("qrc:/blackgui/qml/AFVMap.qml"));
-        **/
-    }
-
-    CAfvMapDialog::~CAfvMapDialog() {}
-} // ns
diff --git a/src/blackgui/components/afvmapdialog.h b/src/blackgui/components/afvmapdialog.h
deleted file mode 100644
index 37f6eb25d..000000000
--- a/src/blackgui/components/afvmapdialog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef BLACKGUI_COMPONENTS_AFVMAPDIALOG_H
-#define BLACKGUI_COMPONENTS_AFVMAPDIALOG_H
-
-#include "blackgui/blackguiexport.h"
-#include <QDialog>
-#include <QScopedPointer>
-
-namespace BlackCore::Afv
-{
-    namespace Model
-    {
-        class CAfvMapReader;
-    }
-    namespace Clients
-    {
-        class CAfvClient;
-    }
-}
-namespace Ui
-{
-    class CAfvMapDialog;
-}
-namespace BlackGui::Components
-{
-    //! QML map to display ATC stations
-    class BLACKGUI_EXPORT CAfvMapDialog : public QDialog
-    {
-        Q_OBJECT
-
-    public:
-        //! Ctor
-        explicit CAfvMapDialog(QWidget *parent = nullptr);
-
-        //! Dtor
-        virtual ~CAfvMapDialog() override;
-
-    private:
-        QScopedPointer<Ui::CAfvMapDialog> ui;
-        BlackCore::Afv::Model::CAfvMapReader *m_afvMapReader = nullptr;
-        BlackCore::Afv::Clients::CAfvClient *m_afvClient = nullptr;
-    };
-} // ns
-
-#endif // guard
diff --git a/src/blackgui/components/afvmapdialog.ui b/src/blackgui/components/afvmapdialog.ui
deleted file mode 100644
index 3466d0d11..000000000
--- a/src/blackgui/components/afvmapdialog.ui
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CAfvMapDialog</class>
- <widget class="QDialog" name="CAfvMapDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>640</width>
-    <height>480</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>AFV map</string>
-  </property>
-  <layout class="QVBoxLayout" name="vl_AfvMap">
-   <!-- <item>
-    <widget class="QQuickWidget" name="qw_AfvMap">
-     <property name="resizeMode">
-      <enum>QQuickWidget::SizeRootObjectToView</enum>
-     </property>
-    </widget>
-   </item> -->
-   <item>
-    <widget class="QDialogButtonBox" name="bb_AfvMap">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <!-- <customwidget>
-   <class>QQuickWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">QtQuickWidgets/QQuickWidget</header>
-  </customwidget> -->
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>bb_AfvMap</sender>
-   <signal>accepted()</signal>
-   <receiver>CAfvMapDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>bb_AfvMap</sender>
-   <signal>rejected()</signal>
-   <receiver>CAfvMapDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index 2d8750894..d05f5d646 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -7,7 +7,6 @@
 #include "blackgui/components/logcomponent.h"
 #include "blackgui/components/dbloaddatadialog.h"
 #include "blackgui/components/autopublishdialog.h"
-#include "blackgui/components/afvmapdialog.h"
 #include "blackgui/components/logindialog.h"
 #include "blackgui/components/modelbrowserdialog.h"
 #include "blackgui/components/settingscomponent.h"
@@ -645,16 +644,6 @@ bool SwiftGuiStd::startModelBrowser()
 
 bool SwiftGuiStd::startAFVMap()
 {
-    /**
-    if (!m_mapDialog)
-    {
-        m_mapDialog.reset(new CAfvMapDialog(this));
-        m_mapDialog->setWindowModality(Qt::NonModal);
-    }
-    m_mapDialog->exec();
-    **/
-
-    //! \todo KB 2019-11 AFV map workaround
     if (sGui && !sGui->isShuttingDown())
     {
         sGui->openUrl(sGui->getGlobalSetup().getAfvMapUrl());
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index d2e8403a6..1ff6f829b 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -49,7 +49,6 @@ namespace BlackGui::Components
     class CAutoPublishDialog;
     class CLoginDialog;
     class CModelBrowserDialog;
-    class CAfvMapDialog;
 }
 namespace Ui
 {
@@ -125,7 +124,6 @@ private:
     QScopedPointer<BlackGui::Components::CAutoPublishDialog> m_autoPublishDialog; //!< auto publish dialog
     QScopedPointer<BlackGui::Components::CLoginDialog> m_loginDialog; //!< login dialog
     QScopedPointer<BlackGui::Components::CModelBrowserDialog> m_modelBrower; //!< model browser
-    QScopedPointer<BlackGui::Components::CAfvMapDialog> m_mapDialog; //!< map dialog
     QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
     BlackMisc::CData<BlackMisc::Simulation::Data::TLastAutoPublish> m_lastAutoPublish { this };
     BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged };
diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui
index 3beda9168..e4b3f21ae 100644
--- a/src/swiftguistandard/swiftguistd.ui
+++ b/src/swiftguistandard/swiftguistd.ui
@@ -519,7 +519,7 @@
   </action>
   <action name="menu_AfvMap">
    <property name="text">
-    <string>AFV map</string>
+    <string>AFV online map</string>
    </property>
   </action>
  </widget>