From b70fb70d60ba5a7faaba34da34199a76766f6d77 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 5 Aug 2017 18:22:56 +0200 Subject: [PATCH] Ref T111, renamed dummy driver to CSimulatorEmulated --- .../simulation/simulatorinfolist.cpp | 1 - .../simulation/simulatorplugininfo.cpp | 10 +-- .../simulation/simulatorplugininfo.h | 6 +- .../swift.pro => emulated/emulated.pro} | 4 +- .../simulatoremulated.cpp} | 84 +++++++++---------- .../simulatoremulated.h} | 26 +++--- .../simulator/emulated/simulatoremulated.json | 7 ++ .../simulatoremulatedfactory.cpp} | 14 ++-- .../simulatoremulatedfactory.h} | 12 +-- .../simulatoremulatedmonitordialog.cpp} | 40 ++++----- .../simulatoremulatedmonitordialog.h} | 20 ++--- .../simulatoremulatedmonitordialog.ui} | 10 +-- .../emulatedconfig.pro} | 4 +- .../simulatoremulatedconfig.cpp} | 12 +-- .../simulatoremulatedconfig.h} | 14 ++-- .../simulatoremulatedconfig.json | 3 + .../simulatoremulatedconfigwidget.cpp} | 12 +-- .../simulatoremulatedconfigwidget.h} | 18 ++-- .../simulatoremulatedconfigwidget.ui} | 6 +- src/plugins/simulator/simulator.pro | 4 +- .../simulator/swift/simulatorswift.json | 7 -- .../swiftconfig/simulatorswiftconfig.json | 3 - 22 files changed, 158 insertions(+), 159 deletions(-) rename src/plugins/simulator/{swift/swift.pro => emulated/emulated.pro} (88%) rename src/plugins/simulator/{swift/simulatorswift.cpp => emulated/simulatoremulated.cpp} (73%) rename src/plugins/simulator/{swift/simulatorswift.h => emulated/simulatoremulated.h} (86%) create mode 100644 src/plugins/simulator/emulated/simulatoremulated.json rename src/plugins/simulator/{swift/simulatorswiftfactory.cpp => emulated/simulatoremulatedfactory.cpp} (63%) rename src/plugins/simulator/{swift/simulatorswiftfactory.h => emulated/simulatoremulatedfactory.h} (84%) rename src/plugins/simulator/{swift/simulatorswiftmonitordialog.cpp => emulated/simulatoremulatedmonitordialog.cpp} (70%) rename src/plugins/simulator/{swift/simulatorswiftmonitordialog.h => emulated/simulatoremulatedmonitordialog.h} (75%) rename src/plugins/simulator/{swift/simulatorswiftmonitordialog.ui => emulated/simulatoremulatedmonitordialog.ui} (96%) rename src/plugins/simulator/{swiftconfig/swiftconfig.pro => emulatedconfig/emulatedconfig.pro} (86%) rename src/plugins/simulator/{swiftconfig/simulatorswiftconfig.cpp => emulatedconfig/simulatoremulatedconfig.cpp} (60%) rename src/plugins/simulator/{swiftconfig/simulatorswiftconfig.h => emulatedconfig/simulatoremulatedconfig.h} (71%) create mode 100644 src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.json rename src/plugins/simulator/{swiftconfig/swiftconfigwidget.cpp => emulatedconfig/simulatoremulatedconfigwidget.cpp} (65%) rename src/plugins/simulator/{swiftconfig/swiftconfigwidget.h => emulatedconfig/simulatoremulatedconfigwidget.h} (56%) rename src/plugins/simulator/{swiftconfig/swiftconfigwidget.ui => emulatedconfig/simulatoremulatedconfigwidget.ui} (85%) delete mode 100644 src/plugins/simulator/swift/simulatorswift.json delete mode 100644 src/plugins/simulator/swiftconfig/simulatorswiftconfig.json diff --git a/src/blackmisc/simulation/simulatorinfolist.cpp b/src/blackmisc/simulation/simulatorinfolist.cpp index 0e89a6735..d039a276a 100644 --- a/src/blackmisc/simulation/simulatorinfolist.cpp +++ b/src/blackmisc/simulation/simulatorinfolist.cpp @@ -65,6 +65,5 @@ namespace BlackMisc if (sim.xplane()) { sims.push_back(CSimulatorInfo(CSimulatorInfo::XPLANE)); } return sims; } - } // namespace } // namespace diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp index 021b4315a..9b7c4c6fd 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.cpp +++ b/src/blackmisc/simulation/simulatorplugininfo.cpp @@ -50,9 +50,9 @@ namespace BlackMisc return CSimulatorInfo(getSimulator()); } - bool CSimulatorPluginInfo::isSwiftPlugin() const + bool CSimulatorPluginInfo::isEmulatedPlugin() const { - return this->getIdentifier() == swiftPluginIndentifier(); + return this->getIdentifier() == emulatedPluginIndentifier(); } QString CSimulatorPluginInfo::convertToQString(bool i18n) const @@ -85,9 +85,9 @@ namespace BlackMisc return s; } - const QString &CSimulatorPluginInfo::swiftPluginIndentifier() + const QString &CSimulatorPluginInfo::emulatedPluginIndentifier() { - static const QString s("org.swift-project.plugins.simulator.swift"); + static const QString s("org.swift-project.plugins.simulator.emulated"); return s; } @@ -99,7 +99,7 @@ namespace BlackMisc p3dPluginIndentifier(), xplanePluginIndentifier(), fs9PluginIndentifier(), - swiftPluginIndentifier() + emulatedPluginIndentifier() }); return identifiers; } diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h index 47a97fee2..a06d9ce9a 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.h +++ b/src/blackmisc/simulation/simulatorplugininfo.h @@ -63,7 +63,7 @@ namespace BlackMisc BlackMisc::Simulation::CSimulatorInfo getSimulatorInfo() const; //! Is this the pseudo swift driver? - bool isSwiftPlugin() const; + bool isEmulatedPlugin() const; //! Description const QString &getDescription() const { return m_description; } @@ -83,8 +83,8 @@ namespace BlackMisc //! Plugin identifier (XPlane) static const QString &xplanePluginIndentifier(); - //! Plugin identifier (swift pseudo driver) - static const QString &swiftPluginIndentifier(); + //! Plugin identifier (emulated simulator plugin) + static const QString &emulatedPluginIndentifier(); //! All valid identifiers static const QStringList &allIdentifiers(); diff --git a/src/plugins/simulator/swift/swift.pro b/src/plugins/simulator/emulated/emulated.pro similarity index 88% rename from src/plugins/simulator/swift/swift.pro rename to src/plugins/simulator/emulated/emulated.pro index 8fee0700e..842d1aeb5 100644 --- a/src/plugins/simulator/swift/swift.pro +++ b/src/plugins/simulator/emulated/emulated.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus gui widgets network xml -TARGET = simulatorswift +TARGET = simulatoremulated TEMPLATE = lib CONFIG += plugin shared @@ -14,7 +14,7 @@ INCLUDEPATH += . $$SourceRoot/src SOURCES += *.cpp HEADERS += *.h FORMS += *.ui -DISTFILES += simulatorswift.json +DISTFILES += simulatoremulated.json DESTDIR = $$DestRoot/bin/plugins/simulator diff --git a/src/plugins/simulator/swift/simulatorswift.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp similarity index 73% rename from src/plugins/simulator/swift/simulatorswift.cpp rename to src/plugins/simulator/emulated/simulatoremulated.cpp index 05f37dafe..1ee7f1be4 100644 --- a/src/plugins/simulator/swift/simulatorswift.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "simulatorswift.h" +#include "simulatoremulated.h" #include "blackgui/guiapplication.h" #include "blackcore/context/contextsimulator.h" #include "blackmisc/simulation/simulatorplugininfo.h" @@ -28,9 +28,9 @@ using namespace BlackCore::Context; namespace BlackSimPlugin { - namespace Swift + namespace Emulated { - CSimulatorSwift::CSimulatorSwift(const CSimulatorPluginInfo &info, + CSimulatorEmulated::CSimulatorEmulated(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, IWeatherGridProvider *weatherGridProvider, @@ -39,24 +39,24 @@ namespace BlackSimPlugin { Q_ASSERT_X(sApp && sApp->getIContextSimulator(), Q_FUNC_INFO, "Need context"); - CSimulatorSwift::registerHelp(); - m_monitorWidget.reset(new CSimulatorSwiftMonitorDialog(this, sGui->mainApplicationWindow())); - connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorSwift::closeMonitor); + CSimulatorEmulated::registerHelp(); + m_monitorWidget.reset(new CSimulatorEmulatedMonitorDialog(this, sGui->mainApplicationWindow())); + connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorEmulated::closeMonitor); this->onSettingsChanged(); } - CSimulatorInfo CSimulatorSwift::getSimulatorInfo() const + CSimulatorInfo CSimulatorEmulated::getSimulatorInfo() const { const CSwiftPluginSettings s = m_settings.get(); return s.getEmulatedSimulator(); } - bool CSimulatorSwift::isTimeSynchronized() const + bool CSimulatorEmulated::isTimeSynchronized() const { return m_timeSyncronized; } - bool CSimulatorSwift::connectTo() + bool CSimulatorEmulated::connectTo() { QTimer::singleShot(1000, this, [ = ] { @@ -68,38 +68,38 @@ namespace BlackSimPlugin return true; } - bool CSimulatorSwift::disconnectFrom() + bool CSimulatorEmulated::disconnectFrom() { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO); m_renderedAircraft.clear(); return true; } - bool CSimulatorSwift::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) + bool CSimulatorEmulated::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, remoteAircraft.toQString()); return CSimulatorCommon::logicallyAddRemoteAircraft(remoteAircraft); } - bool CSimulatorSwift::logicallyRemoveRemoteAircraft(const CCallsign &callsign) + bool CSimulatorEmulated::logicallyRemoveRemoteAircraft(const CCallsign &callsign) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsign.toQString()); return CSimulatorCommon::logicallyRemoveRemoteAircraft(callsign); } - int CSimulatorSwift::physicallyRemoveMultipleRemoteAircraft(const CCallsignSet &callsigns) + int CSimulatorEmulated::physicallyRemoveMultipleRemoteAircraft(const CCallsignSet &callsigns) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsigns.toQString()); return CSimulatorCommon::physicallyRemoveMultipleRemoteAircraft(callsigns); } - bool CSimulatorSwift::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft) + bool CSimulatorEmulated::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraft.toQString()); return true; } - bool CSimulatorSwift::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft) + bool CSimulatorEmulated::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraft.toQString()); const int c = m_renderedAircraft.setEnabled(aircraft.getCallsign(), aircraft.isEnabled(), true); @@ -107,23 +107,23 @@ namespace BlackSimPlugin return c > 0; } - bool CSimulatorSwift::updateOwnSimulatorCockpit(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + bool CSimulatorEmulated::updateOwnSimulatorCockpit(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraft.toQString(), originator.toQString()); return true; } - void CSimulatorSwift::displayStatusMessage(const CStatusMessage &message) const + void CSimulatorEmulated::displayStatusMessage(const CStatusMessage &message) const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, message.toQString()); } - void CSimulatorSwift::displayTextMessage(const CTextMessage &message) const + void CSimulatorEmulated::displayTextMessage(const CTextMessage &message) const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, message.toQString()); } - bool CSimulatorSwift::setTimeSynchronization(bool enable, const CTime &offset) + bool CSimulatorEmulated::setTimeSynchronization(bool enable, const CTime &offset) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, boolToTrueFalse(enable), offset.toQString()); m_timeSyncronized = enable; @@ -131,45 +131,45 @@ namespace BlackSimPlugin return enable; } - CTime CSimulatorSwift::getTimeSynchronizationOffset() const + CTime CSimulatorEmulated::getTimeSynchronizationOffset() const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO); return m_offsetTime; } - bool CSimulatorSwift::isPhysicallyRenderedAircraft(const CCallsign &callsign) const + bool CSimulatorEmulated::isPhysicallyRenderedAircraft(const CCallsign &callsign) const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsign.toQString()); return m_renderedAircraft.containsCallsign(callsign); } - CCallsignSet CSimulatorSwift::physicallyRenderedAircraft() const + CCallsignSet CSimulatorEmulated::physicallyRenderedAircraft() const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO); return m_renderedAircraft.getCallsigns(); } - void CSimulatorSwift::highlightAircraft(const CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const CTime &displayTime) + void CSimulatorEmulated::highlightAircraft(const CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const CTime &displayTime) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraftToHighlight.toQString(), boolToTrueFalse(enableHighlight), displayTime.toQString()); CSimulatorCommon::highlightAircraft(aircraftToHighlight, enableHighlight, displayTime); } - bool CSimulatorSwift::parseCommandLine(const QString &commandLine, const CIdentifier &originator) + bool CSimulatorEmulated::parseCommandLine(const QString &commandLine, const CIdentifier &originator) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, commandLine, originator.toQString()); return CSimulatorCommon::parseCommandLine(commandLine, originator); } - void CSimulatorSwift::registerHelp() + void CSimulatorEmulated::registerHelp() { - if (BlackMisc::CSimpleCommandParser::registered("BlackSimPlugin::Swift::CSimulatorSwift")) { return; } + if (BlackMisc::CSimpleCommandParser::registered("BlackSimPlugin::Swift::CSimulatorEmulated")) { return; } BlackMisc::CSimpleCommandParser::registerCommand({".drv", "alias: .driver .plugin"}); BlackMisc::CSimpleCommandParser::registerCommand({".drv show", "show swift driver window"}); BlackMisc::CSimpleCommandParser::registerCommand({".drv hide", "hide swift driver window"}); } - void CSimulatorSwift::setCombinedStatus(bool connected, bool simulating, bool paused) + void CSimulatorEmulated::setCombinedStatus(bool connected, bool simulating, bool paused) { m_connected = connected; m_simulating = simulating; @@ -177,25 +177,25 @@ namespace BlackSimPlugin this->emitSimulatorCombinedStatus(); } - bool CSimulatorSwift::isConnected() const + bool CSimulatorEmulated::isConnected() const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO); return m_connected; } - bool CSimulatorSwift::isPaused() const + bool CSimulatorEmulated::isPaused() const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO); return m_paused; } - bool CSimulatorSwift::isSimulating() const + bool CSimulatorEmulated::isSimulating() const { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO); return m_simulating; } - bool CSimulatorSwift::physicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) + bool CSimulatorEmulated::physicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, remoteAircraft.toQString()); CSimulatedAircraft aircraft(remoteAircraft); @@ -205,26 +205,26 @@ namespace BlackSimPlugin return true; } - bool CSimulatorSwift::physicallyRemoveRemoteAircraft(const CCallsign &callsign) + bool CSimulatorEmulated::physicallyRemoveRemoteAircraft(const CCallsign &callsign) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsign.toQString()); const int c = m_renderedAircraft.removeByCallsign(callsign); return c > 0; } - bool CSimulatorSwift::setInterpolatorMode(CInterpolatorMulti::Mode mode, const CCallsign &callsign) + bool CSimulatorEmulated::setInterpolatorMode(CInterpolatorMulti::Mode mode, const CCallsign &callsign) { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, CInterpolatorMulti::modeToString(mode), callsign.toQString()); return false; } - int CSimulatorSwift::physicallyRemoveAllRemoteAircraft() + int CSimulatorEmulated::physicallyRemoveAllRemoteAircraft() { if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO); return CSimulatorCommon::physicallyRemoveAllRemoteAircraft(); } - bool CSimulatorSwift::parseDetails(const CSimpleCommandParser &parser) + bool CSimulatorEmulated::parseDetails(const CSimpleCommandParser &parser) { if (m_monitorWidget && parser.isKnownCommand()) { @@ -234,12 +234,12 @@ namespace BlackSimPlugin return false; } - bool CSimulatorSwift::canLog() const + bool CSimulatorEmulated::canLog() const { return sApp && !sApp->isShuttingDown() && m_log && m_monitorWidget; } - void CSimulatorSwift::closeMonitor() + void CSimulatorEmulated::closeMonitor() { if (m_monitorWidget) { @@ -247,7 +247,7 @@ namespace BlackSimPlugin } } - void CSimulatorSwift::setOwnAircraftPosition(const QString &wgsLatitude, const QString &wgsLongitude, const CAltitude &altitude) + void CSimulatorEmulated::setOwnAircraftPosition(const QString &wgsLatitude, const QString &wgsLongitude, const CAltitude &altitude) { const CCoordinateGeodetic coordinate( CLatitude::fromWgs84(wgsLatitude), @@ -261,7 +261,7 @@ namespace BlackSimPlugin this->updateOwnSituation(s); } - void CSimulatorSwift::onSettingsChanged() + void CSimulatorEmulated::onSettingsChanged() { const CSwiftPluginSettings settings(m_settings.get()); m_log = settings.isLoggingFunctionCalls(); @@ -282,11 +282,11 @@ namespace BlackSimPlugin this->updateOwnModel(settings.getOwnModel()); } - CSimulatorSwiftListener::CSimulatorSwiftListener(const CSimulatorPluginInfo &info) + CSimulatorEmulatedListener::CSimulatorEmulatedListener(const CSimulatorPluginInfo &info) : ISimulatorListener(info) { } - void CSimulatorSwiftListener::startImpl() + void CSimulatorEmulatedListener::startImpl() { if (this->isShuttingDown()) { return; } QTimer::singleShot(2000, this, [ = ] @@ -296,7 +296,7 @@ namespace BlackSimPlugin }); } - void CSimulatorSwiftListener::stopImpl() + void CSimulatorEmulatedListener::stopImpl() { } } // ns } // ns diff --git a/src/plugins/simulator/swift/simulatorswift.h b/src/plugins/simulator/emulated/simulatoremulated.h similarity index 86% rename from src/plugins/simulator/swift/simulatorswift.h rename to src/plugins/simulator/emulated/simulatoremulated.h index 6bcf09de4..1017dff81 100644 --- a/src/plugins/simulator/swift/simulatorswift.h +++ b/src/plugins/simulator/emulated/simulatoremulated.h @@ -9,30 +9,30 @@ //! \file -#ifndef BLACKSIMPLUGIN_SWIFT_SIMULATORSWIFT_H -#define BLACKSIMPLUGIN_SWIFT_SIMULATORSWIFT_H +#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATED_H +#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATED_H #include "blackcore/simulatorcommon.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/settings/swiftpluginsettings.h" #include "blackmisc/pq/time.h" -#include "simulatorswiftmonitordialog.h" +#include "simulatoremulatedmonitordialog.h" #include namespace BlackSimPlugin { - namespace Swift + namespace Emulated { //! swift simulator implementation - class CSimulatorSwift : public BlackCore::CSimulatorCommon + class CSimulatorEmulated : public BlackCore::CSimulatorCommon { Q_OBJECT - friend class CSimulatorSwiftMonitorDialog; //!< the monitor widget represents the simulator and needs access to internals (i.e. private/protected) + friend class CSimulatorEmulatedMonitorDialog; //!< the monitor widget represents the simulator and needs access to internals (i.e. private/protected) public: //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create - CSimulatorSwift( + CSimulatorEmulated( const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, @@ -67,8 +67,8 @@ namespace BlackSimPlugin //! \addtogroup swiftdotcommands //! @{ //! 
-            //! .drv show   show swift driver window     BlackSimPlugin::Swift::CSimulatorSwift
-            //! .drv hide   hide swift driver window     BlackSimPlugin::Swift::CSimulatorSwift
+            //! .drv show   show swift driver window     BlackSimPlugin::Swift::CSimulatorEmulated
+            //! .drv hide   hide swift driver window     BlackSimPlugin::Swift::CSimulatorEmulated
             //!
