Merge branch 'subscriber-plugins' of git@gitorious.org:maemo-af/contextkit into subscriber-plugins

5 files changed, 50 insertions, 16 deletions

diff --git a/libcontextsubscriber/src/Makefile.am b/libcontextsubscriber/src/Makefile.am
index b168c372..7fe707c9 100644
--- a/libcontextsubscriber/src/Makefile.am
+++ b/libcontextsubscriber/src/Makefile.am
@@ -13,7 +13,7 @@ libcontextsubscriber_la_SOURCES = contextproperty.cpp			\
 	  dbusnamelistener.cpp handlesignalrouter.cpp			\
 	  handlesignalrouter.h queuedinvoker.cpp queuedinvoker.h	\
 	  loggingfeatures.h bluezinterface.h bluezinterface.cpp		\
-	  contextkitplugin.h contextkitplugin.cpp
+	  contextkitplugin.h contextkitplugin.cpp iproviderplugin.h
 
 includecontextsubscriberdir=$(includedir)/contextsubscriber
 includecontextsubscriber_HEADERS = contextproperty.h contextpropertyinfo.h contextregistryinfo.h
diff --git a/libcontextsubscriber/src/contextkitplugin.h b/libcontextsubscriber/src/contextkitplugin.h
index a0d74888..25d09d58 100644
--- a/libcontextsubscriber/src/contextkitplugin.h
+++ b/libcontextsubscriber/src/contextkitplugin.h
@@ -29,6 +29,7 @@
 #include <QMap>
 #include "dbusnamelistener.h"
 #include "provider.h"
+#include "iproviderplugin.h"
 
 extern "C" {
     ContextSubscriber::IProviderPlugin* contextKitPluginFactory(QString constructionString);
diff --git a/libcontextsubscriber/src/iproviderplugin.h b/libcontextsubscriber/src/iproviderplugin.h
new file mode 100644
index 00000000..1f025aa6
--- /dev/null
+++ b/libcontextsubscriber/src/iproviderplugin.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2008, 2009 Nokia Corporation.
+ *
+ * Contact: Marius Vollmer <marius.vollmer@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef IPROVIDERPLUGIN_H
+#define IPROVIDERPLUGIN_H
+
+#include <QObject>
+
+namespace ContextSubscriber {
+
+class IProviderPlugin : public QObject
+{
+    Q_OBJECT
+public:
+    virtual void subscribe(QSet<QString> keys) = 0;
+    virtual void unsubscribe(QSet<QString> keys) = 0;
+
+signals:
+    void ready();
+    void failed(QString error);
+    void subscribeFinished(QString key);
+    void subscribeFailed(QString failedKey, QString error);
+    void valueChanged(QString key, QVariant value);
+};
+
+}
+
+#endif
diff --git a/libcontextsubscriber/src/provider.cpp b/libcontextsubscriber/src/provider.cpp
index 1fde0d16..c5e8b931 100644
--- a/libcontextsubscriber/src/provider.cpp
+++ b/libcontextsubscriber/src/provider.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "provider.h"
+#include "iproviderplugin.h"
 #include "handlesignalrouter.h"
 #include "sconnect.h"
 #include "contextkitplugin.h"
diff --git a/libcontextsubscriber/src/provider.h b/libcontextsubscriber/src/provider.h
index fc1e2e25..28b18675 100644
--- a/libcontextsubscriber/src/provider.h
+++ b/libcontextsubscriber/src/provider.h
@@ -37,21 +37,7 @@ class PropertyHandle;
 class SubscriberInterface;
 class DBusNameListener;
 class ManagerInterface;
-
-class IProviderPlugin : public QObject
-{
-    Q_OBJECT
-public:
-    virtual void subscribe(QSet<QString> keys) = 0;
-    virtual void unsubscribe(QSet<QString> keys) = 0;
-
-signals:
-    void ready();
-    void failed(QString error);
-    void subscribeFinished(QString key);
-    void subscribeFailed(QString failedKey, QString error);
-    void valueChanged(QString key, QVariant value);
-};
+class IProviderPlugin;
 
 class Provider : public QueuedInvoker
 {