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

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:28:20 UTC 2016


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

The following commit has been merged in the master branch:
commit 807926473d7ae59f2a77544f5bace40aaaed596e
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sat Mar 14 04:07:55 2015 +0100

    Use better types to store the device internal data
    
    https://marcmutz.wordpress.com/effective-qt/containers/
---
 core/device.cpp | 2 +-
 core/device.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index 829f23c..780d9e0 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -99,7 +99,7 @@ QStringList Device::loadedPlugins() const
 
 void Device::reloadPlugins()
 {
-    QMap<QString, KdeConnectPlugin*> newPluginMap;
+    QHash<QString, KdeConnectPlugin*> newPluginMap;
     QMultiMap<QString, KdeConnectPlugin*> newPluginsByIncomingInterface;
     QMultiMap<QString, KdeConnectPlugin*> newPluginsByOutgoingInterface;
 
diff --git a/core/device.h b/core/device.h
index aefb2aa..8383a6d 100644
--- a/core/device.h
+++ b/core/device.h
@@ -23,7 +23,7 @@
 
 #include <QObject>
 #include <QString>
-#include <QMap>
+#include <QVector>
 #include <QSet>
 #include <QSslKey>
 #include <QTimer>
@@ -129,8 +129,8 @@ private:
     PairStatus m_pairStatus;
     int m_protocolVersion;
 
-    QList<DeviceLink*> m_deviceLinks;
-    QMap<QString, KdeConnectPlugin*> m_plugins;
+    QVector<DeviceLink*> m_deviceLinks;
+    QHash<QString, KdeConnectPlugin*> m_plugins;
     QMultiMap<QString, KdeConnectPlugin*> m_pluginsByIncomingInterface;
     QMultiMap<QString, KdeConnectPlugin*> m_pluginsByOutgoingInterface;
 

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list