| author | ulf69 <ulf69> | 2004-07-06 04:04:56 (UTC) |
|---|---|---|
| committer | ulf69 <ulf69> | 2004-07-06 04:04:56 (UTC) |
| commit | c4bd138c16e8d34294502c9da5706e21337ba53d (patch) (side-by-side diff) | |
| tree | 08f15d9575264b04bcb0135077918175e2cd1650 | |
| parent | 6a826e654102e78abb6d14f80a3679575e5d3c9a (diff) | |
| download | kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.zip kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.tar.gz kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.tar.bz2 | |
ok button of dialog works now. import of vcards works now, export of opie resources too.
| -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 @@ -142,7 +142,7 @@ 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; } @@ -195,7 +195,7 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const } 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 @@ -179,15 +179,19 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const 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 ); diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro index 414ac2b..b267d22 100644 --- a/libkdepim/libkdepimE.pro +++ b/libkdepim/libkdepimE.pro @@ -1,7 +1,7 @@ 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 diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index 2251207..489474a 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp @@ -259,8 +259,9 @@ QFrame *KDialogBase::plainPage() void KDialogBase::slotOk() { + qDebug("KDialogBase::slotOk"); emit okClicked(); - QDialog::accept(); + accept(); } void KDialogBase::slotApply() |