flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

DBus test (GUI + core) fixes

Browse Source 
* removed unused signals
* marked relayParentSignals as deprecated, currently not used
This commit is contained in:
Klaus Basan
2018-08-09 01:12:21 +02:00
parent e114c8c99c
commit 92880bce7f
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/context/contextsimulatorimpl.cpp
View File

@@ -386,8 +386,6 @@ namespace BlackCore
Q_ASSERT(c); Q_ASSERT(c);
c = connect(simulator, &ISimulator::physicallyAddingRemoteModelFailed, this, &CContextSimulator::addingRemoteAircraftFailed); c = connect(simulator, &ISimulator::physicallyAddingRemoteModelFailed, this, &CContextSimulator::addingRemoteAircraftFailed);
Q_ASSERT(c); Q_ASSERT(c);
c = connect(simulator, &ISimulator::receivedRequestedElevation, this, &CContextSimulator::onReceivedRequestedElevation);
Q_ASSERT(c);
c = connect(simulator, &ISimulator::ownAircraftModelChanged, this, &IContextSimulator::ownAircraftModelChanged); c = connect(simulator, &ISimulator::ownAircraftModelChanged, this, &IContextSimulator::ownAircraftModelChanged);
Q_ASSERT(c); Q_ASSERT(c);
c = connect(simulator, &ISimulator::aircraftRenderingChanged, this, &IContextSimulator::aircraftRenderingChanged); c = connect(simulator, &ISimulator::aircraftRenderingChanged, this, &IContextSimulator::aircraftRenderingChanged);
@@ -423,8 +421,10 @@ namespace BlackCore
m_simulatorPlugin.second = simulator; m_simulatorPlugin.second = simulator;
// Emit signal after this function completes // Emit signal after this function completes
QPointer<CContextSimulator> myself(this);
QTimer::singleShot(0, this, [ = ] QTimer::singleShot(0, this, [ = ]
{ {
if (!myself) { return; }
emit this->simulatorPluginChanged(simulatorPluginInfo); emit this->simulatorPluginChanged(simulatorPluginInfo);
}); });
@@ -601,12 +601,6 @@ namespace BlackCore
emit getIContextOwnAircraft()->changedAircraftCockpit(ownAircraft, IContextSimulator::InterfaceName()); emit getIContextOwnAircraft()->changedAircraftCockpit(ownAircraft, IContextSimulator::InterfaceName());
} }
void CContextSimulator::onReceivedRequestedElevation(const CElevationPlane &plane, const CCallsign &callsign)
{
if (!this->isSimulatorAvailable()) { return; }
emit this->receivedRequestedElevation(plane, callsign);
}
void CContextSimulator::xCtxChangedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) void CContextSimulator::xCtxChangedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator)
{ {
if (CIdentifiable::isMyIdentifier(originator)) { return; } if (CIdentifiable::isMyIdentifier(originator)) { return; }

8
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -147,11 +147,6 @@ namespace BlackCore
BlackMisc::CSimpleCommandParser::registerCommand({".ris parts on|off", "aircraft parts (global setup)"}); BlackMisc::CSimpleCommandParser::registerCommand({".ris parts on|off", "aircraft parts (global setup)"});
} }
signals:
//! A requested elevation has been received
//! \remark only meant to be used locally, not via DBus
void receivedRequestedElevation(const BlackMisc::Geo::CElevationPlane &plane, const BlackMisc::Aviation::CCallsign &callsign);
protected: protected:
//! Constructor //! Constructor
CContextSimulator(CCoreFacadeConfig::ContextMode, CCoreFacade *runtime); CContextSimulator(CCoreFacadeConfig::ContextMode, CCoreFacade *runtime);
@@ -204,9 +199,6 @@ namespace BlackCore
//! Simulator has changed cockpit //! Simulator has changed cockpit
void onCockpitChangedFromSimulator(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft); void onCockpitChangedFromSimulator(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft);
//! Received elevation
void onReceivedRequestedElevation(const BlackMisc::Geo::CElevationPlane &plane, const BlackMisc::Aviation::CCallsign &callsign);
//! Failed adding remote aircraft //! Failed adding remote aircraft
void addingRemoteAircraftFailed(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, const BlackMisc::CStatusMessage &message); void addingRemoteAircraftFailed(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, const BlackMisc::CStatusMessage &message);

2
src/blackmisc/genericdbusinterface.h
View File

@@ -43,8 +43,10 @@ namespace BlackMisc
//! For each signal in parent, attempt to connect to it an interface signal of the same name. //! For each signal in parent, attempt to connect to it an interface signal of the same name.
//! \see BLACK_NO_RELAY //! \see BLACK_NO_RELAY
//! \deprecated KB 2018-08 this seems to be not used anymore and might be removed
void relayParentSignals() void relayParentSignals()
{ {
Q_ASSERT_X(false, Q_FUNC_INFO, "crosscheck if still used");
const QMetaObject *metaObject = this->parent()->metaObject(); const QMetaObject *metaObject = this->parent()->metaObject();
const QMetaObject *superMetaObject = metaObject; const QMetaObject *superMetaObject = metaObject;
while (strcmp(superMetaObject->superClass()->className(), "QObject") != 0) { superMetaObject = superMetaObject->superClass(); } while (strcmp(superMetaObject->superClass()->className(), "QObject") != 0) { superMetaObject = superMetaObject->superClass(); }