From 9e20d7399511fbbca8a461742c2713b32e90fa57 Mon Sep 17 00:00:00 2001
From: Marja Hassinen <marja.hassinen@nokia.com>
Date: Mon, 20 Dec 2010 14:31:04 +0200
Subject: lca, waitForSubscriptionAndBlock: making added iface funcs pure
 virtual.

The new contract between plugin & contextkit is: when we call
waitUntilReadyAndBlock() on a plugin, it blocks for as long time as
needed and then emits the ready() signal. So, the empty implementation
doesn't make sense (no signal would be emitted).
---
 libcontextsubscriber/customer-tests/testplugins/timeplugin.cpp | 4 ++++
 libcontextsubscriber/customer-tests/testplugins/timeplugin.h   | 1 +
 libcontextsubscriber/src/iproviderplugin.h                     | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libcontextsubscriber/customer-tests/testplugins/timeplugin.cpp b/libcontextsubscriber/customer-tests/testplugins/timeplugin.cpp
index 25780597..a33a7bdc 100644
--- a/libcontextsubscriber/customer-tests/testplugins/timeplugin.cpp
+++ b/libcontextsubscriber/customer-tests/testplugins/timeplugin.cpp
@@ -59,6 +59,10 @@ void TimePlugin::unsubscribe(QSet<QString> keys)
     timer.stop();
 }
 
+void TimePlugin::waitUntilReadyAndBlock()
+{
+}
+
 void TimePlugin::waitForSubscriptionAndBlock(const QString& key)
 {
 }
diff --git a/libcontextsubscriber/customer-tests/testplugins/timeplugin.h b/libcontextsubscriber/customer-tests/testplugins/timeplugin.h
index 4ba293b4..95c4c179 100644
--- a/libcontextsubscriber/customer-tests/testplugins/timeplugin.h
+++ b/libcontextsubscriber/customer-tests/testplugins/timeplugin.h
@@ -46,6 +46,7 @@ public:
     explicit TimePlugin();
     virtual void subscribe(QSet<QString> keys);
     virtual void unsubscribe(QSet<QString> keys);
+    virtual void waitUntilReadyAndBlock();
     virtual void waitForSubscriptionAndBlock(const QString& key);
 
 private Q_SLOTS:
diff --git a/libcontextsubscriber/src/iproviderplugin.h b/libcontextsubscriber/src/iproviderplugin.h
index 79ba9da5..0a0c3edb 100644
--- a/libcontextsubscriber/src/iproviderplugin.h
+++ b/libcontextsubscriber/src/iproviderplugin.h
@@ -40,8 +40,8 @@ class IProviderPlugin : public QObject
 public:
     virtual void subscribe(QSet<QString> keys) = 0;
     virtual void unsubscribe(QSet<QString> keys) = 0;
-    virtual void waitUntilReadyAndBlock() { }
-    virtual void waitForSubscriptionAndBlock(const QString& key) { }
+    virtual void waitUntilReadyAndBlock() = 0;
+    virtual void waitForSubscriptionAndBlock(const QString& key) = 0;
 
 Q_SIGNALS:
     void ready();
-- 
cgit v1.2.3