--- a/contentstorage/caclient/s60/inc/caclientnotifierproxy.h Fri Apr 16 14:45:49 2010 +0300
+++ b/contentstorage/caclient/s60/inc/caclientnotifierproxy.h Fri Apr 30 15:22:08 2010 +0300
@@ -30,44 +30,7 @@
class CaEntry;
class CaNotifierFilter;
-/**
- * IDataObserver
- *
- */
-class IDataObserver
-{
-public:
- /**
- * Method invoked when entry is changed.
- * @param entryId entry id.
- * @param changeType change type.
- */
- virtual void entryChanged(TInt entryId,
- TChangeType changeType) const = 0;
-
- /**
- * Method invoked when entry is changed.
- * @param entry entry.
- * @param changeType change type.
- */
- virtual void entryChanged(const CCaInnerEntry &entry,
- TChangeType changeType) const = 0;
-
- /**
- * Method invoked when entry was changed.
- * @param entryId entry id.
- */
- virtual void entryTouched(TInt id) const = 0;
-
- /**
- * Method invoked when entry was changed.
- * @param groupId group id.
- */
- virtual void groupContentChanged(TInt groupId) const = 0;
-};
-
-class CACLIENT_EXPORT CaClientNotifierProxy: public QObject,
- public IDataObserver
+class CACLIENT_EXPORT CaClientNotifierProxy: public QObject
{
Q_OBJECT
@@ -85,33 +48,6 @@
~CaClientNotifierProxy();
/**
- * Method invoked when entry is changed.
- * @param entryId entry id.
- * @param changeType change type.
- */
- virtual void entryChanged(TInt entryId, TChangeType changeType) const;
-
- /**
- * Method invoked when entry is changed.
- * @param entry entry.
- * @param changeType change type.
- */
- virtual void entryChanged(const CCaInnerEntry &entry,
- TChangeType changeType) const;
-
- /**
- * Method invoked when entry was changed.
- * @param entryId entry id.
- */
- virtual void entryTouched(TInt entryId) const;
-
- /**
- * Method invoked when entry was changed.
- * @param groupId group id.
- */
- virtual void groupContentChanged(TInt groupId) const;
-
- /**
* Method for registering notifier
*
* @param notifierFilter notifierFilter used to register notifier.
@@ -121,7 +57,7 @@
int registerNotifier(
const CaNotifierFilter *notifierFilter,
CaNotifierPrivate::NotifierType notifierType,
- const CaClientNotifierProxy *notifierProxy);
+ const IDataObserver *observer);
/**
* Method for unregistering notifier.
@@ -133,13 +69,11 @@
const CaNotifierFilter ¬ifierFilter,
CaNotifierPrivate::NotifierType notifierType);
-signals:
-
- void signalEntryChanged(int entryId, ChangeType changeType) const;
- void signalEntryChanged(const CaEntry &entry,
- ChangeType changeType) const;
- void signalEntryTouched(int id) const;
- void signalGroupContentChanged(int groupId) const;
+ /**
+ * Reconnect all sessions when server was terminated
+ *
+ */
+ void connectSessions();
private:
/**
@@ -181,7 +115,6 @@
Q_DISABLE_COPY(CaClientNotifierProxy)
friend class CaClientProxy;
- friend class CaClientObserver;
};