code cleanup

1 files changed, 34 insertions, 33 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 7475685..7e10e46 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -65,9 +65,9 @@ ResourceQtopia::ResourceQtopia( const KConfig *config )
   : Resource( config ), mConverter (0)
 {
   // 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 )
@@ -136,15 +136,15 @@ bool ResourceQtopia::doOpen()
     }
 
 //US    bool ok = mFormat->checkFormat( &file );
     bool ok = true;
-    
+
     file.close();
 
     return ok;
   }
 */
-  return true;  
+  return true;
 }
 
 void ResourceQtopia::doClose()
 {
@@ -154,50 +154,51 @@ bool ResourceQtopia::load()
 {
   kdDebug(5700) << "ResourceQtopia::load(): '" << mFileName << "'" << endl;
 
 //  qDebug("ResourceQtopia::load: Try to load file() %s", mFileName.latin1());
-  
+
   AddressBookAccess* access = new AddressBookAccess();
 
   if ( !access ) {
     qDebug("Unable to load file() %s", mFileName.latin1());
     addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
     return false;
   }
-  
+
   bool res = false;
   if (mConverter == 0)
   {
     mConverter = new QtopiaConverter();
     res = mConverter->init();
     if ( !res )
     {
-      qDebug("Unable to initialize qtopia converter. Most likely a problem with the category file");
-      addressBook()->error( i18n( "Unable to initialize qtopia converter. Most likely a problem with the category file" ) );
+	  QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
+      qDebug(msg);
+      addressBook()->error( i18n( msg ) );
       delete access;
       return false;
     }
   }
-  
-  { //create a new scope 
+
+  { //create a new scope
     AddressBookIterator it(*access);
     const PimContact* contact;
 
     for (contact=it.toFirst(); it.current(); ++it) {
       contact = it.current();
-    
+
       KABC::Addressee addressee;
-    
-      res = mConverter->qtopiaToAddressee( (*contact), addressee );    
-    
+
+      res = mConverter->qtopiaToAddressee( (*contact), addressee );
+
       if ( !addressee.isEmpty() && res )
       {
         addressee.setResource( this );
         addressBook()->insertAddressee( addressee );
       }
     }
   }
-    
+
   delete access;
   return true;
 }
 
@@ -208,11 +209,11 @@ bool ResourceQtopia::save( Ticket *ticket )
   kdDebug(5700) << "ResourceQtopia::save()" << endl;
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
-   
+
 /*US we use a simpler method to create a backupfile
-    
+
   (void) KSaveFile::backupFile( mFileName, QString::null
   ,extension );
 
   KSaveFile saveFile( mFileName );
@@ -224,32 +225,32 @@ bool ResourceQtopia::save( Ticket *ticket )
   }
 */
 
 /*US
-//US ToDo: write backupfile  
+//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 {
-  
+
   }
-  
+
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
-  
+
   delete ticket;
   unlock( mFileName );
-  
+
   return ok;
 
   qDebug("ResourceQtopia::save has to be changed");
-*/  
+*/
   return true;
 }
 
 bool ResourceQtopia::lock( const QString &fileName )
@@ -260,20 +261,20 @@ bool ResourceQtopia::lock( const QString &fileName )
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
-  
-  KURL url(fn);  
+
+  KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-  
+
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
-  
-  url = lockUniqueName;  
+
+  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
@@ -302,11 +303,11 @@ void ResourceQtopia::unlock( const QString &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);  
+  KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-  
+
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
@@ -314,15 +315,15 @@ void ResourceQtopia::unlock( const QString &fileName )
 void ResourceQtopia::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
-  
+
   mFileName = fileName;
 
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
 
-//US simulate KDirWatch event  
+//US simulate KDirWatch event
 //US  fileChanged();
 }
 
 QString ResourceQtopia::fileName() const
@@ -335,9 +336,9 @@ void ResourceQtopia::fileChanged()
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
-  
+
   QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();