From 5991981789f0bdcfc6e2d3cb73165955171ba4dd Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Tue, 14 Oct 2014 00:11:33 +0100 Subject: [PATCH] refs #336 Removed the old getMessageCategory methods. --- src/blackcore/airspace_watchdog.h | 3 --- src/blackcore/context_application.h | 3 --- src/blackcore/context_audio.h | 3 --- src/blackcore/context_network.h | 3 --- src/blackcore/context_ownaircraft.h | 3 --- src/blackcore/context_runtime.h | 3 --- src/blackcore/context_settings.h | 3 --- src/blackcore/context_simulator.h | 3 --- src/blackcore/network.h | 5 ----- src/blackcore/simulator.h | 3 --- src/blackcore/voice.h | 3 --- src/blackcore/voice_channel.h | 3 --- src/blackgui/components/settingsfsxcomponent.h | 3 --- src/blackgui/components/textmessagecomponent.h | 3 --- src/blackmisc/nwtextmessage.h | 3 --- src/blackmisc/settingutilities.h | 10 ---------- 16 files changed, 57 deletions(-) diff --git a/src/blackcore/airspace_watchdog.h b/src/blackcore/airspace_watchdog.h index 0f127cd6c..96dd03caf 100644 --- a/src/blackcore/airspace_watchdog.h +++ b/src/blackcore/airspace_watchdog.h @@ -41,9 +41,6 @@ namespace BlackCore //! Constructor CAirspaceWatchdog(const BlackMisc::PhysicalQuantities::CTime & initialTimeOut, QObject *parent); - //! Log message category - static QString getMessageCategory() { return "swift.airspacewatchdog"; } - //! Sets the maximum time, after a client is considered timed out void setTimeout(const BlackMisc::PhysicalQuantities::CTime &value) { m_timeout = value; } diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h index b53ef1edd..84461926a 100644 --- a/src/blackcore/context_application.h +++ b/src/blackcore/context_application.h @@ -57,9 +57,6 @@ namespace BlackCore ActionStops }; - //! Log message category - static QString getMessageCategory() { return "swift.context.application"; } - //! Service name static const QString &InterfaceName() { diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index 7acacbb78..8b9ada420 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -43,9 +43,6 @@ namespace BlackCore IContextAudio(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : CContext(mode, runtime) {} public: - //! Log message category - static QString getMessageCategory() { return "swift.context.audio"; } - //! \brief Interface name static const QString &InterfaceName() { diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index d417d5f9d..ca8c5251c 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -43,9 +43,6 @@ namespace BlackCore Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTNETWORK_INTERFACENAME) public: - //! Log message category - static QString getMessageCategory() { return "swift.context.network"; } - //! DBus interface name static const QString &InterfaceName() { diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/context_ownaircraft.h index 6bec21228..371bdaa72 100644 --- a/src/blackcore/context_ownaircraft.h +++ b/src/blackcore/context_ownaircraft.h @@ -34,9 +34,6 @@ namespace BlackCore Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME) public: - //! Log message category - static QString getMessageCategory() { return "swift.context.ownaircraft"; } - //! DBus interface name static const QString &InterfaceName() { diff --git a/src/blackcore/context_runtime.h b/src/blackcore/context_runtime.h index 03eb5cf41..9f143068a 100644 --- a/src/blackcore/context_runtime.h +++ b/src/blackcore/context_runtime.h @@ -45,9 +45,6 @@ namespace BlackCore Q_OBJECT public: - //! Log message category - static QString getMessageCategory() { return "swift.runtime"; } - //! Constructor CRuntime(const CRuntimeConfig &config, QObject *parent = nullptr); diff --git a/src/blackcore/context_settings.h b/src/blackcore/context_settings.h index 72fc474b0..74b5deab6 100644 --- a/src/blackcore/context_settings.h +++ b/src/blackcore/context_settings.h @@ -56,9 +56,6 @@ namespace BlackCore {} public: - //! Log message category - static QString getMessageCategory() { return "swift.context.settings"; } - //! Service name static const QString &InterfaceName() { diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h index d9890565b..0efd2ed67 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/context_simulator.h @@ -39,9 +39,6 @@ namespace BlackCore Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME) public: - //! Log message category - static QString getMessageCategory() { return "swift.context.simulator"; } - //! Service name static const QString &InterfaceName() { diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 2b64138a9..7084ea00d 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -64,11 +64,6 @@ namespace BlackCore */ virtual ~INetwork() {} - /*! - * Log message category. - */ - static QString getMessageCategory() { return "swift.trafficNetwork"; } - /*! * Flags for capabilities bitfield. */ diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 10f8d04c8..9d0066d96 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -25,9 +25,6 @@ namespace BlackCore Q_ENUMS(Status) public: - //! Log message category - static QString getMessageCategory() { return "swift.simulator"; } - //! ISimulator connection enum Status { diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index 503ae0eaa..a98e22e23 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -50,9 +50,6 @@ namespace BlackCore IVoice(QObject *parent = nullptr); public: - //! Log message category - static QString getMessageCategory() { return "swift.voice"; } - //! Virtual destructor. virtual ~IVoice() {} diff --git a/src/blackcore/voice_channel.h b/src/blackcore/voice_channel.h index 1f5179a72..3cdaaddcf 100644 --- a/src/blackcore/voice_channel.h +++ b/src/blackcore/voice_channel.h @@ -27,9 +27,6 @@ namespace BlackCore Q_OBJECT public: - //! Log message category - static QString getMessageCategory() { return "swift.voice.channel"; } - //! Com status enum ConnectionStatus { diff --git a/src/blackgui/components/settingsfsxcomponent.h b/src/blackgui/components/settingsfsxcomponent.h index 181348815..32dd78a34 100644 --- a/src/blackgui/components/settingsfsxcomponent.h +++ b/src/blackgui/components/settingsfsxcomponent.h @@ -33,9 +33,6 @@ namespace BlackGui //! Destructor ~CSettingsFsxComponent(); - //! Log message category - static QString getMessageCategory() { return "swift.gui.component.settings.simulator.fsx"; } - private slots: //! Test the SIM connect connectivity void testSimConnectConnection(); diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index 3bb138481..3ac2ae2a1 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -47,9 +47,6 @@ namespace BlackGui //! Destructor ~CTextMessageComponent(); - //! Log message category - static QString getMessageCategory() { return "swift.gui.component.textMessages"; } - //! SELCAL callback, SELCAL is obtained by that void setSelcalCallback(const std::function &selcalCallback) { this->m_selcalCallback = selcalCallback; } diff --git a/src/blackmisc/nwtextmessage.h b/src/blackmisc/nwtextmessage.h index 395ac7bf1..e2545b5c5 100644 --- a/src/blackmisc/nwtextmessage.h +++ b/src/blackmisc/nwtextmessage.h @@ -42,9 +42,6 @@ namespace BlackMisc CTextMessage(const QString &message, const BlackMisc::Aviation::CCallsign &senderCallsign, const BlackMisc::Aviation::CCallsign &recipientCallsign = BlackMisc::Aviation::CCallsign()) : m_message(message), m_received(QDateTime::currentDateTimeUtc()), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, BlackMisc::PhysicalQuantities::CFrequencyUnit::nullUnit()) {} - //! Logging category - static QString getMessageCategory() { return "swift.textMessage"; } - //! \brief Get callsign (from) const BlackMisc::Aviation::CCallsign &getSenderCallsign() const { diff --git a/src/blackmisc/settingutilities.h b/src/blackmisc/settingutilities.h index 19b02519b..3c658a185 100644 --- a/src/blackmisc/settingutilities.h +++ b/src/blackmisc/settingutilities.h @@ -25,16 +25,6 @@ namespace BlackMisc CSettingUtilities() {} public: - - //! Log message category for anything related to settings - static QString getMessageCategory() { return "swift.settings"; } - - //! Log message category for settings validation messages - static QString validationMessageCategory() { return "swift.settings.validation"; } - - //! Log message category for settings update messages - static QString updateMessageCategory() { return "swift.settings.update"; } - //! Command validate static const QString &CmdValidate() {