summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp4
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp8
-rw-r--r--libkdepim/libkdepimE.pro2
-rw-r--r--microkde/kdialogbase.cpp3
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
@@ -144,3 +144,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
delete access;
- delete backend;
+//US the deletion of the access object deletes the backend object as well.
@@ -197,3 +197,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
delete access;
- delete backend;
+//US the deletion of the access object deletes the backend object as well.
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
@@ -181,2 +181,5 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
+ if ( fileName.isEmpty() )
+ return addrList;
+
}
@@ -186,6 +189,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
qDebug("VCardXXPort::importContacts Urls at the moment not supported");
+ if ( url.isEmpty() )
+ return addrList;
+
}
- if ( url.isEmpty() )
- return addrList;
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index 414ac2b..b267d22 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -3,3 +3,3 @@ CONFIG += qt warn_on
TARGET = microkdepim
-INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore
+INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore $(QPEDIR)/include
INCLUDEPATH += . ..
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 2251207..489474a 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -261,4 +261,5 @@ void KDialogBase::slotOk()
{
+ qDebug("KDialogBase::slotOk");
emit okClicked();
- QDialog::accept();
+ accept();
}