1 files changed, 32 insertions, 57 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index dc88272..4a35f19 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -49,7 +49,7 @@ $Id$
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
 #include "resourceqtopia.h"
 
@@ -58,7 +58,7 @@ extern "C"
 {
   void *init_microkabc_qtopia()
   {
-    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidget>();
   }
 }
 
@@ -67,14 +67,12 @@ ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
 {
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-
   init( fileName );
 }
 
 ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
-//  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
 
@@ -106,6 +104,8 @@ Ticket *ResourceQtopia::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
 
+  qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1());
+
   if ( !addressBook() ) return 0;
 
   if ( !lock( fileName() ) ) {
@@ -128,11 +128,11 @@ bool ResourceQtopia::doOpen()
     return false;
   }
 
-  bool res = false;
+
   if (mConverter == 0)
   {
     mConverter = new QtopiaConverter();
-    res = mConverter->init();
+    bool res = mConverter->init();
     if ( !res )
     {
 	  QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
@@ -189,69 +189,44 @@ bool ResourceQtopia::load()
 
 bool ResourceQtopia::save( Ticket *ticket )
 {
-/*US
-//    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  kdDebug(5700) << "ResourceQtopia::save()" << endl;
+  qDebug("ResourceQtopia::save: %s", fileName().latin1());
 
-  // create backup file
-  QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
 
-/*US we use a simpler method to create a backupfile
+  KABC::AddressBook::Iterator it;
+  bool res;
 
-  (void) KSaveFile::backupFile( mFileName, QString::null
-  ,extension );
+  for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
+    PimContact c;
+    KABC::Addressee addressee = (*it);
 
-  KSaveFile saveFile( mFileName );
-  bool ok = false;
-  if ( saveFile.status() == 0 && saveFile.file() )
+    res = mConverter->addresseeToQtopia( *it, c );
+    if (res == true)
   {
-    mFormat->saveAll( addressBook(), this, saveFile.file() );
-    ok = saveFile.close();
+      mAccess->addContact(c);
+//      if (res == false)
+//        qDebug("Unable to append Contact %s", c.fullName().latin1());
   }
-*/
-
-/*US
-//US ToDo: write backupfile
-  QFile info;
-  info.setName( mFileName );
-  bool ok = info.open( IO_WriteOnly );
-  if ( ok ) {
-//US    mFormat->saveAll( addressBook(), this, &info );
-
-    info.close();
-    ok = true;
+    else
+    {
+      qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
   }
-  else {
-
   }
 
-  if ( !ok )
-    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
+//  mAccess->addressBookUpdated();
 
   delete ticket;
-  unlock( mFileName );
-
-  return ok;
-
-  qDebug("ResourceQtopia::save has to be changed");
-
-
-  access->save();
-
-*/
+  unlock( fileName() );
 
   return true;
 }
 
-bool ResourceQtopia::lock( const QString &fileName )
+bool ResourceQtopia::lock( const QString &lockfileName )
 {
-  kdDebug(5700) << "ResourceQtopia::lock()" << endl;
+  qDebug("ResourceQtopia::lock: %s", fileName().latin1());
 
-  QString fn = fileName;
+  kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
-//US change the implementation how the lockfilename is getting created
-//US  fn.replace( QRegExp("/"), "_" );
-//US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
+  QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
@@ -274,9 +249,11 @@ bool ResourceQtopia::lock( const QString &fileName )
   file.close();
 
   // Create lock file
-  int result = ::link( QFile::encodeName( mLockUniqueName ),
+  int result = 0;
+#ifndef _WIN32_
+  result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
-
+#endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
@@ -289,11 +266,9 @@ bool ResourceQtopia::lock( const QString &fileName )
 
 void ResourceQtopia::unlock( const QString &fileName )
 {
+  qDebug("ResourceQtopia::unlock() %s", fileName.latin1());
+
   QString fn = fileName;
-//US change the implementation how the lockfilename is getting created
-//US  fn.replace( QRegExp( "/" ), "_" );
-//US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
-//US  QString lockName = fn + ".lock";
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );