Refactored inheritance hierarchy of ContextSettings

refs #85
2026-04-01 13:36:48 +08:00 · 2014-03-08 17:00:18 +01:00
parent ac8ade5e05
commit b0d55687bd
9 changed files with 273 additions and 199 deletions
--- a/src/blackcore/context_settings_proxy.cpp
+++ b/src/blackcore/context_settings_proxy.cpp
@@ -0,0 +1,84 @@
+/* Copyright (C) 2013 VATSIM Community / authors
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "context_settings_proxy.h"
+
+#include "blackmisc/blackmiscfreefunctions.h"
+
+#include <QObject>
+#include <QMetaEnum>
+#include <QDBusConnection>
+
+using namespace BlackMisc;
+using namespace BlackMisc::Settings;
+using namespace BlackMisc::Network;
+using namespace BlackMisc::Hardware;
+
+namespace BlackCore
+{
+
+    /*
+     * Constructor for DBus
+     */
+    CContextSettingsProxy::CContextSettingsProxy(const QString &serviceName, QDBusConnection &connection, QObject *parent) : IContextSettings(parent), m_dBusInterface(nullptr)
+    {
+        this->m_dBusInterface = new BlackMisc::CGenericDBusInterface(
+            serviceName , IContextSettings::ObjectPath(), IContextSettings::InterfaceName(),
+            connection, this);
+        this->relaySignals(serviceName, connection);
+    }
+
+    /*
+     * Workaround for signals
+     */
+    void CContextSettingsProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
+    {
+        connection.connect(serviceName, IContextSettings::ObjectPath(), IContextSettings::InterfaceName(),
+                           "changedNetworkSettings", this, SIGNAL(changedNetworkSettings()));
+    }
+
+    /*
+     * Relay to DBus
+     */
+    CSettingsNetwork CContextSettingsProxy::getNetworkSettings() const
+    {
+        return this->m_dBusInterface->callDBusRet<CSettingsNetwork>(QLatin1Literal("getNetworkSettings"));
+    }
+
+    /*
+     * Relay tp DBus
+     */
+    CKeyboardKeyList CContextSettingsProxy::getHotkeys() const
+    {
+        return this->m_dBusInterface->callDBusRet<CKeyboardKeyList>(QLatin1Literal("getHotkeys"));
+    }
+
+    /*
+     * Relay to DBus, but make this no slot
+     */
+    BlackMisc::CStatusMessageList CContextSettingsProxy::value(const QString &path, const QString &command, const QVariant &value)
+    {
+        int type = value.userType() - BlackMisc::firstBlackMetaType();
+        return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessageList>(QLatin1Literal("value"), path, command, QDBusVariant(value), type);
+    }
+
+    /*
+     * DBus version of value
+     */
+    BlackMisc::CStatusMessageList CContextSettingsProxy::value(const QString &path, const QString &command, QDBusVariant value, int unifiedBlackMetaType)
+    {
+        QVariant qv = value.variant();
+        if (qv.canConvert<QDBusArgument>())
+        {
+            // convert from QDBusArgument
+            int type = BlackMisc::firstBlackMetaType() + unifiedBlackMetaType; // unify
+            qv = BlackMisc::fixQVariantFromDbusArgument(qv, type);
+        }
+        // when called locally, this will call the virtual method
+        // of the concrete implementation in context_settings
+        return this->value(path, command, qv);
+    }
+
+} // namespace