From 0425ef5c6a6ba8f390297d0da3ebf8c6cc5e1778 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 25 Jan 2014 19:50:27 +0100
Subject: [PATCH] Made BlackMisc::CStatusMessageList value no slot, no DBus XML
 signature shall be created.

A second value method tailored for DBus is the one called for DBus transfer and uses QDBusVariant.
---
 src/blackcore/context_settings.h             |  9 ++++----
 src/blackcore/context_settings_interface.cpp |  3 +--
 src/blackcore/context_settings_interface.h   | 23 ++++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/blackcore/context_settings.h b/src/blackcore/context_settings.h
index cf1170143..952d01318 100644
--- a/src/blackcore/context_settings.h
+++ b/src/blackcore/context_settings.h
@@ -58,16 +58,17 @@ namespace BlackCore
             return static_cast<CCoreRuntime *>(this->parent());
         }
 
+        /*!
+         * \copydoc IContextSettings::value()
+         */
+        virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const QVariant &value);
+
     public slots:
         /*!
          * \copydoc IContextSettings::getNetworkSettings()
          */
         virtual BlackMisc::Settings::CSettingsNetwork getNetworkSettings() const;
 
-        /*!
-         * \copydoc IContextSettings::value()
-         */
-        virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const QVariant &value);
 
     private:
         BlackMisc::Settings::CSettingsNetwork m_settingsNetwork;
diff --git a/src/blackcore/context_settings_interface.cpp b/src/blackcore/context_settings_interface.cpp
index e097efc46..a5f6c8e56 100644
--- a/src/blackcore/context_settings_interface.cpp
+++ b/src/blackcore/context_settings_interface.cpp
@@ -41,7 +41,7 @@ namespace BlackCore
     }
 
     /*
-     * Relay to DBus
+     * Relay to DBus, but make this no slot
      */
     BlackMisc::CStatusMessageList IContextSettings::value(const QString &path, const QString &command, const QVariant &value)
     {
@@ -66,5 +66,4 @@ namespace BlackCore
         return this->value(path, command, qv);
     }
 
-
 } // namespace
diff --git a/src/blackcore/context_settings_interface.h b/src/blackcore/context_settings_interface.h
index c4dd2fd66..d2f9d1e84 100644
--- a/src/blackcore/context_settings_interface.h
+++ b/src/blackcore/context_settings_interface.h
@@ -71,6 +71,19 @@ namespace BlackCore
          */
         ~IContextSettings() {}
 
+
+        /*!
+         * \brief Handle value
+         * \param path      where value belongs to
+         * \param command   what to do with value
+         * \param value
+         * \return          messages generated during handling
+         * \remarks Do not make this a slot, no DBus XML signature shall be created. The QVariant
+         *  will be send a tailored value method using QDBusVariant
+         *  @see value(const QString &, const QString &, QDBusVariant, int)
+         */
+        virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const QVariant &value);
+
     private:
         BlackMisc::CGenericDBusInterface *m_dBusInterface;
 
@@ -86,7 +99,7 @@ namespace BlackCore
          * \brief IContextSettings
          * \param parent
          */
-        IContextSettings(QObject *parent = 0) : QObject(parent), m_dBusInterface(0) {}
+        IContextSettings(QObject *parent = nullptr) : QObject(parent), m_dBusInterface(nullptr) {}
 
     signals:
 
@@ -102,14 +115,6 @@ namespace BlackCore
          */
         virtual BlackMisc::Settings::CSettingsNetwork getNetworkSettings() const;
 
-        /*!
-         * \brief Handle value
-         * \param path      where value belongs to
-         * \param command   what to do with value
-         * \param value
-         * \return          messages generated during handling
-         */
-        virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const QVariant &value);
 
         /*!
          * \brief DBus version of value method.