remove the export was successfull dialog if the user canceled the operation

3 files changed, 45 insertions, 45 deletions

diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index caee66d..d4d5475 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -114,13 +114,13 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
 
     return true;
   }
-  
+
 #else //KAB_EMBEDDED
 
   QString fileName = KFileDialog::getSaveFileName( "addressbook.csv", i18n("Save file"), parentWidget() );
 
   if ( fileName.isEmpty() )
-      return true;
+      return false;
 
   QFile file( fileName );
   if ( !file.open( IO_WriteOnly ) ) {
@@ -136,7 +136,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
 
 
 #endif //KAB_EMBEDDED
-  
+
 }
 
 KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index db30d34..c9b0163 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -88,19 +88,19 @@ OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name
 bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
   QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-    
+
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() );
 #endif //KAB_EMBEDDED
-  
+
   if ( fileName.isEmpty() )
-    return true;
+    return false;
 
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName );
   OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
-	
+
   if ( !access ) {
     qDebug("Unable to access file() %s", fileName.latin1());
     addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) );
@@ -108,7 +108,7 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
   }
 
   KABC::OpieConverter mConverter;
-  
+
   bool res = mConverter.init();
   if (!res)
   {
@@ -116,9 +116,9 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
     qDebug(text);
     KMessageBox::error( parentWidget(), text );
     delete access;
-    return false;  
+    return false;
   }
-  
+
   //Now check if the file has already entries, and ask the user if he wants to delete them first.
 	OContactAccess::List contactList = access->allRecords();
   if (contactList.count() > 0)
@@ -129,13 +129,13 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
       access->clear();
     }
   }
- 
-      
+
+
   KABC::Addressee::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     OContact c;
     KABC::Addressee addressee = (*it);
-    
+
     res = mConverter.addresseeToOpie( *it, c );
     if (res == true)
     {
@@ -148,33 +148,33 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
       qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
     }
   }
-  
+
   access->save();
 
   delete access;
 //US the deletion of the access object deletes the backend object as well.
-      
+
   return true;
 }
 
 KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
 {
   KABC::AddresseeList adrlst;
-  
+
   QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-    
+
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() );
 #endif //KAB_EMBEDDED
-  
+
   if ( fileName.isEmpty() )
     return KABC::AddresseeList();
 
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName );
   OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
-	
+
   if ( !access ) {
     qDebug("Unable to access file() %s", fileName.latin1());
     addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) );
@@ -182,7 +182,7 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
   }
 
   access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
-  
+
   KABC::OpieConverter mConverter;
 
   bool res = mConverter.init();
@@ -194,28 +194,28 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
     delete access;
     return KABC::AddresseeList();
   }
-  
-	
+
+
   OContactAccess::List::Iterator it;
   OContactAccess::List allList = access->allRecords();
   for ( it = allList.begin(); it != allList.end(); ++it )
   {
     OContact c = (*it);
-    
+
     KABC::Addressee addressee;
-    
-    res = mConverter.opieToAddressee( c, addressee );    
-    
+
+    res = mConverter.opieToAddressee( c, addressee );
+
     if ( !addressee.isEmpty() && res ) {
       adrlst.append( addressee );
     }
-    
+
 //    qDebug("found %s", c.fullName().latin1());
   }
-  
+
   delete access;
 //US the deletion of the access object deletes the backend object as well.
-  
+
   return adrlst;
-  
+
 }
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index adf47cd..4819341 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -90,15 +90,15 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString
     name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf";
   else
     name = "addressbook.vcf";
-    
+
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() );
 #endif //KAB_EMBEDDED
-  
+
   if ( fileName.isEmpty() )
-    return true;
+    return false;
 
   QFile outFile( fileName );
   if ( !outFile.open( IO_WriteOnly ) ) {
@@ -168,13 +168,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
       QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" );
       KMessageBox::error( parentWidget(), text.arg( url.url() ), caption );
     }
-    
+
   }
 
-  
+
 #else //KAB_EMBEDDED
-  
-  
+
+
   if ( !XXPortManager::importData.isEmpty() )
     addrList = parseVCard( XXPortManager::importData );
   else {
@@ -183,7 +183,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
       fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
       if ( fileName.isEmpty() )
         return addrList;
-    
+
     }
     else
     {
@@ -191,10 +191,10 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
       qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
       if ( url.isEmpty() )
         return addrList;
-    
+
     }
 
-      
+
       QFile file( fileName );
 
       file.open( IO_ReadOnly );
@@ -203,16 +203,16 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
 
       QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
       addrList = parseVCard( data );
-    
+
   }
-#endif //KAB_EMBEDDED    
-  
+#endif //KAB_EMBEDDED
+
   return addrList;
 }
 
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
-{ 
-   
+{
+
   KABC::VCardTool tool;
   KABC::AddresseeList addrList;
   addrList = tool.parseVCards( data );