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

Issue #77 Break dependency of dbusutils on airport and simulatedaircraftlist

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-28 00:38:25 +01:00
parent 67397c7cdd
commit e848fcd897
2 changed files with 1 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/blackmiscdbus/main.cpp
View File

@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
if (mode.startsWith("2")) if (mode.startsWith("2"))
{ {
out << "---------------------------------" << Qt::endl; out << "---------------------------------" << Qt::endl;
BlackMisc::CDBusUtils::showDBusSignatures(out); //BlackMisc::CDBusUtils::showDBusSignatures(out);
out << "---------------------------------" << Qt::endl; out << "---------------------------------" << Qt::endl;
goto Menu; goto Menu;
} }

50
src/blackmisc/dbusutils.cpp
View File

@@ -7,19 +7,10 @@
*/ */
#include "blackmisc/dbusutils.h" #include "blackmisc/dbusutils.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/aviation/airport.h"
#include <QString> #include <QString>
#include <QStringBuilder> #include <QStringBuilder>
#include <QVariant> #include <QVariant>
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
namespace BlackMisc namespace BlackMisc
{ {
QString CDBusUtils::getQDBusArgumentSignature(const QDBusArgument &arg, int level) QString CDBusUtils::getQDBusArgumentSignature(const QDBusArgument &arg, int level)
@@ -63,45 +54,4 @@ namespace BlackMisc
return QLatin1String("Unknown type"); return QLatin1String("Unknown type");
} }
} }
void CDBusUtils::showDBusSignatures(QTextStream &out)
{
const CCallsign cs;
const CLength l;
const CAircraftIcaoCode icao;
const CAircraftModel model;
const CCountry country;
const CAirportIcaoCode airportIcao;
const CLivery livery;
const CAirport airport;
const CAircraftSituation situation;
const CSimulatedAircraft aircraft;
const CSimulatedAircraftList aircraftList;
const CVariant var;
QString s;
s = CDBusUtils::dBusSignature(cs);
out << "CCallsign" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(l);
out << "CLength" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(icao);
out << "CAircraftIcaoCode" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(airportIcao);
out << "CAirportIcaoCode" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(livery);
out << "CLivery" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(situation);
out << "CAircraftSituation" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(country);
out << "CCountry" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(airport);
out << "CAirport" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(model);
out << "CAircraftModel" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(aircraft);
out << "CSimulatedAircraft" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(aircraftList);
out << "CSimulatedAircraftList" << " size: " << s.size() << " sig: " << s << Qt::endl;
s = CDBusUtils::dBusSignature(var);
out << "CVariant" << " size: " << s.size() << " sig: " << s << Qt::endl;
}
} // ns } // ns