summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp6
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp54
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp30
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
@@ -105,47 +105,47 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
QFile file( url.path() );
if ( !file.open( IO_WriteOnly ) ) {
QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
KMessageBox::error( parentWidget(), txt.arg( url.path() ) );
return false;
}
doExport( &file, list );
file.close();
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 ) ) {
QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
KMessageBox::error( parentWidget(), txt.arg( fileName ) );
return false;
}
doExport( &file, list );
file.close();
return true;
#endif //KAB_EMBEDDED
-
+
}
KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const
{
CSVImportDialog dlg( addressBook(), parentWidget() );
if ( dlg.exec() )
return dlg.contacts();
else
return KABC::AddresseeList();
}
void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
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
@@ -79,143 +79,143 @@ extern "C"
OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
: XXPortObject( ab, parent, name )
{
createImportAction( i18n( "Import Opie..." ) );
createExportAction( i18n( "Export Opie..." ) );
}
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 ) );
return false;
}
KABC::OpieConverter mConverter;
-
+
bool res = mConverter.init();
if (!res)
{
QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) );
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)
{
QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
// Clean the database..
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)
{
res = access->add(c);
if (res == false)
qDebug("Unable to append Contact %s", c.fullName().latin1());
}
else
{
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 ) );
return KABC::AddresseeList();
}
access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
-
+
KABC::OpieConverter mConverter;
bool res = mConverter.init();
if (!res)
{
QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) );
qDebug(text);
KMessageBox::error( parentWidget(), text );
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
@@ -81,33 +81,33 @@ VCardXXPort::VCardXXPort( KABC::AddressBook *ab, QWidget *parent, const char *na
//US createExportAction( i18n( "Export vCard 2.1..." ), "v21" );
createExportAction( i18n( "Export vCard 3.0..." ), "v30" );
}
bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
{
QString name;
if ( list.count() == 1 )
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 ) ) {
QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
KMessageBox::error( parentWidget(), text.arg( fileName ) );
return false;
}
QTextStream t( &outFile );
t.setEncoding( QTextStream::UnicodeUTF8 );
KABC::Addressee::List::ConstIterator it;
@@ -159,69 +159,69 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
file.close();
QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
addrList = parseVCard( data );
if ( !url.isLocalFile() )
KIO::NetAccess::removeTempFile( fileName );
} else {
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 {
if ( XXPortManager::importURL.isEmpty() )
{
fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
if ( fileName.isEmpty() )
return addrList;
-
+
}
else
{
//US url = XXPortManager::importURL;
qDebug("VCardXXPort::importContacts Urls at the moment not supported");
if ( url.isEmpty() )
return addrList;
-
+
}
-
+
QFile file( fileName );
file.open( IO_ReadOnly );
QByteArray rawData = file.readAll();
file.close();
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 );
// LR : I switched to the code, which is in current cvs HEAD
/*
uint numVCards = data.contains( "BEGIN:VCARD", false );
QStringList dataList = QStringList::split( "\r\n\r\n", data );
for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
KABC::Addressee addr;
bool ok = false;