[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=fd65570
The following commit has been merged in the master branch:
commit fd65570487bd79013d87c2ef22d8e39558526642
Author: Albert Vaca <albertvaka at gmail.com>
Date: Sun Jun 21 19:42:16 2015 -0700
Some TODOs done :)
Also renamed the Status flags enum to make it more understandable
---
interfaces/devicesmodel.cpp | 87 ++++++++++++++++++++++++---------------------
interfaces/devicesmodel.h | 22 ++++++------
2 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/interfaces/devicesmodel.cpp b/interfaces/devicesmodel.cpp
index aca3d46..f3a2909 100644
--- a/interfaces/devicesmodel.cpp
+++ b/interfaces/devicesmodel.cpp
@@ -23,7 +23,6 @@
#include <KLocalizedString>
-#include <QDebug>
#include <QString>
#include <QDBusInterface>
#include <QDBusPendingReply>
@@ -37,7 +36,7 @@ Q_LOGGING_CATEGORY(KDECONNECT_INTERFACES, "kdeconnect.interfaces");
DevicesModel::DevicesModel(QObject *parent)
: QAbstractListModel(parent)
, m_dbusInterface(new DaemonDbusInterface(this))
- , m_displayFilter(DevicesModel::StatusUnknown)
+ , m_displayFilter(StatusFilterFlag::NoFilter)
{
//new ModelTest(this, this);
@@ -71,47 +70,49 @@ DevicesModel::~DevicesModel()
{
}
-int DevicesModel::rowForDeviceId(const QString& id) const
+void DevicesModel::deviceAdded(const QString& id)
{
- QVector<DeviceDbusInterface*>::const_iterator it = m_deviceList.constBegin(), itEnd = m_deviceList.constEnd();
- for (int i = 0; it!=itEnd; ++it, ++i) {
- if ((*it)->id() == id) {
- return i;
- }
+ if (m_deviceIndexById.contains(id)) {
+ Q_ASSERT(false); //This should only happen for new devices
+ return;
}
- return -1;
-}
-void DevicesModel::deviceAdded(const QString& id)
-{
- //Find whether the device already exists. if so, just report it as modified
- int row = rowForDeviceId(id);
- if (row>=0) {
- const QModelIndex idx = index(row, 0);
- Q_EMIT dataChanged(idx, idx);
- } else {
- DeviceDbusInterface* dev = new DeviceDbusInterface(id, this);
- if (dev->isReachable() == bool(m_displayFilter & StatusReachable) && dev->isPaired() == bool(m_displayFilter & StatusPaired)) {
- beginInsertRows(QModelIndex(), m_deviceList.count(), m_deviceList.count());
- appendDevice(dev);
- endInsertRows();
- }
+ DeviceDbusInterface* dev = new DeviceDbusInterface(id, this);
+
+ bool onlyPaired = (m_displayFilter & StatusFilterFlag::Paired);
+ bool onlyReachable = (m_displayFilter & StatusFilterFlag::Reachable);
+
+ if ((onlyReachable && !dev->isReachable()) || (onlyPaired && !dev->isPaired())) {
+ return;
}
+
+ beginInsertRows(QModelIndex(), m_deviceList.size(), m_deviceList.size());
+ appendDevice(dev);
+ endInsertRows();
}
void DevicesModel::deviceRemoved(const QString& id)
{
- //TODO: Actually remove instead of refresh
- Q_UNUSED(id);
- refreshDeviceList();
+ if (!m_deviceIndexById.contains(id)) {
+ Q_ASSERT(false); //This should only be emited for existing devices
+ return;
+ }
+ const int row = m_deviceIndexById.take(id);
+ beginRemoveRows(QModelIndex(), row, row);
+ delete m_deviceList.takeAt(row);
+ endRemoveRows();
}
void DevicesModel::deviceStatusChanged(const QString& id)
{
- Q_UNUSED(id);
- //FIXME: Emitting dataChanged does not invalidate the view, refreshDeviceList does.
- //Q_EMIT dataChanged(index(0),index(rowCount()));
- refreshDeviceList();
+ if (!m_deviceIndexById.contains(id)) {
+ Q_ASSERT(false); //This should only be emited for existing devices
+ return;
+ }
+
+ int row = m_deviceIndexById[id];
+ const QModelIndex idx = index(row);
+ Q_EMIT dataChanged(idx, idx);
}
int DevicesModel::displayFilter() const
@@ -121,7 +122,7 @@ int DevicesModel::displayFilter() const
void DevicesModel::setDisplayFilter(int flags)
{
- m_displayFilter = (StatusFlag)flags;
+ m_displayFilter = (StatusFilterFlag)flags;
refreshDeviceList();
}
@@ -133,8 +134,8 @@ void DevicesModel::refreshDeviceList()
return;
}
- bool onlyPaired = (m_displayFilter & StatusPaired);
- bool onlyReachable = (m_displayFilter & StatusReachable);
+ bool onlyPaired = (m_displayFilter & StatusFilterFlag::Paired);
+ bool onlyReachable = (m_displayFilter & StatusFilterFlag::Reachable);
QDBusPendingReply<QStringList> pendingDeviceIds = m_dbusInterface->devices(onlyReachable, onlyPaired);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingDeviceIds, this);
@@ -154,6 +155,7 @@ void DevicesModel::receivedDeviceList(QDBusPendingCallWatcher* watcher)
}
Q_ASSERT(m_deviceList.isEmpty());
+ Q_ASSERT(m_deviceIndexById.isEmpty());
const QStringList deviceIds = pendingDeviceIds.value();
if (deviceIds.isEmpty())
@@ -168,6 +170,7 @@ void DevicesModel::receivedDeviceList(QDBusPendingCallWatcher* watcher)
void DevicesModel::appendDevice(DeviceDbusInterface* dev)
{
+ m_deviceIndexById.insert(dev->id(), m_deviceList.size());
m_deviceList.append(dev);
connect(dev, SIGNAL(nameChanged(QString)), SLOT(nameChanged(QString)));
}
@@ -175,9 +178,12 @@ void DevicesModel::appendDevice(DeviceDbusInterface* dev)
void DevicesModel::nameChanged(const QString& newName)
{
Q_UNUSED(newName);
- int row = m_deviceList.indexOf(static_cast<DeviceDbusInterface*>(sender()));
- Q_ASSERT(row>=0);
- const QModelIndex idx = index(row, 0);
+
+ DeviceDbusInterface* device = static_cast<DeviceDbusInterface*>(sender());
+
+ int row = m_deviceIndexById[device->id()];
+ Q_ASSERT(row >= 0);
+ const QModelIndex idx = index(row);
Q_EMIT dataChanged(idx, idx);
}
@@ -187,6 +193,7 @@ void DevicesModel::clearDevices()
beginRemoveRows(QModelIndex(), 0, m_deviceList.size() - 1);
qDeleteAll(m_deviceList);
m_deviceList.clear();
+ m_deviceIndexById.clear();
endRemoveRows();
}
}
@@ -221,10 +228,10 @@ QVariant DevicesModel::data(const QModelIndex& index, int role) const
return status;
}
case StatusModelRole: {
- int status = StatusUnknown;
+ int status = StatusFilterFlag::NoFilter;
if (device->isReachable()) {
- status |= StatusReachable;
- if (device->isPaired()) status |= StatusPaired;
+ status |= StatusFilterFlag::Reachable;
+ if (device->isPaired()) status |= StatusFilterFlag::Paired;
}
return status;
}
diff --git a/interfaces/devicesmodel.h b/interfaces/devicesmodel.h
index d86a35c..a5d0bff 100644
--- a/interfaces/devicesmodel.h
+++ b/interfaces/devicesmodel.h
@@ -48,14 +48,14 @@ public:
DeviceRole
};
Q_ENUMS(ModelRoles);
- enum StatusFlag {
- StatusUnknown = 0x00,
- StatusPaired = 0x01,
- StatusReachable = 0x02
+ enum StatusFilterFlag {
+ NoFilter = 0x00,
+ Paired = 0x01,
+ Reachable = 0x02
};
- Q_DECLARE_FLAGS(StatusFlags, StatusFlag)
- Q_FLAGS(StatusFlags)
- Q_ENUMS(StatusFlag)
+ Q_DECLARE_FLAGS(StatusFilterFlags, StatusFilterFlag)
+ Q_FLAGS(StatusFilterFlags)
+ Q_ENUMS(StatusFilterFlag)
DevicesModel(QObject *parent = 0);
virtual ~DevicesModel();
@@ -84,14 +84,14 @@ Q_SIGNALS:
private:
void clearDevices();
- int rowForDeviceId(const QString& id) const;
void appendDevice(DeviceDbusInterface* dev);
DaemonDbusInterface* m_dbusInterface;
- QVector<DeviceDbusInterface*> m_deviceList;
- StatusFlags m_displayFilter;
+ QList<DeviceDbusInterface*> m_deviceList;
+ QMap<QString, int> m_deviceIndexById;
+ StatusFilterFlag m_displayFilter;
};
-//Q_DECLARE_OPERATORS_FOR_FLAGS(DevicesModel::StatusFlags)
+//Q_DECLARE_OPERATORS_FOR_FLAGS(DevicesModel::StatusFilterFlag)
#endif // DEVICESMODEL_H
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list