1 files changed, 17 insertions, 21 deletions

diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index e89bf41..ef61d6d 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -23,24 +23,25 @@
 
 #ifndef KABCORE_H
 #define KABCORE_H
 
 #include <kabc/field.h>
 
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 #include <qdict.h>
 
 #include <qwidget.h>
 #include <qpopupmenu.h>
+#include <ksyncmanager.h>
 
 namespace KABC {
 class AddressBook;
 }
 
 #ifndef KAB_EMBEDDED
 class KAboutData;
 class KConfig;
 
 class KAddressBookService;
 class LDAPSearchDialog;
 #else //KAB_EMBEDDED
@@ -58,25 +59,25 @@ class KAction;
 class KActionCollection;
 class KToggleAction;
 class KSyncProfile;
 
 class QAction;
 class QMenuBar;
 class QSplitter;
 class ViewContainer;
 class ViewManager;
 class AddresseeEditorDialog;
 class Ir;
 
-class KABCore : public QWidget
+class KABCore : public QWidget, public KSyncInterface
 {
   Q_OBJECT
 
   public:
     KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 );
 
 
     ~KABCore();
 
 
 #ifdef KAB_EMBEDDED
   //US added functionality
@@ -332,25 +333,25 @@ class KABCore : public QWidget
    void addGUIClient( KXMLGUIClient *client );
 
    void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
 
 
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   public slots:
     void setDetailsVisible( bool visible );
     void setDetailsToState();
-    void slotSyncMenu( int );
+    //    void slotSyncMenu( int );
   private slots:
     void setJumpButtonBarVisible( bool visible );
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
     void removeVoice();
 #ifdef KAB_EMBEDDED
     void configureResources();
 #endif //KAB_EMBEDDED
@@ -438,48 +439,43 @@ class KABCore : public QWidget
     QPopupMenu *ImportMenu;
     QPopupMenu *ExportMenu;
     //LR additional methods
     KAction *mActionRemoveVoice;
     KAction * mActionImportOL;
 
 #ifndef KAB_EMBEDDED
     KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
 
     class KABCorePrivate;
     KABCorePrivate *d;
-    bool mBlockSaveFlag;
+    //US    bool mBlockSaveFlag;
 
 #ifdef KAB_EMBEDDED
     KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
+
+    //this are the overwritten callbackmethods from the syncinterface
+    virtual bool sync(KSyncManager* manager, QString filename, int mode);
+    virtual bool syncExternal(KSyncManager* manager, QString resource);
+
+    //called by the syncmanager to indicate that the work has to marked as dirty.
+    virtual void sync_setModified();
+    //called by the syncmanager to ask if the dirty flag is set.
+    virtual bool KABCore::sync_isModified();
+    //called by the syncmanager to indicate that the work has to be saved.
+    virtual void sync_save();
+
     // LR *******************************
     // sync stuff!
     QPopupMenu *syncMenu;
-    void fillSyncMenu();
-    QString mCurrentSyncDevice;
-    QString mCurrentSyncName;
-    void quickSyncLocalFile();
-    bool  syncWithFile( QString fn , bool quick );
-    void syncLocalFile();
-    void syncPhone();
-    void syncSharp();
-    bool syncExternal(QString);
-    void multiSync( bool askforPrefs  );
-    int mCurrentSyncProfile ;
-    void syncRemote( KSyncProfile* prof,  bool ask = true);
-    void edit_sync_options();
-    bool syncAB(QString filename, int mode);
-    int ringSync();
-    QString  getPassword( );
+    KSyncManager* syncManager;
     int mGlobalSyncMode; 
     bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
     KABC::Addressee getLastSyncAddressee();
     QDateTime mLastAddressbookSync;
     int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
-  public slots:
-    void confSync();
     // *********************
 
 };
 
 #endif