[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=031f769

The following commit has been merged in the master branch:
commit 031f769ff62ef9006011ec06820f382b09cc17b8
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Aug 13 06:09:14 2013 +0200

    Migrated PauseMusic to new plugin format
---
 daemon/plugins/CMakeLists.txt                       |  1 +
 ...sicpackageinterface.cpp => pausemusicplugin.cpp} | 12 ++++++++----
 ...semusicpackageinterface.h => pausemusicplugin.h} | 21 +++++++++++++--------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/daemon/plugins/CMakeLists.txt b/daemon/plugins/CMakeLists.txt
index a6e89f6..494973a 100644
--- a/daemon/plugins/CMakeLists.txt
+++ b/daemon/plugins/CMakeLists.txt
@@ -2,4 +2,5 @@
 install(FILES kdeconnect_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 add_subdirectory(ping)
+add_subdirectory(pausemusic)
 
diff --git a/daemon/plugins/pausemusic/pausemusicpackageinterface.cpp b/daemon/plugins/pausemusic/pausemusicplugin.cpp
similarity index 90%
rename from daemon/plugins/pausemusic/pausemusicpackageinterface.cpp
rename to daemon/plugins/pausemusic/pausemusicplugin.cpp
index 43e3b8b..7226713 100644
--- a/daemon/plugins/pausemusic/pausemusicpackageinterface.cpp
+++ b/daemon/plugins/pausemusic/pausemusicplugin.cpp
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pausemusicpackageinterface.h"
+#include "pausemusicplugin.h"
 
 #include <QDebug>
 #include <QDBusConnection>
@@ -27,16 +27,20 @@
 #include <QDBusReply>
 #include <QDBusMessage>
 
-PauseMusicPackageInterface::PauseMusicPackageInterface()
+K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PauseMusicPlugin >(); )
+K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_pausemusic", "kdeconnect_pausemusic") )
+
+PauseMusicPlugin::PauseMusicPlugin(QObject* parent, const QVariantList& args)
+    : KdeConnectPlugin(parent, args)
 {
+
     //TODO: Be able to change this from plugin settings
     pauseWhen = PauseWhenRinging;
 
 }
 
-bool PauseMusicPackageInterface::receivePackage (const Device& device, const NetworkPackage& np)
+bool PauseMusicPlugin::receivePackage(const NetworkPackage& np)
 {
-    Q_UNUSED(device);
 
     bool pauseConditionFulfilled = false;
 
diff --git a/daemon/plugins/pausemusic/pausemusicpackageinterface.h b/daemon/plugins/pausemusic/pausemusicplugin.h
similarity index 77%
rename from daemon/plugins/pausemusic/pausemusicpackageinterface.h
rename to daemon/plugins/pausemusic/pausemusicplugin.h
index 3d5a8de..0ab9a01 100644
--- a/daemon/plugins/pausemusic/pausemusicpackageinterface.h
+++ b/daemon/plugins/pausemusic/pausemusicplugin.h
@@ -18,20 +18,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PAUSEMUSICPACKAGEINTERFACE_H
-#define PAUSEMUSICPACKAGEINTERFACE_H
-
-#include "packageinterface.h"
+#ifndef PAUSEMUSICPLUGIN_H
+#define PAUSEMUSICPLUGIN_H
 
+#include <QObject>
 #include <QSet>
 #include <QString>
 
-class PauseMusicPackageInterface
-    : public PackageInterface
+#include "../kdeconnectplugin.h"
+
+class PauseMusicPlugin
+    : public KdeConnectPlugin
 {
+    Q_OBJECT
+
 public:
-    PauseMusicPackageInterface();
-    virtual bool receivePackage(const Device& device, const NetworkPackage& np);
+    explicit PauseMusicPlugin(QObject *parent, const QVariantList &args);
+
+public Q_SLOTS:
+    virtual bool receivePackage(const NetworkPackage& np);
 
 private:
     enum PauseCondtions { PauseWhenTalking, PauseWhenRinging, NeverPause };

-- 
kdeconnect packaging