mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-30 11:55:35 +08:00
The meta type based status to string conversion did not work,
as the metatype for the interface cannot be registered. Changed to a simple static method, as it will be replaced by I18N anyway sooner or later.
This commit is contained in:
@@ -64,11 +64,20 @@ namespace BlackCore
|
|||||||
Connected
|
Connected
|
||||||
};
|
};
|
||||||
|
|
||||||
QString connectionStatusToString(ConnectionStatus status) const
|
static const QString connectionStatusToString(ConnectionStatus status)
|
||||||
{
|
{
|
||||||
int index = metaObject()->indexOfEnumerator("ConnectionStatus");
|
// the version with metaObject, metaObject()->indexOfEnumerator does not work anymore
|
||||||
QMetaEnum metaEnum = metaObject()->enumerator(index);
|
// an interface cannot be used with Q_DECLAREMETATYPE
|
||||||
return metaEnum.valueToKey(status);
|
switch (status)
|
||||||
|
{
|
||||||
|
case Disconnected: return "disconnected";
|
||||||
|
case DisconnectedError: return "disconnectedError";
|
||||||
|
case Connecting: return "connecting";
|
||||||
|
case Connected: return "connected";
|
||||||
|
default: break;
|
||||||
|
}
|
||||||
|
qFatal("Missing value");
|
||||||
|
return ""; // just for compiler warning
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool isConnected() const = 0;
|
virtual bool isConnected() const = 0;
|
||||||
@@ -101,7 +110,7 @@ namespace BlackCore
|
|||||||
virtual void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) = 0;
|
virtual void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) = 0;
|
||||||
virtual void setOwnAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) = 0;
|
virtual void setOwnAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) = 0;
|
||||||
virtual void setOwnAircraftAvionics(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2,
|
virtual void setOwnAircraftAvionics(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2,
|
||||||
const BlackMisc::Aviation::CTransponder &xpdr) = 0;
|
const BlackMisc::Aviation::CTransponder &transponder) = 0;
|
||||||
|
|
||||||
// Weather / flight plan
|
// Weather / flight plan
|
||||||
virtual void requestMetar(const QString &airportICAO) = 0;
|
virtual void requestMetar(const QString &airportICAO) = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user