From 62109ac7f38974df13dd4c1626bf2dcf2f10b5d8 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 8 Apr 2014 14:37:00 +0200 Subject: [PATCH] refs #199 , removed statusMessage sending and log from all contexts but application context Goal: Single place to send status messages and log -> application context --- src/blackcore/context_audio_proxy.cpp | 17 ----------------- src/blackcore/context_audio_proxy.h | 10 ---------- src/blackcore/context_network.h | 7 ------- 3 files changed, 34 deletions(-) diff --git a/src/blackcore/context_audio_proxy.cpp b/src/blackcore/context_audio_proxy.cpp index db7ea9884..94f365c8c 100644 --- a/src/blackcore/context_audio_proxy.cpp +++ b/src/blackcore/context_audio_proxy.cpp @@ -209,21 +209,4 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("isMuted")); } - /* - * Logging - */ - void CContextAudioProxy::log(const QString &method, const QString &m1, const QString &m2, const QString &m3, const QString &m4) const - { - if (m1.isEmpty()) - qDebug() << " LOG: " << method; - else if (m2.isEmpty()) - qDebug() << " LOG: " << method << m1; - else if (m3.isEmpty()) - qDebug() << " LOG: " << method << m1 << m2; - else if (m4.isEmpty()) - qDebug() << " LOG: " << method << m1 << m2 << m3; - else - qDebug() << " LOG: " << method << m1 << m2 << m3 << m4; - } - } // namespace diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index 734fe145a..38521f83d 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -43,16 +43,6 @@ namespace BlackCore //! DBus version constructor CContextAudioProxy(const QString &serviceName, QDBusConnection &connection, CRuntimeConfig::ContextMode mode, CRuntime *runtime); - /*! - * \brief Helper for logging, likely to be removed / changed - * \param method - * \param m1 - * \param m2 - * \param m3 - * \param m4 - */ - void log(const QString &method, const QString &m1 = "", const QString &m2 = "", const QString &m3 = "", const QString &m4 = "") const; - public slots: //! \copydoc IContextAudio::setOwnAircraft() diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index c0321ab02..c1b2af6ad 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -46,13 +46,6 @@ namespace BlackCore virtual ~IContextNetwork() {} signals: - - //! Send status message - void statusMessage(const BlackMisc::CStatusMessage &message); - - //! Send status messages - void statusMessages(const BlackMisc::CStatusMessageList &messages); - //! ATC station (online) list has been changed void changedAtcStationsOnline();