[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=f1f3f48

The following commit has been merged in the master branch:
commit f1f3f48aaf21bb8d444de23b756fa43c1ebbcfed
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Sep 12 22:03:39 2015 +0200

    Export pairStatus
---
 core/device.cpp | 5 +++++
 core/device.h   | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index 75bbcde..816b37a 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -560,6 +560,11 @@ void Device::setName(const QString &name)
     }
 }
 
+Device::PairStatus Device::pairStatus() const
+{
+    return m_pairStatus;
+}
+
 KdeConnectPlugin* Device::plugin(const QString& pluginName) const
 {
     return m_plugins[pluginName];
diff --git a/core/device.h b/core/device.h
index 908333a..e692c44 100644
--- a/core/device.h
+++ b/core/device.h
@@ -48,6 +48,7 @@ class KDECONNECTCORE_EXPORT Device
     Q_PROPERTY(bool isPaired READ isPaired NOTIFY pairingChanged)
     Q_PROPERTY(QStringList unsupportedPlugins READ unsupportedPlugins NOTIFY pluginsChanged)
 
+public:
     enum PairStatus {
         NotPaired,
         Requested,
@@ -62,10 +63,7 @@ class KDECONNECTCORE_EXPORT Device
         Phone,
         Tablet,
     };
-    static DeviceType str2type(const QString &deviceType);
-    static QString type2str(DeviceType deviceType);
 
-public:
     /**
      * Restores the @p device from the saved configuration
      *
@@ -109,6 +107,8 @@ public:
     void setPluginEnabled(const QString& pluginName, bool enabled);
     bool isPluginEnabled(const QString& pluginName) const;
 
+    PairStatus pairStatus() const;
+
     DeviceLink::ConnectionStarted connectionSource() const;
 
 public Q_SLOTS:
@@ -139,6 +139,9 @@ Q_SIGNALS:
     QT_DEPRECATED Q_SCRIPTABLE void unpaired();
 
 private: //Methods
+    static DeviceType str2type(const QString &deviceType);
+    static QString type2str(DeviceType deviceType);
+
     void setName(const QString &name);
     QString iconForStatus(bool reachable, bool paired) const;
     void unpairInternal();

-- 
kdeconnect packaging