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, 5 insertions, 18 deletions

diff --git a/kitchensync/src/syncprocessmanager.h b/kitchensync/src/syncprocessmanager.h
index 38004977d..b95018a84 100644
--- a/kitchensync/src/syncprocessmanager.h
+++ b/kitchensync/src/syncprocessmanager.h
@@ -26,8 +26,7 @@
 #include <libqopensync/group.h>
 
 namespace QSync {
-class GroupEnv;
-class PluginEnv;
+class Environment;
 }
 
 class SyncProcess;
@@ -44,14 +43,9 @@ class SyncProcessManager : public QObject
     ~SyncProcessManager();
 
     /**
-      Return OpenSync GroupEnv.
+      Return OpenSync Environment.
     */
-    QSync::GroupEnv *groupEnv() const { return mGroupEnv; }
-
-    /**
-      Return OpenSync PluginEnv.
-    */
-    QSync::PluginEnv *pluginEnv() const { return mPluginEnv; }
+    QSync::Environment *environment() const { return mEnvironment; }
 
     /**
       Returns the number of SyncProcesses.
@@ -88,11 +82,6 @@ class SyncProcessManager : public QObject
      */
     QSync::Result addMember( SyncProcess *process, const QSync::Plugin &plugin );
 
-    /**
-      Removes the @param member from the group of @param process.
-     */
-    void removeMember( SyncProcess *process, const QSync::Member &member );
-
   signals:
     void changed();
     void syncProcessChanged( SyncProcess *process );
@@ -100,12 +89,10 @@ class SyncProcessManager : public QObject
   private:
     SyncProcessManager();
 
-    void initGroup( QSync::GroupEnv *groupEnv );
-//    void initPlugin( QSync::PluginEnv *pluginEnv );
+    void init( QSync::Environment *environment );
 
     TQValueList<SyncProcess*> mProcesses;
-    QSync::GroupEnv *mGroupEnv;
-    QSync::PluginEnv *mPluginEnv;
+    QSync::Environment *mEnvironment;
 
     static SyncProcessManager *mSelf;
 };