//! @} //! \copydoc BlackCore::ISimulator::parseCommandLine @@ -117,18 +117,18 @@ namespace BlackSimPlugin BlackMisc::PhysicalQuantities::CTime m_offsetTime; BlackMisc::Simulation::CSimulatedAircraftList m_renderedAircraft; - QScopedPointer m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed - BlackMisc::CSettingReadOnly m_settings { this, &CSimulatorSwift::onSettingsChanged }; + QScopedPointer m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed + BlackMisc::CSettingReadOnly m_settings { this, &CSimulatorEmulated::onSettingsChanged }; }; //! Listener for swift - class CSimulatorSwiftListener : public BlackCore::ISimulatorListener + class CSimulatorEmulatedListener : public BlackCore::ISimulatorListener { Q_OBJECT public: //! Constructor - CSimulatorSwiftListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info); + CSimulatorEmulatedListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info); protected: //! \copydoc BlackCore::ISimulatorListener::startImpl diff --git a/src/plugins/simulator/emulated/simulatoremulated.json b/src/plugins/simulator/emulated/simulatoremulated.json new file mode 100644 index 000000000..5ef3639da --- /dev/null +++ b/src/plugins/simulator/emulated/simulatoremulated.json @@ -0,0 +1,7 @@ +{ + "identifier" : "org.swift-project.plugins.simulator.emulated", + "name" : "Emulated simulator", + "simulator" : "emulated", + "description" : "Emulated simulator driver", + "config" : "org.swift-project.plugins.simulator.emulated.config" +} diff --git a/src/plugins/simulator/swift/simulatorswiftfactory.cpp b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp similarity index 63% rename from src/plugins/simulator/swift/simulatorswiftfactory.cpp rename to src/plugins/simulator/emulated/simulatoremulatedfactory.cpp index a9e545be8..1cc06d569 100644 --- a/src/plugins/simulator/swift/simulatorswiftfactory.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp @@ -7,27 +7,27 @@ * contained in the LICENSE file. */ -#include "simulatorswiftfactory.h" -#include "simulatorswift.h" +#include "simulatoremulatedfactory.h" +#include "simulatoremulated.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include namespace BlackSimPlugin { - namespace Swift + namespace Emulated { - BlackCore::ISimulator *CSimulatorSwiftFactory::create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, + BlackCore::ISimulator *CSimulatorEmulatedFactory::create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) { Q_ASSERT(ownAircraftProvider); - return new CSimulatorSwift(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); + return new CSimulatorEmulated(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); } - BlackCore::ISimulatorListener *CSimulatorSwiftFactory::createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) + BlackCore::ISimulatorListener *CSimulatorEmulatedFactory::createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) { - return new CSimulatorSwiftListener(info); + return new CSimulatorEmulatedListener(info); } } // namespace } // namespace diff --git a/src/plugins/simulator/swift/simulatorswiftfactory.h b/src/plugins/simulator/emulated/simulatoremulatedfactory.h similarity index 84% rename from src/plugins/simulator/swift/simulatorswiftfactory.h rename to src/plugins/simulator/emulated/simulatoremulatedfactory.h index a8d0e5489..e995241ac 100644 --- a/src/plugins/simulator/swift/simulatorswiftfactory.h +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKSIMPLUGIN_SIMULATOR_SWIFTFACTORY_H -#define BLACKSIMPLUGIN_SIMULATOR_SWIFTFACTORY_H +#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H +#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H #include "blackcore/simulator.h" #include "blackmisc/simulation/simulatorplugininfo.h" @@ -20,15 +20,15 @@ namespace BlackSimPlugin { - namespace Swift + namespace Emulated { - //! Factory implementation to create CSimulatorSwift instances - class CSimulatorSwiftFactory : + //! Factory implementation to create CSimulatorEmulated instances + class CSimulatorEmulatedFactory : public QObject, public BlackCore::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorswift.json") + Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatoremulated.json") Q_INTERFACES(BlackCore::ISimulatorFactory) public: diff --git a/src/plugins/simulator/swift/simulatorswiftmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp similarity index 70% rename from src/plugins/simulator/swift/simulatorswiftmonitordialog.cpp rename to src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp index 0fc1a5400..45e66ab00 100644 --- a/src/plugins/simulator/swift/simulatorswiftmonitordialog.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp @@ -7,9 +7,9 @@ * contained in the LICENSE file. */ -#include "simulatorswiftmonitordialog.h" -#include "simulatorswift.h" -#include "ui_simulatorswiftmonitordialog.h" +#include "simulatoremulatedmonitordialog.h" +#include "simulatoremulated.h" +#include "ui_simulatoremulatedmonitordialog.h" using namespace BlackMisc; using namespace BlackMisc::Aviation; @@ -17,17 +17,17 @@ using namespace BlackGui::Editors; namespace BlackSimPlugin { - namespace Swift + namespace Emulated { - const CLogCategoryList &CSimulatorSwiftMonitorDialog::getLogCategories() + const CLogCategoryList &CSimulatorEmulatedMonitorDialog::getLogCategories() { static const BlackMisc::CLogCategoryList cats { CLogCategory::driver(), CLogCategory::plugin() }; return cats; } - CSimulatorSwiftMonitorDialog::CSimulatorSwiftMonitorDialog(CSimulatorSwift *simulator, QWidget *parent) : + CSimulatorEmulatedMonitorDialog::CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent) : QDialog(parent), - ui(new Ui::CSimulatorSwiftMonitorDialog) + ui(new Ui::CSimulatorEmulatedMonitorDialog) { Q_ASSERT_X(simulator, Q_FUNC_INFO, "Need simulator"); @@ -36,31 +36,31 @@ namespace BlackSimPlugin ui->tw_SwiftMonitorDialog->setCurrentIndex(0); this->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - connect(ui->cb_Connected, &QCheckBox::released, this, &CSimulatorSwiftMonitorDialog::onSimulatorValuesChanged); - connect(ui->cb_Paused, &QCheckBox::released, this, &CSimulatorSwiftMonitorDialog::onSimulatorValuesChanged); - connect(ui->cb_Simulating, &QCheckBox::released, this, &CSimulatorSwiftMonitorDialog::onSimulatorValuesChanged); + connect(ui->cb_Connected, &QCheckBox::released, this, &CSimulatorEmulatedMonitorDialog::onSimulatorValuesChanged); + connect(ui->cb_Paused, &QCheckBox::released, this, &CSimulatorEmulatedMonitorDialog::onSimulatorValuesChanged); + connect(ui->cb_Simulating, &QCheckBox::released, this, &CSimulatorEmulatedMonitorDialog::onSimulatorValuesChanged); - connect(ui->editor_Situation, &CSituationForm::changeAircraftSituation, this, &CSimulatorSwiftMonitorDialog::changeSituation); - connect(ui->editor_AircraftParts, &CAircraftPartsForm::changeAircraftParts, this, &CSimulatorSwiftMonitorDialog::changeParts); + connect(ui->editor_Situation, &CSituationForm::changeAircraftSituation, this, &CSimulatorEmulatedMonitorDialog::changeSituation); + connect(ui->editor_AircraftParts, &CAircraftPartsForm::changeAircraftParts, this, &CSimulatorEmulatedMonitorDialog::changeParts); this->setSimulatorUiValues(); ui->editor_Situation->setSituation(m_simulator->getOwnAircraftSituation()); } - CSimulatorSwiftMonitorDialog::~CSimulatorSwiftMonitorDialog() + CSimulatorEmulatedMonitorDialog::~CSimulatorEmulatedMonitorDialog() { } - void CSimulatorSwiftMonitorDialog::appendStatusMessageToList(const BlackMisc::CStatusMessage &statusMessage) + void CSimulatorEmulatedMonitorDialog::appendStatusMessageToList(const BlackMisc::CStatusMessage &statusMessage) { ui->comp_LogComponent->appendStatusMessagesToList(statusMessage); } - void CSimulatorSwiftMonitorDialog::appendStatusMessagesToList(const BlackMisc::CStatusMessageList &statusMessages) + void CSimulatorEmulatedMonitorDialog::appendStatusMessagesToList(const BlackMisc::CStatusMessageList &statusMessages) { ui->comp_LogComponent->appendStatusMessagesToList(statusMessages); } - void CSimulatorSwiftMonitorDialog::appendFunctionCall(const QString &function, const QString &p1, const QString &p2, const QString &p3) + void CSimulatorEmulatedMonitorDialog::appendFunctionCall(const QString &function, const QString &p1, const QString &p2, const QString &p3) { static const QString c1("%1 %2"); static const QString c2("%1 %2 %3"); @@ -86,7 +86,7 @@ namespace BlackSimPlugin this->appendStatusMessageToList(msg); } - void CSimulatorSwiftMonitorDialog::onSimulatorValuesChanged() + void CSimulatorEmulatedMonitorDialog::onSimulatorValuesChanged() { m_simulator->setCombinedStatus( ui->cb_Connected->isChecked(), @@ -95,21 +95,21 @@ namespace BlackSimPlugin ); } - void CSimulatorSwiftMonitorDialog::changeSituation() + void CSimulatorEmulatedMonitorDialog::changeSituation() { if (!m_simulator) { return; } const CAircraftSituation s(ui->editor_Situation->getSituation()); m_simulator->updateOwnSituation(s); } - void CSimulatorSwiftMonitorDialog::changeParts() + void CSimulatorEmulatedMonitorDialog::changeParts() { if (!m_simulator) { return; } const CAircraftParts p(ui->editor_AircraftParts->getAircraftPartsFromGui()); m_simulator->updateOwnParts(p); } - void CSimulatorSwiftMonitorDialog::setSimulatorUiValues() + void CSimulatorEmulatedMonitorDialog::setSimulatorUiValues() { ui->cb_Connected->setChecked(m_simulator->isConnected()); ui->cb_Paused->setChecked(m_simulator->isPaused()); diff --git a/src/plugins/simulator/swift/simulatorswiftmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h similarity index 75% rename from src/plugins/simulator/swift/simulatorswiftmonitordialog.h rename to src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h index ca3eadf59..16f4b28e9 100644 --- a/src/plugins/simulator/swift/simulatorswiftmonitordialog.h +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h @@ -9,25 +9,25 @@ //! \file -#ifndef BLACKSIMPLUGIN_SWIFT_SIMULATORSWIFTMONITORDIALOG_H -#define BLACKSIMPLUGIN_SWIFT_SIMULATORSWIFTMONITORDIALOG_H +#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDMONITORDIALOG_H +#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDMONITORDIALOG_H #include #include #include "blackmisc/statusmessagelist.h" #include "blackmisc/logcategorylist.h" -namespace Ui { class CSimulatorSwiftMonitorDialog; } +namespace Ui { class CSimulatorEmulatedMonitorDialog; } namespace BlackSimPlugin { - namespace Swift + namespace Emulated { - class CSimulatorSwift; + class CSimulatorEmulated; /** * Monitor widget for the pseudo driver */ - class CSimulatorSwiftMonitorDialog : public QDialog + class CSimulatorEmulatedMonitorDialog : public QDialog { Q_OBJECT @@ -36,10 +36,10 @@ namespace BlackSimPlugin static const BlackMisc::CLogCategoryList &getLogCategories(); //! Ctor - explicit CSimulatorSwiftMonitorDialog(CSimulatorSwift *simulator, QWidget *parent = nullptr); + explicit CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent = nullptr); //! Dtor - virtual ~CSimulatorSwiftMonitorDialog(); + virtual ~CSimulatorEmulatedMonitorDialog(); //! \copydoc BlackGui::Components::CLogComponent::appendStatusMessageToList void appendStatusMessageToList(const BlackMisc::CStatusMessage &statusMessage); @@ -63,8 +63,8 @@ namespace BlackSimPlugin //! UI values void setSimulatorUiValues(); - QScopedPointer ui; - CSimulatorSwift *m_simulator = nullptr; + QScopedPointer ui; + CSimulatorEmulated *m_simulator = nullptr; }; } // ns } // ns diff --git a/src/plugins/simulator/swift/simulatorswiftmonitordialog.ui b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui similarity index 96% rename from src/plugins/simulator/swift/simulatorswiftmonitordialog.ui rename to src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui index f2d602657..60e8c6b8a 100644 --- a/src/plugins/simulator/swift/simulatorswiftmonitordialog.ui +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui @@ -1,7 +1,7 @@ - CSimulatorSwiftMonitorDialog - + CSimulatorEmulatedMonitorDialog + 0 @@ -11,7 +11,7 @@ - swift driver monitor + Emulated simulator monitor @@ -244,7 +244,7 @@ bb_SwiftMonitorDialog accepted() - CSimulatorSwiftMonitorDialog + CSimulatorEmulatedMonitorDialog accept() @@ -260,7 +260,7 @@ bb_SwiftMonitorDialog rejected() - CSimulatorSwiftMonitorDialog + CSimulatorEmulatedMonitorDialog reject() diff --git a/src/plugins/simulator/swiftconfig/swiftconfig.pro b/src/plugins/simulator/emulatedconfig/emulatedconfig.pro similarity index 86% rename from src/plugins/simulator/swiftconfig/swiftconfig.pro rename to src/plugins/simulator/emulatedconfig/emulatedconfig.pro index daa65eb5c..46b60d53a 100644 --- a/src/plugins/simulator/swiftconfig/swiftconfig.pro +++ b/src/plugins/simulator/emulatedconfig/emulatedconfig.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core widgets dbus network -TARGET = simulatorswiftconfig +TARGET = simulatoremulatedconfig TEMPLATE = lib CONFIG += plugin shared CONFIG += blackmisc blackcore blackgui @@ -14,7 +14,7 @@ SOURCES += *.cpp HEADERS += *.h FORMS += *.ui -DISTFILES += simulatorswiftconfig.json +DISTFILES += simulatoremulatedconfig.json DESTDIR = $$DestRoot/bin/plugins/simulator win32 { diff --git a/src/plugins/simulator/swiftconfig/simulatorswiftconfig.cpp b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp similarity index 60% rename from src/plugins/simulator/swiftconfig/simulatorswiftconfig.cpp rename to src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp index 8b1e37236..ce2b87654 100644 --- a/src/plugins/simulator/swiftconfig/simulatorswiftconfig.cpp +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp @@ -7,21 +7,21 @@ * contained in the LICENSE file. */ -#include "simulatorswiftconfig.h" -#include "swiftconfigwidget.h" +#include "simulatoremulatedconfig.h" +#include "simulatoremulatedconfigwidget.h" namespace BlackSimPlugin { - namespace Swift + namespace Emulated { - CSimulatorSwiftConfig::CSimulatorSwiftConfig(QObject *parent) : QObject(parent) + CSimulatorEmulatedConfig::CSimulatorEmulatedConfig(QObject *parent) : QObject(parent) { // void } - BlackGui::CPluginConfigWindow *CSimulatorSwiftConfig::createConfigWindow(QWidget *parent) + BlackGui::CPluginConfigWindow *CSimulatorEmulatedConfig::createConfigWindow(QWidget *parent) { - return new CSwiftConfigWidget(parent); + return new CSimulatorEmulatedConfigWidget(parent); } } } diff --git a/src/plugins/simulator/swiftconfig/simulatorswiftconfig.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h similarity index 71% rename from src/plugins/simulator/swiftconfig/simulatorswiftconfig.h rename to src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h index 12872232a..4d827ddeb 100644 --- a/src/plugins/simulator/swiftconfig/simulatorswiftconfig.h +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h @@ -9,30 +9,30 @@ //! \file -#ifndef BLACKSIMPLUGIN_SIMULATOR_SWIFT_CONFIG_H -#define BLACKSIMPLUGIN_SIMULATOR_SWIFT_CONFIG_H +#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H +#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H #include "blackgui/pluginconfig.h" namespace BlackSimPlugin { - namespace Swift + namespace Emulated { /*! * Window for setting up the FSX plugin. */ - class CSimulatorSwiftConfig : public QObject, public BlackGui::IPluginConfig + class CSimulatorEmulatedConfig : public QObject, public BlackGui::IPluginConfig { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorswiftconfig.json") + Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatoremulatedconfig.json") Q_INTERFACES(BlackGui::IPluginConfig) public: //! Ctor - CSimulatorSwiftConfig(QObject *parent = nullptr); + CSimulatorEmulatedConfig(QObject *parent = nullptr); //! Dtor - virtual ~CSimulatorSwiftConfig() {} + virtual ~CSimulatorEmulatedConfig() {} //! \copydoc BlackGui::IPluginConfig::createConfigWindow() BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override; diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.json b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.json new file mode 100644 index 000000000..f88c12566 --- /dev/null +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.json @@ -0,0 +1,3 @@ +{ + "identifier" : "org.swift-project.plugins.simulator.emulated.config" +} diff --git a/src/plugins/simulator/swiftconfig/swiftconfigwidget.cpp b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp similarity index 65% rename from src/plugins/simulator/swiftconfig/swiftconfigwidget.cpp rename to src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp index cb7e030c8..bb9e5fd0d 100644 --- a/src/plugins/simulator/swiftconfig/swiftconfigwidget.cpp +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp @@ -7,23 +7,23 @@ * contained in the LICENSE file. */ -#include "swiftconfigwidget.h" -#include "ui_swiftconfigwidget.h" +#include "simulatoremulatedconfigwidget.h" +#include "ui_simulatoremulatedconfigwidget.h" using namespace BlackGui; namespace BlackSimPlugin { - namespace Swift + namespace Emulated { - CSwiftConfigWidget::CSwiftConfigWidget(QWidget *parent) : + CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) : BlackGui::CPluginConfigWindow(parent), - ui(new Ui::CSwiftConfigWidget) + ui(new Ui::CSimulatorEmulatedConfigWidget) { ui->setupUi(this); } - CSwiftConfigWidget::~CSwiftConfigWidget() + CSimulatorEmulatedConfigWidget::~CSimulatorEmulatedConfigWidget() { } } // ns } // ns diff --git a/src/plugins/simulator/swiftconfig/swiftconfigwidget.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h similarity index 56% rename from src/plugins/simulator/swiftconfig/swiftconfigwidget.h rename to src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h index 42e2cf443..5cb65b37b 100644 --- a/src/plugins/simulator/swiftconfig/swiftconfigwidget.h +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h @@ -9,33 +9,33 @@ //! \file -#ifndef BLACKSIMPLUGIN_SWIFT_SWIFTCONFIGWIDGET_H -#define BLACKSIMPLUGIN_SWIFT_SWIFTCONFIGWIDGET_H +#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H +#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H #include #include -namespace Ui { class CSwiftConfigWidget; } +namespace Ui { class CSimulatorEmulatedConfigWidget; } namespace BlackSimPlugin { - namespace Swift + namespace Emulated { /** - * Configuration window for CSimulatorSwiftConfig + * Configuration window for CSimulatorEmulatedConfig */ - class Q_DECL_EXPORT CSwiftConfigWidget : public BlackGui::CPluginConfigWindow + class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public BlackGui::CPluginConfigWindow { Q_OBJECT public: //! Ctor - explicit CSwiftConfigWidget(QWidget *parent = nullptr); + explicit CSimulatorEmulatedConfigWidget(QWidget *parent = nullptr); //! Dtor - virtual ~CSwiftConfigWidget(); + virtual ~CSimulatorEmulatedConfigWidget(); private: - QScopedPointer ui; + QScopedPointer ui; }; } // ns } // ns diff --git a/src/plugins/simulator/swiftconfig/swiftconfigwidget.ui b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui similarity index 85% rename from src/plugins/simulator/swiftconfig/swiftconfigwidget.ui rename to src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui index d6f890c0d..9288426b0 100644 --- a/src/plugins/simulator/swiftconfig/swiftconfigwidget.ui +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui @@ -1,7 +1,7 @@ - CSwiftConfigWidget - + CSimulatorEmulatedConfigWidget + 0 @@ -11,7 +11,7 @@ - swift pseudo driver + emulated simulator driver diff --git a/src/plugins/simulator/simulator.pro b/src/plugins/simulator/simulator.pro index db3480fa9..3dcf34783 100644 --- a/src/plugins/simulator/simulator.pro +++ b/src/plugins/simulator/simulator.pro @@ -3,8 +3,8 @@ load(common_pre) TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += swift -SUBDIRS += swiftconfig +SUBDIRS += emulated +SUBDIRS += emulatedconfig contains(BLACK_CONFIG,FSX|FS9|P3D) { SUBDIRS += fsuipc32 diff --git a/src/plugins/simulator/swift/simulatorswift.json b/src/plugins/simulator/swift/simulatorswift.json deleted file mode 100644 index ebb5062fd..000000000 --- a/src/plugins/simulator/swift/simulatorswift.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "identifier" : "org.swift-project.plugins.simulator.swift", - "name" : "swift pseudo simulator", - "simulator" : "swift", - "description" : "swift testing driver", - "config" : "org.swift-project.plugins.simulator.swift.config" -} diff --git a/src/plugins/simulator/swiftconfig/simulatorswiftconfig.json b/src/plugins/simulator/swiftconfig/simulatorswiftconfig.json deleted file mode 100644 index 40405cf64..000000000 --- a/src/plugins/simulator/swiftconfig/simulatorswiftconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "identifier" : "org.swift-project.plugins.simulator.swift.config" -}