removed debug output

1 files changed, 8 insertions, 129 deletions

diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index ba17c50..48b7d91 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -69,3 +69,3 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
   // we can not choose the filename. Therefore use the default to display
-
+    mAccess = 0;
   QString fileName = SlZDataBase::addressbookFileName();
@@ -77,2 +77,3 @@ ResourceSharpDTM::ResourceSharpDTM( const QString &fileName  )
 {
+    mAccess = 0;
   init( fileName );
@@ -82,7 +83,2 @@ void ResourceSharpDTM::init( const QString &fileName )
 {
-
-  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
-  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
-  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
-
   setFileName( fileName );
@@ -107,3 +103,2 @@ Ticket *ResourceSharpDTM::requestSaveTicket()
  
-
   qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
@@ -111,9 +106,2 @@ Ticket *ResourceSharpDTM::requestSaveTicket()
   if ( !addressBook() ) return 0;
-
-#ifdef ALLOW_LOCKING
-  if ( !lock( fileName() ) ) {
-      qDebug("ResourceSharpDTM::requestSaveTicket(): Unable to lock file ");
-    return 0;
-  }
-#endif
   return createTicket( this );
@@ -124,4 +112,5 @@ bool ResourceSharpDTM::doOpen()
 {
-  qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1());
+    qDebug("%xResourceSharpDTM::doOpen: %s", this,fileName().latin1());
 
+    if ( ! mAccess  ) {
   // the last parameter in the SlZDataBase constructor means "readonly"
@@ -130,3 +119,3 @@ bool ResourceSharpDTM::doOpen()
                         NULL, false);
-
+    }
   if ( !mAccess ) {
@@ -135,5 +124,3 @@ bool ResourceSharpDTM::doOpen()
   }
-
-  if (mConverter == 0)
-  {
+    if (mConverter == 0) {
     mConverter = new SharpDTMConverter();
@@ -143,3 +130,2 @@ bool ResourceSharpDTM::doOpen()
 	  QString msg("Unable to initialize sharp converter. Most likely a problem with the category file");
-
       qDebug(msg);
@@ -150,3 +136,2 @@ bool ResourceSharpDTM::doOpen()
   }
-
  return true;
@@ -156,12 +141,2 @@ void ResourceSharpDTM::doClose()
 {
-  qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1());
-
-  if(mAccess)
-  {
-    delete mAccess;
-    mAccess = 0;
-  }
-  // it seems so, that deletion of access deletes backend as well
-  //delete backend;
-
   return;
@@ -171,8 +146,5 @@ bool ResourceSharpDTM::load()
 {
-  qDebug("ResourceSharpDTM::load: %s", fileName().latin1());
-
+    qDebug("%xResourceSharpDTM::load: %s",this, fileName().latin1());
   bool res = false;
-
   CardId id;
-
   for (bool res=mAccess->first(); res == true; res=mAccess->next())
@@ -180,7 +152,4 @@ bool ResourceSharpDTM::load()
     id = mAccess->cardId();
-
     KABC::Addressee addressee;
-
     res = mConverter->sharpToAddressee( id, mAccess, addressee );
-
     if ( !addressee.isEmpty() && res )
@@ -191,3 +160,2 @@ bool ResourceSharpDTM::load()
   }
-
   return true;
@@ -198,5 +166,2 @@ bool ResourceSharpDTM::save( Ticket *ticket )
   qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
-
-  mDirWatch.stopScan();
-
   KABC::AddressBook::Iterator it;
@@ -207,3 +172,2 @@ bool ResourceSharpDTM::save( Ticket *ticket )
   CardId id ;
-
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
@@ -225,6 +189,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
                           {
-                              res = mAccess->finishEditCard(&id);
-                              //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
-                              //(*it).setExternalUID( QString::number( id ) );
-                              //(*it).setOriginalExternalUID( QString::number( id ) ); 
+                              res = mAccess->finishEditCard(&id);; 
                               map.insert(id,(*it).uid());                           
@@ -256,3 +217,2 @@ bool ResourceSharpDTM::save( Ticket *ticket )
                               res = mAccess->finishEditCard(&id);
-                              //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
                               map.insert(id,(*it).uid());
@@ -260,3 +220,2 @@ bool ResourceSharpDTM::save( Ticket *ticket )
                                   qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
-                              
                           }
@@ -291,8 +250,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
       }
-
-  //US  mAccess->save();
-
-  mDirWatch.startScan();
   delete ticket;
-  unlock( fileName() );
 
@@ -303,51 +257,2 @@ bool ResourceSharpDTM::lock( const QString &lockfileName )
 {
-#ifdef ALLOW_LOCKING
-  qDebug("ResourceSharpDTM::lock: %s", fileName().latin1());
-
-  kdDebug(5700) << "ResourceSharpDTM::lock()" << endl;
-
-  QString fn = lockfileName;
-
-  KURL url(fn);
-  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-
-  kdDebug(5700) << "-- lock name: " << lockName << endl;
-
-  if (QFile::exists( lockName ))
-  {
-    qDebug("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName());
-    return false;
-  }
-
-
-  QString lockUniqueName;
-  lockUniqueName = fn + KApplication::randomString( 8 );
-
-  url = lockUniqueName;
-//US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
-  mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
-  kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
-
-  // Create unique file
-  QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
-  file.close();
-
-  // Create lock file
-  int result = 0;
-#ifndef _WIN32_
-  result = ::link( QFile::encodeName( mLockUniqueName ),
-                       QFile::encodeName( lockName ) );
-#endif
-  if ( result == 0 ) {
-    addressBook()->emitAddressBookLocked();
-    return true;
-  }
-
-  // TODO: check stat
-
-  return false;
-#else
-  return true;
-#endif 
 }
@@ -356,13 +261,3 @@ void ResourceSharpDTM::unlock( const QString &fileName )
 {
-#ifdef ALLOW_LOCKING
-  qDebug("ResourceSharpDTM::unlock() %s", fileName.latin1());
-
-  QString fn = fileName;
-  KURL url(fn);
-  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
-  QFile::remove( lockName );
-  QFile::remove( mLockUniqueName );
-  addressBook()->emitAddressBookUnlocked();
-#endif 
 }
@@ -371,10 +266,3 @@ void ResourceSharpDTM::setFileName( const QString &newFileName )
 {
-  mDirWatch.stopScan();
-  mDirWatch.removeFile( fileName() );
-
   Resource::setFileName( newFileName );
-
-  mDirWatch.addFile( fileName() );
-  mDirWatch.startScan();
-
 }
@@ -383,12 +271,3 @@ void ResourceSharpDTM::fileChanged()
 {
-  // There is a small theoretical chance that KDirWatch calls us before
-  // we are fully constructed
-  if (!addressBook())
-    return;
 
-  QString text( i18n( "Sharp DTM resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
-  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
-    load();
-    addressBook()->emitAddressBookChanged();
-  }
 }