refactor: Remove attach to sim feature

This feature is not documented and not implemented for new simulators
swift-project · Dec 23, 2024 · a866b7e · a866b7e
1 parent 3c896f2
commit a866b7e
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 201 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -3,7 +3,6 @@
 
 add_library(gui SHARED
         showhidebar.cpp
-        foreignwindows.h
         dockwidget.cpp
         labelandicon.cpp
         altitudeedit.cpp
@@ -794,7 +793,6 @@ add_library(gui SHARED
         elidedpushbutton.h
         enableforframelesswindow.cpp
         overlaymessages.cpp
-        foreignwindows.cpp
         stylesheetutility.cpp
         dropbase.h
         eventfilter.cpp

diff --git a/src/gui/enableforframelesswindow.cpp b/src/gui/enableforframelesswindow.cpp
@@ -21,7 +21,6 @@
 #include <QWidget>
 #include <QtGlobal>
 
-#include "gui/foreignwindows.h"
 #include "gui/guiutility.h"
 #include "misc/icons.h"
 #include "misc/stringutils.h"

diff --git a/src/gui/foreignwindows.cpp b/src/gui/foreignwindows.cpp
diff --git a/src/gui/foreignwindows.h b/src/gui/foreignwindows.h
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
@@ -240,12 +240,6 @@ class SwiftGuiStd :
     //! Menu item clicked
     void onMenuClicked();
 
-    //! Attach the simulator window
-    void attachSimulatorWindow();
-
-    //! Detach simulator window
-    void detachSimulatorWindow();
-
     //! Kicked from network
     void onKickedFromNetwork(const QString &kickMessage);
 

diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -18,7 +18,6 @@
 #include "gui/components/maininfoareacomponent.h"
 #include "gui/components/settingscomponent.h"
 #include "gui/copyxswiftbusdialog.h"
-#include "gui/foreignwindows.h"
 #include "gui/guiactionbind.h"
 #include "gui/guiapplication.h"
 #include "misc/aviation/altitude.h"
@@ -86,26 +85,6 @@ void SwiftGuiStd::onMenuClicked()
     }
 }
 
-void SwiftGuiStd::attachSimulatorWindow()
-{
-    this->activateWindow(); // attaching requires active window
-    QWindow *w = CForeignWindows::getFirstFoundSimulatorWindow();
-    if (!w)
-    {
-        CLogMessage(this).warning(u"No simulator window found");
-        return;
-    }
-    const bool a = CForeignWindows::setSimulatorAsParent(w, this);
-    if (a) { CLogMessage(this).info(u"Attached to simulator"); }
-    else { CLogMessage(this).warning(u"No simulator window found"); }
-}
-
-void SwiftGuiStd::detachSimulatorWindow()
-{
-    if (CForeignWindows::unsetSimulatorAsParent(this)) { CLogMessage(this).info(u"Detached simulator window"); }
-    else { CLogMessage(this).info(u"No simulator window to detach"); }
-}
-
 void SwiftGuiStd::initMenus()
 {
     Q_ASSERT_X(ui->menu_InfoAreas, Q_FUNC_INFO, "No menu");
@@ -114,13 +93,6 @@ void SwiftGuiStd::initMenus()
     sGui->addMenuFile(*ui->menu_File);
     sGui->addMenuInternals(*ui->menu_Internals);
     sGui->addMenuWindow(*ui->menu_Window);
-    ui->menu_Window->addSeparator();
-    QAction *a = ui->menu_Window->addAction("Attach simulator window");
-    bool c = connect(a, &QAction::triggered, this, &SwiftGuiStd::attachSimulatorWindow);
-    Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
-    a = ui->menu_Window->addAction("Detach simulator window");
-    c = connect(a, &QAction::triggered, this, &SwiftGuiStd::detachSimulatorWindow);
-    Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
 
     sGui->addMenuHelp(*ui->menu_Help);
     ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
@@ -130,7 +102,7 @@ void SwiftGuiStd::initMenus()
         QAction *act = new QAction(CIcons::swift16(), "Copy xswiftbus dialog");
         ui->menu_File->insertAction(ui->menu_File->actions().at(5), act);
         // clang-format off
-        c = connect(act, &QAction::triggered, this,
+        bool c = connect(act, &QAction::triggered, this,
             [=] { this->copyXSwiftBusDialog(false); }, Qt::QueuedConnection);
         // clang-format on
         Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");