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

The following commit has been merged in the master branch:
commit aeefc32c9bac822da035579447390d75e1e6291c
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Sat Apr 12 21:47:28 2014 +0200

    Added some more const declaration.
    
    Conflicts:
    	libkdeconnect/devicesmodel.cpp
    	libkdeconnect/devicesmodel.h
    	libkdeconnect/notificationsmodel.cpp
    	libkdeconnect/notificationsmodel.h
---
 kded/daemon.cpp                      |  2 +-
 kded/daemon.h                        |  2 +-
 libkdeconnect/devicesmodel.cpp       |  2 +-
 libkdeconnect/devicesmodel.h         |  2 +-
 libkdeconnect/notificationsmodel.cpp |  6 +++---
 libkdeconnect/notificationsmodel.h   | 10 +++++-----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kded/daemon.cpp b/kded/daemon.cpp
index fb1c166..ba4571d 100644
--- a/kded/daemon.cpp
+++ b/kded/daemon.cpp
@@ -146,7 +146,7 @@ void Daemon::forceOnNetworkChange()
     }
 }
 
-QStringList Daemon::devices(bool onlyReachable, bool onlyVisible)
+QStringList Daemon::devices(bool onlyReachable, bool onlyVisible) const
 {
     QStringList ret;
     Q_FOREACH(Device* device, mDevices) {
diff --git a/kded/daemon.h b/kded/daemon.h
index 686c393..58c8186 100644
--- a/kded/daemon.h
+++ b/kded/daemon.h
@@ -52,7 +52,7 @@ public Q_SLOTS:
     Q_SCRIPTABLE void forceOnNetworkChange();
 
     //Returns a list of ids. The respective devices can be manipulated using the dbus path: "/modules/kdeconnect/Devices/"+id
-    Q_SCRIPTABLE QStringList devices(bool onlyReachable = false, bool onlyVisible = false);
+    Q_SCRIPTABLE QStringList devices(bool onlyReachable = false, bool onlyVisible = false) const;
 
 Q_SIGNALS:
     Q_SCRIPTABLE void deviceAdded(const QString& id);
diff --git a/libkdeconnect/devicesmodel.cpp b/libkdeconnect/devicesmodel.cpp
index 7b7a749..4e4ae91 100644
--- a/libkdeconnect/devicesmodel.cpp
+++ b/libkdeconnect/devicesmodel.cpp
@@ -173,7 +173,7 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
     }
 }
 
-DeviceDbusInterface* DevicesModel::getDevice(const QModelIndex& index)
+DeviceDbusInterface *DevicesModel::getDevice(const QModelIndex &index) const
 {
     if (!index.isValid()) {
         return NULL;
diff --git a/libkdeconnect/devicesmodel.h b/libkdeconnect/devicesmodel.h
index 07b73e3..3f02251 100644
--- a/libkdeconnect/devicesmodel.h
+++ b/libkdeconnect/devicesmodel.h
@@ -59,7 +59,7 @@ public:
     virtual QVariant data(const QModelIndex &index, int role) const;
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
 
-    DeviceDbusInterface* getDevice(const QModelIndex& index);
+    DeviceDbusInterface *getDevice(const QModelIndex &index) const;
 
 public Q_SLOTS:
     void deviceStatusChanged(const QString& id);
diff --git a/libkdeconnect/notificationsmodel.cpp b/libkdeconnect/notificationsmodel.cpp
index 46dc8ee..f67b2fd 100644
--- a/libkdeconnect/notificationsmodel.cpp
+++ b/libkdeconnect/notificationsmodel.cpp
@@ -57,7 +57,7 @@ NotificationsModel::~NotificationsModel()
 {
 }
 
-QString NotificationsModel::deviceId()
+QString NotificationsModel::deviceId() const
 {
     return m_deviceId;
 }
@@ -161,7 +161,7 @@ QVariant NotificationsModel::data(const QModelIndex &index, int role) const
     }
 }
 
-NotificationDbusInterface* NotificationsModel::getNotification(const QModelIndex& index)
+NotificationDbusInterface *NotificationsModel::getNotification(const QModelIndex &index) const
 {
     if (!index.isValid()) {
         return NULL;
@@ -185,7 +185,7 @@ int NotificationsModel::rowCount(const QModelIndex &parent) const
     return m_notificationList.count();
 }
 
-bool NotificationsModel::isAnyDimissable()
+bool NotificationsModel::isAnyDimissable() const
 {
     Q_FOREACH(NotificationDbusInterface* notification, m_notificationList) {
         if (notification->dismissable()) {
diff --git a/libkdeconnect/notificationsmodel.h b/libkdeconnect/notificationsmodel.h
index a79c063..6a8fca6 100644
--- a/libkdeconnect/notificationsmodel.h
+++ b/libkdeconnect/notificationsmodel.h
@@ -50,17 +50,17 @@ public:
     NotificationsModel(QObject *parent = 0);
     virtual ~NotificationsModel();
 
-    QString deviceId();
+    QString deviceId() const;
     void setDeviceId(const QString& deviceId);
 
-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    virtual QVariant data(const QModelIndex& index, int role) const;
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
-    NotificationDbusInterface* getNotification(const QModelIndex&);
+    NotificationDbusInterface* getNotification(const QModelIndex& index) const;
 
 public Q_SLOTS:
     void dismissAll();
-    bool isAnyDimissable();
+    bool isAnyDimissable() const;
 
 private Q_SLOTS:
     void notificationAdded(const QString& id);

-- 
kdeconnect packaging