From ce9e29f0e80d863d4756cff9d173f48134e9682d Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Thu, 21 Feb 2019 21:57:57 +0100 Subject: [PATCH] Remove colour in dbus call for addTextMessage for FG --- .../flightgear/fgswiftbusserviceproxy.cpp | 4 ++-- .../flightgear/fgswiftbusserviceproxy.h | 2 +- .../flightgear/simulatorflightgear.cpp | 19 ++----------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp index c3d17c30c..06c3a3295 100644 --- a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp @@ -67,9 +67,9 @@ namespace BlackSimPlugin m_dbusInterface->callDBusAsync(QLatin1String("getOwnAircraftSituationData"), callback); } - void CXSwiftBusServiceProxy::addTextMessage(const QString &text, double red, double green, double blue) + void CXSwiftBusServiceProxy::addTextMessage(const QString &text) { - m_dbusInterface->callDBus(QLatin1String("addTextMessage"), text, red, green, blue); + m_dbusInterface->callDBus(QLatin1String("addTextMessage"), text); } void CXSwiftBusServiceProxy::updateAirportsInRange() diff --git a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h index 88f1eac40..58fd4b7ed 100644 --- a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h +++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h @@ -105,7 +105,7 @@ namespace BlackSimPlugin void getOwnAircraftSituationData(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData); //! \copydoc XSwiftBus::CService::addTextMessage - void addTextMessage(const QString &text, double red, double green, double blue); + void addTextMessage(const QString &text); //! \copydoc XSwiftBus::CService::updateAirportsInRange void updateAirportsInRange(); diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index b4fb9b779..65f79ecf7 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -420,16 +420,7 @@ namespace BlackSimPlugin if (isInFunction) { return; } isInFunction = true; - QColor color = "cyan"; - /* switch (message.getSeverity()) - { - case CStatusMessage::SeverityDebug: color = "teal"; break; - case CStatusMessage::SeverityInfo: color = "cyan"; break; - case CStatusMessage::SeverityWarning: color = "orange"; break; - case CStatusMessage::SeverityError: color = "red"; break; - } */ - - m_serviceProxy->addTextMessage("swift: " + message.getMessage(), color.redF(), color.greenF(), color.blueF()); + m_serviceProxy->addTextMessage("swift: " + message.getMessage()); isInFunction = false; } @@ -437,13 +428,7 @@ namespace BlackSimPlugin { Q_ASSERT(isConnected()); - QColor color; - if (message.isServerMessage()) { color = "orchid"; } - else if (message.isSupervisorMessage()) { color = "yellow"; } - else if (message.isPrivateMessage()) { color = "magenta"; } - else { color = "lime"; } - - m_serviceProxy->addTextMessage(message.getSenderCallsign().toQString() + ": " + message.getMessage(), color.redF(), color.greenF(), color.blueF()); + m_serviceProxy->addTextMessage(message.getSenderCallsign().toQString() + ": " + message.getMessage()); } void CSimulatorXPlane::setAirportsInRange(const QStringList &icaos, const QStringList &names, const CSequence &lats, const CSequence &lons, const CSequence &alts)