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

The following commit has been merged in the master branch:
commit baa0e5ff951553889025f8329028a0fbf1b055f8
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sat Apr 5 20:04:59 2014 +0200

    Made some methods const
---
 kded/filetransferjob.h                      |  1 +
 kded/plugins/battery/batterydbusinterface.h |  4 ++--
 kded/plugins/notifications/notification.h   | 10 +++++-----
 kded/plugins/sftp/mounter.h                 |  2 +-
 kded/plugins/sftp/sftpplugin.cpp            |  2 +-
 kded/plugins/sftp/sftpplugin.h              |  2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kded/filetransferjob.h b/kded/filetransferjob.h
index 2378fc3..0969dce 100644
--- a/kded/filetransferjob.h
+++ b/kded/filetransferjob.h
@@ -52,6 +52,7 @@ public Q_SLOTS:
 
 protected:
     virtual bool doKill();
+
 private:
     void startTransfer();
     QSharedPointer<QIODevice> mOrigin;
diff --git a/kded/plugins/battery/batterydbusinterface.h b/kded/plugins/battery/batterydbusinterface.h
index d9f412e..2fef9f6 100644
--- a/kded/plugins/battery/batterydbusinterface.h
+++ b/kded/plugins/battery/batterydbusinterface.h
@@ -33,8 +33,8 @@ public:
     explicit BatteryDbusInterface(QObject *parent);
     virtual ~BatteryDbusInterface();
     
-    Q_SCRIPTABLE int charge() { return mCharge; }
-    Q_SCRIPTABLE bool isCharging() { return mIsCharging; }
+    Q_SCRIPTABLE int charge() const { return mCharge; }
+    Q_SCRIPTABLE bool isCharging() const { return mIsCharging; }
 
     void updateValues(bool isCharging, int currentCharge);
 
diff --git a/kded/plugins/notifications/notification.h b/kded/plugins/notifications/notification.h
index a97d487..1ce5345 100644
--- a/kded/plugins/notifications/notification.h
+++ b/kded/plugins/notifications/notification.h
@@ -41,11 +41,11 @@ public:
     Notification(const NetworkPackage& np, const QString& iconPath, QObject* parent);
     virtual ~Notification();
 
-    QString internalId() { return mId; }
-    QString appName() { return mAppName; }
-    QString ticker() { return mTicker; }
-    QString iconPath() { return mIconPath; }
-    bool dismissable() { return mDismissable; }
+    QString internalId() const { return mId; }
+    QString appName() const { return mAppName; }
+    QString ticker() const { return mTicker; }
+    QString iconPath() const { return mIconPath; }
+    bool dismissable() const { return mDismissable; }
 
 public Q_SLOTS:
     Q_SCRIPTABLE void dismiss();
diff --git a/kded/plugins/sftp/mounter.h b/kded/plugins/sftp/mounter.h
index 5e0d092..91b6bad 100644
--- a/kded/plugins/sftp/mounter.h
+++ b/kded/plugins/sftp/mounter.h
@@ -37,7 +37,7 @@ public:
     virtual ~Mounter();
     
     bool wait();
-    bool isMounted() const {return m_started;}
+    bool isMounted() const { return m_started; }
     
 Q_SIGNALS:
     void mounted();
diff --git a/kded/plugins/sftp/sftpplugin.cpp b/kded/plugins/sftp/sftpplugin.cpp
index 7fb7514..e64e2fa 100644
--- a/kded/plugins/sftp/sftpplugin.cpp
+++ b/kded/plugins/sftp/sftpplugin.cpp
@@ -123,7 +123,7 @@ bool SftpPlugin::mountAndWait()
     return m_d->mounter->wait();
 }
 
-bool SftpPlugin::isMounted()
+bool SftpPlugin::isMounted() const
 {
     return m_d->mounter && m_d->mounter->isMounted();
 }
diff --git a/kded/plugins/sftp/sftpplugin.h b/kded/plugins/sftp/sftpplugin.h
index c590301..24b5560 100644
--- a/kded/plugins/sftp/sftpplugin.h
+++ b/kded/plugins/sftp/sftpplugin.h
@@ -56,7 +56,7 @@ public Q_SLOTS:
     Q_SCRIPTABLE void mount();
     Q_SCRIPTABLE void unmount();
     Q_SCRIPTABLE bool mountAndWait();
-    Q_SCRIPTABLE bool isMounted();
+    Q_SCRIPTABLE bool isMounted() const;
     
     Q_SCRIPTABLE bool startBrowsing();
     Q_SCRIPTABLE QString mountPoint();

-- 
kdeconnect packaging