summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-29 11:24:47 (UTC)
committer zautrix <zautrix>2004-10-29 11:24:47 (UTC)
commit443116d2682cd221c25201926e35d825170bdbbd (patch) (side-by-side diff)
tree86e8e5965b489cd3d537e9872ff106019476c559
parent2d28a226645f56a96fe0a8252e0d7e7b2cc4df2e (diff)
downloadkdepimpi-443116d2682cd221c25201926e35d825170bdbbd.zip
kdepimpi-443116d2682cd221c25201926e35d825170bdbbd.tar.gz
kdepimpi-443116d2682cd221c25201926e35d825170bdbbd.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp2
-rw-r--r--kaddressbook/xxport/qtopia_xxport.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index cf6b11a..79ddaea 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -142,49 +142,49 @@ bool ResourceQtopia::doOpen()
}
void ResourceQtopia::doClose()
{
qDebug("ResourceQtopia::doClose: %s", fileName().latin1());
// it seems so, that deletion of access deletes backend as well
//delete backend;
return;
}
bool ResourceQtopia::load()
{
QFile file( fileName() );
if ( !file.open(IO_ReadOnly ) ) {
return false;
}
QDomDocument doc("mydocument" );
if ( !doc.setContent( &file ) ) {
file.close();
- return true;
+ return false;
}
bool res;
QDomElement docElem = doc.documentElement( );
QDomNode n = docElem.firstChild();
while ( !n.isNull() ) {
QDomElement e = n.toElement();
if ( !e.isNull() ) {
if ( e.tagName() == QString::fromLatin1( "Contacts" ) ) {
QDomNode no = e.firstChild();
while ( !no.isNull() ) {
QDomElement el = no.toElement();
if ( !el.isNull() ) {
KABC::Addressee addressee;
res = mConverter->qtopiaToAddressee( el, addressee );
if ( !addressee.isEmpty() && res )
{
addressee.setResource( this );
addressBook()->insertAddressee( addressee );
}
}
no = no.nextSibling();
}
}
diff --git a/kaddressbook/xxport/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia_xxport.cpp
index fc4abbb..e3457a1 100644
--- a/kaddressbook/xxport/qtopia_xxport.cpp
+++ b/kaddressbook/xxport/qtopia_xxport.cpp
@@ -52,35 +52,35 @@ extern "C"
{
return ( new QtopiaXXPortFactory() );
}
}
QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
: XXPortResourceObject( ab, parent, name )
{
defaultFileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
if ( mFactory && !mFactory->typeName( "qtopia" ).isEmpty() )
{
createImportAction( i18n( "Import xml (Qtopia)..." ) );
createExportAction( i18n( "Export xml (Qtopia)..." ) );
}
}
bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QString &identifier )
{
QString fn =KFileDialog::getSaveFileName( defaultFileName, i18n("Import xml file"), 0 );
if ( fn == "" )
return false;
-
+
return _exportContacts( list, identifier, fn );
}
KABC::AddresseeList QtopiaXXPort::importContacts( const QString &identifier ) const
{
QString fn =KFileDialog::getOpenFileName( defaultFileName, i18n("Import xml file"), 0 );
if ( fn == "" )
return KABC::AddresseeList() ;
return _importContacts( identifier, fn );
}