Reverse OpenSync patch as it causes a build failure on Debian

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 12 deletions

diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h
index 215b0b148..294c19f15 100644
--- a/kitchensync/libqopensync/member.h
+++ b/kitchensync/libqopensync/member.h
@@ -22,21 +22,19 @@
 #ifndef QSYNC_MEMBER_H
 #define QSYNC_MEMBER_H
 
-#include <tqstring.h>
+#include <libqopensync/plugin.h>
+#include <libqopensync/result.h>
+#include <libqopensync/plugin.h>
 
 class OSyncMember;
 
 namespace QSync {
 
-class Result;
-
 class Member
 {
   friend class Group;
-  friend class Engine;
   friend class SyncChange;
   friend class SyncMemberUpdate;
-  friend class SyncChangeUpdate;
 
   public:
     Member();
@@ -58,6 +56,11 @@ class Member
     TQString pluginName() const;
 
     /**
+      Returns the plugin, the member belongs to.
+     */
+    Plugin plugin() const;
+
+    /**
       Returns the id of the plugin.
     */
     int id() const;
@@ -99,7 +102,7 @@ class Member
     /**
       Make this member an instance of the given plugin.
     */
-    Result instance();
+    Result instance( const Plugin & );
 
     bool operator==( const Member& ) const;
 
@@ -116,12 +119,6 @@ class Member
      */
     bool testConnection( const TQString &configuration );
 
-
-    /**
-     * Deletes the member's information from the hard disc.
-     */
-    Result cleanup() const;
-
   private:
     OSyncMember *mMember;
 };