Update PTT sound and fix crash in swiftdata

REUSE.toml

@@ -230,7 +230,7 @@ SPDX-License-Identifier = "CC0-1.0"
 [[annotations]]
 path = "src/sound/share/sounds/pttclick.wav"
 precedence = "aggregate"
-SPDX-FileCopyrightText = "Clicking 4 by bernhoftbret -- https://freesound.org/s/655157/ -- License: Creative Commons 0; Modified by swift contributors"
+SPDX-FileCopyrightText = "Copyright (C) swift Project Community / Contributors"
 SPDX-License-Identifier = "CC0-1.0"
 
 [[annotations]]

src/gui/CMakeLists.txt

@@ -3,7 +3,6 @@
 
 add_library(gui SHARED
         showhidebar.cpp
-        foreignwindows.h
         dockwidget.cpp
         labelandicon.cpp
         altitudeedit.cpp
@@ -34,11 +33,9 @@ add_library(gui SHARED
         models/distributorfilter.cpp
         models/columns.h
         models/aircraftsituationchangelistmodel.h
-        models/windlayerlistmodel.h
         models/actionhotkeylistmodel.cpp
         models/listmodelbaseaviation.cpp
         models/interpolationsetupmodel.cpp
-        models/windlayerlistmodel.cpp
         models/matchingstatisticsmodel.h
         models/modelfilter.cpp
         models/aircrafticaolistmodel.cpp
@@ -82,7 +79,6 @@ add_library(gui SHARED
         models/clientlistmodel.cpp
         models/aircrafticaofilter.h
         models/atcstationlistmodel.cpp
-        models/cloudlayerlistmodel.cpp
         models/simulatedaircraftlistmodel.h
         models/statusmessagelistmodel.h
         models/aircraftcategorytreemodel.cpp
@@ -105,7 +101,6 @@ add_library(gui SHARED
         models/applicationinfolistmodel.h
         models/identifierlistmodel.h
         models/modelfilter.h
-        models/cloudlayerlistmodel.h
         models/userlistmodel.cpp
         models/airportlistmodel.cpp
         models/actionhotkeylistmodel.h
@@ -116,16 +111,13 @@ add_library(gui SHARED
         models/atcstationlistmodel.h
         enableforviewbasedindicator.h
         pluginconfigwindow.h
-        views/cloudlayerview.cpp
         views/interpolationsetupview.cpp
         views/userview.h
         views/aircraftcategorytreeview.h
-        views/windlayerview.h
         views/viewtimestampobjects.cpp
         views/aircrafticaoview.h
         views/viewbase.h
         views/viewbasemisc.cpp
-        views/windlayerview.cpp
         views/distributorview.h
         views/checkboxdelegate.cpp
         views/viewbaseproxystyle.cpp
@@ -171,7 +163,6 @@ add_library(gui SHARED
         views/aircraftmodelstatisticsdialog.ui
         views/aircraftmodelstatisticsdialog.h
         views/audiodeviceinfoview.cpp
-        views/viewbaseweather.cpp
         views/clientview.cpp
         views/viewbaseitemdelegate.cpp
         views/aircraftsituationchangeview.cpp
@@ -199,7 +190,6 @@ add_library(gui SHARED
         views/radarview.cpp
         views/liveryview.cpp
         views/viewbasesimulation.cpp
-        views/cloudlayerview.h
         views/countryview.cpp
         views/liveryview.h
         views/flightplandialog.cpp
@@ -803,7 +793,6 @@ add_library(gui SHARED
         elidedpushbutton.h
         enableforframelesswindow.cpp
         overlaymessages.cpp
-        foreignwindows.cpp
         stylesheetutility.cpp
         dropbase.h
         eventfilter.cpp

src/gui/altitudeedit.cpp

@@ -3,7 +3,6 @@
 
 #include "altitudeedit.h"
 
-#include <QMessageBox>
 #include <QRegularExpressionValidator>
 
 using namespace swift::misc;

src/gui/altitudeedit.h

@@ -7,7 +7,6 @@
 #define SWIFT_GUI_ALTITUDEEDIT_H
 
 #include <QLineEdit>
-#include <QRegularExpression>
 
 #include "gui/swiftguiexport.h"
 #include "misc/aviation/altitude.h"

src/gui/components/dbownmodelscomponent.cpp

@@ -310,10 +310,7 @@ namespace swift::gui::components
             QPointer<CDbOwnModelsComponent> ownModelsComp(qobject_cast<CDbOwnModelsComponent *>(this->parent()));
             Q_ASSERT_X(ownModelsComp, Q_FUNC_INFO, "Cannot access parent");
 
-            if (m_loadActions.isEmpty())
-            {
-                m_loadActions = QList<QAction *>({ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr });
-            }
+            if (m_loadActions.isEmpty()) { m_loadActions = QList<QAction *>(sims.numberSimulators(), nullptr); }
             menuActions.addMenuSimulator();
             if (sims.isFSX())
             {
@@ -413,9 +410,8 @@ namespace swift::gui::components
             {
                 if (m_reloadActions.isEmpty())
                 {
-                    m_reloadActions =
-                        QList<QAction *>({ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                                           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr });
+                    // Two reload actions per simulator
+                    m_reloadActions = QList<QAction *>(sims.numberSimulators() * 2, nullptr);
                 }
                 menuActions.addMenu(CIcons::refresh16(), "Force model reload",
                                     CMenuAction::pathSimulatorModelsReload());
@@ -623,8 +619,7 @@ namespace swift::gui::components
 
             if (m_clearCacheActions.isEmpty())
             {
-                m_clearCacheActions =
-                    QList<QAction *>({ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr });
+                m_clearCacheActions = QList<QAction *>(sims.numberSimulators(), nullptr);
             }
             menuActions.addMenu(CIcons::delete16(), "Clear model caches", CMenuAction::pathSimulatorModelsClearCache());
             if (sims.isFSX())

src/gui/copyxswiftbusdialog.cpp

@@ -8,7 +8,6 @@
 #include "config/buildconfig.h"
 #include "core/context/contextsimulator.h"
 #include "gui/guiapplication.h"
-#include "misc/directoryutils.h"
 #include "misc/simulation/xplane/xplaneutil.h"
 #include "misc/swiftdirectories.h"
 

src/gui/dockwidget.cpp

@@ -12,7 +12,6 @@
 #include <QPointer>
 #include <QScopedPointer>
 #include <QScreen>
-#include <QSettings>
 #include <QSizePolicy>
 #include <QStatusBar>
 #include <QStyle>

src/gui/dropbase.h

@@ -4,7 +4,6 @@
 #ifndef SWIFT_GUI_DROPBASE_H
 #define SWIFT_GUI_DROPBASE_H
 
-#include <QFileInfo>
 #include <QList>
 #include <QMimeData>
 

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"

src/gui/filters/statusmessagefilterbar.h

@@ -6,8 +6,6 @@
 #ifndef SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERBAR_H
 #define SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERBAR_H
 
-#include <QFrame>
-
 #include "gui/filters/filterwidget.h"
 #include "gui/models/modelfilter.h"
 #include "misc/statusmessagelist.h"

src/gui/guiactionbind.h

@@ -9,7 +9,6 @@
 #include <QList>
 #include <QMenu>
 #include <QPushButton>
-#include <QScopedPointer>
 #include <QToolButton>
 
 #include "core/actionbind.h"

src/gui/guiapplication.h

@@ -25,7 +25,6 @@
 #include "gui/stylesheetutility.h"
 #include "gui/swiftguiexport.h"
 #include "misc/icons.h"
-#include "misc/network/networkutils.h"
 #include "misc/statusmessage.h"
 
 class QMenu;

src/gui/levelmeter.cpp

@@ -4,8 +4,6 @@
 
 #include "gui/levelmeter.h"
 
-#include <math.h>
-
 #include <QPainter>
 #include <QRect>
 #include <QSizePolicy>

src/gui/loginmodebuttons.h

@@ -11,7 +11,6 @@
 #include <QScopedPointer>
 
 #include "gui/swiftguiexport.h"
-#include "misc/network/connectionstatus.h"
 #include "misc/network/loginmode.h"
 
 namespace Ui

src/gui/menus/aircraftmodelmenus.cpp

@@ -13,9 +13,7 @@
 #include "gui/guiapplication.h"
 #include "misc/icons.h"
 #include "misc/logmessage.h"
-#include "misc/simulation/aircraftmodelutils.h"
 #include "misc/simulation/modelconverterx.h"
-#include "misc/verify.h"
 
 using namespace swift::config;
 using namespace swift::misc;

src/gui/menus/aircraftmodelmenus.h

@@ -4,7 +4,6 @@
 #ifndef SWIFT_GUI_MENUS_AIRCRAFTMODELMENUS_H
 #define SWIFT_GUI_MENUS_AIRCRAFTMODELMENUS_H
 
-#include <QMenu>
 #include <QObject>
 
 #include "gui/menus/menudelegate.h"