| -rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 8 | ||||
| -rw-r--r-- | libkdepim/libkdepimE.pro | 2 | ||||
| -rw-r--r-- | microkde/kdialogbase.cpp | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index f30a205..d1def18 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp @@ -141,9 +141,9 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString access->save(); delete access; - delete backend; +//US the deletion of the access object deletes the backend object as well. return true; } @@ -194,9 +194,9 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const // qDebug("found %s", c.fullName().latin1()); } delete access; - delete backend; +//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 c017f5b..54d0cbd 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -178,17 +178,21 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const 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; + } - if ( url.isEmpty() ) - return addrList; QFile file( fileName ); file.open( IO_ReadOnly ); diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro index 414ac2b..b267d22 100644 --- a/libkdepim/libkdepimE.pro +++ b/libkdepim/libkdepimE.pro @@ -1,8 +1,8 @@ TEMPLATE = lib CONFIG += qt warn_on TARGET = microkdepim -INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore +INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore $(QPEDIR)/include INCLUDEPATH += . .. LIBS += -lmicrokde LIBS += -L$(QPEDIR)/lib OBJECTS_DIR = obj/$(PLATFORM) diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index 2251207..489474a 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp @@ -258,10 +258,11 @@ QFrame *KDialogBase::plainPage() } void KDialogBase::slotOk() { + qDebug("KDialogBase::slotOk"); emit okClicked(); - QDialog::accept(); + accept(); } void KDialogBase::slotApply() { |