[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=6a379e9

The following commit has been merged in the master branch:
commit 6a379e922780ec9c9f08cf360c3ad261d426a276
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Sep 8 17:38:33 2015 +0200

    Rename missingPlugins to unsupportedPlugins
---
 core/device.cpp          | 6 +++---
 core/device.h            | 6 +++---
 kcm/kcm.cpp              | 2 +-
 tests/pluginloadtest.cpp | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index 0957b99..2592322 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -110,7 +110,7 @@ void Device::reloadPlugins()
     QMultiMap<QString, KdeConnectPlugin*> newPluginsByIncomingInterface;
     QMultiMap<QString, KdeConnectPlugin*> newPluginsByOutgoingInterface;
     QSet<QString> supportedIncomingInterfaces;
-    QStringList missingPlugins;
+    QStringList unsupportedPlugins;
 
     if (isPaired() && isReachable()) { //Do not load any plugin for unpaired devices, nor useless loading them for unreachable devices
 
@@ -139,7 +139,7 @@ void Device::reloadPlugins()
                 ) {
                     qCWarning(KDECONNECT_CORE) << "not loading " << pluginName << "because of unmatched capabilities";
                     delete plugin;
-                    missingPlugins.append(pluginName);
+                    unsupportedPlugins.append(pluginName);
                     continue;
                 }
 
@@ -168,7 +168,7 @@ void Device::reloadPlugins()
     m_pluginsByOutgoingInterface = newPluginsByOutgoingInterface;
     m_supportedIncomingInterfaces = newSupportedIncomingInterfaces;
     m_pluginsByIncomingInterface = newPluginsByIncomingInterface;
-    m_missingPlugins = missingPlugins;
+    m_unsupportedPlugins = unsupportedPlugins;
 
     Q_FOREACH(KdeConnectPlugin* plugin, m_plugins) {
         plugin->connected();
diff --git a/core/device.h b/core/device.h
index 6814c4a..1291eae 100644
--- a/core/device.h
+++ b/core/device.h
@@ -45,7 +45,7 @@ class KDECONNECTCORE_EXPORT Device
     Q_PROPERTY(QString statusIconName READ statusIconName)
     Q_PROPERTY(bool isReachable READ isReachable NOTIFY reachableStatusChanged)
     Q_PROPERTY(bool isPaired READ isPaired NOTIFY pairingChanged)
-    Q_PROPERTY(QStringList missingPlugins READ missingPlugins NOTIFY pluginsChanged)
+    Q_PROPERTY(QStringList unsupportedPlugins READ unsupportedPlugins NOTIFY pluginsChanged)
 
     enum PairStatus {
         NotPaired,
@@ -87,7 +87,7 @@ public:
     QString type() const { return type2str(m_deviceType); };
     QString iconName() const;
     QString statusIconName() const;
-    QStringList missingPlugins() const { return m_missingPlugins; }
+    QStringList unsupportedPlugins() const { return m_unsupportedPlugins; }
 
     //Add and remove links
     void addLink(const NetworkPackage& identityPackage, DeviceLink*);
@@ -159,7 +159,7 @@ private: //Fields (TODO: dPointer!)
     QSet<QString> m_incomingCapabilities;
     QSet<QString> m_outgoingCapabilities;
     QStringList m_supportedIncomingInterfaces;
-    QStringList m_missingPlugins;
+    QStringList m_unsupportedPlugins;
 };
 
 Q_DECLARE_METATYPE(Device*)
diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index c020299..f457e05 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -218,7 +218,7 @@ void KdeConnectKcm::deviceSelected(const QModelIndex& current)
     QList<KPluginInfo> pluginInfo = KPluginInfo::fromMetaData(KPluginLoader::findPlugins("kdeconnect/"));
     QList<KPluginInfo> missingPluginInfo;
 
-    QStringList missingPluginNames = currentDevice->missingPlugins();
+    QStringList missingPluginNames = currentDevice->unsupportedPlugins();
     for (auto it = pluginInfo.begin(), itEnd = pluginInfo.end(); it!=itEnd; ) {
         if (missingPluginNames.contains(it->pluginName())) {
             missingPluginInfo.append(*it);
diff --git a/tests/pluginloadtest.cpp b/tests/pluginloadtest.cpp
index 4b175a2..0077670 100644
--- a/tests/pluginloadtest.cpp
+++ b/tests/pluginloadtest.cpp
@@ -81,11 +81,11 @@ class PluginLoadTest : public QObject
 
             d->setPluginEnabled("kdeconnect_mousepad", false);
             QCOMPARE(d->isPluginEnabled("kdeconnect_mousepad"), false);
-            QVERIFY(d->missingPlugins().contains("kdeconnect_remotecontrol"));
+            QVERIFY(d->unsupportedPlugins().contains("kdeconnect_remotecontrol"));
 
             d->setPluginEnabled("kdeconnect_mousepad", true);
             QCOMPARE(d->isPluginEnabled("kdeconnect_mousepad"), true);
-            QVERIFY(!d->missingPlugins().contains("kdeconnect_remotecontrol"));
+            QVERIFY(!d->unsupportedPlugins().contains("kdeconnect_remotecontrol"));
         }
 
     private:

-- 
kdeconnect packaging