summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-07-06 04:04:56 (UTC)
committer ulf69 <ulf69>2004-07-06 04:04:56 (UTC)
commitc4bd138c16e8d34294502c9da5706e21337ba53d (patch) (unidiff)
tree08f15d9575264b04bcb0135077918175e2cd1650
parent6a826e654102e78abb6d14f80a3679575e5d3c9a (diff)
downloadkdepimpi-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.
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
@@ -141,9 +141,9 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
141 141
142 access->save(); 142 access->save();
143 143
144 delete access; 144 delete access;
145 delete backend; 145//US the deletion of the access object deletes the backend object as well.
146 146
147 return true; 147 return true;
148} 148}
149 149
@@ -194,9 +194,9 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
194// qDebug("found %s", c.fullName().latin1()); 194// qDebug("found %s", c.fullName().latin1());
195 } 195 }
196 196
197 delete access; 197 delete access;
198 delete backend; 198//US the deletion of the access object deletes the backend object as well.
199 199
200 return adrlst; 200 return adrlst;
201 201
202} 202}
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
178 else { 178 else {
179 if ( XXPortManager::importURL.isEmpty() ) 179 if ( XXPortManager::importURL.isEmpty() )
180 { 180 {
181 fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); 181 fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
182 if ( fileName.isEmpty() )
183 return addrList;
184
182 } 185 }
183 else 186 else
184 { 187 {
185//US url = XXPortManager::importURL; 188//US url = XXPortManager::importURL;
186 qDebug("VCardXXPort::importContacts Urls at the moment not supported"); 189 qDebug("VCardXXPort::importContacts Urls at the moment not supported");
190 if ( url.isEmpty() )
191 return addrList;
192
187 } 193 }
188 194
189 if ( url.isEmpty() )
190 return addrList;
191 195
192 QFile file( fileName ); 196 QFile file( fileName );
193 197
194 file.open( IO_ReadOnly ); 198 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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3TARGET = microkdepim 3TARGET = microkdepim
4INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore 4INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore $(QPEDIR)/include
5INCLUDEPATH += . .. 5INCLUDEPATH += . ..
6LIBS += -lmicrokde 6LIBS += -lmicrokde
7LIBS += -L$(QPEDIR)/lib 7LIBS += -L$(QPEDIR)/lib
8OBJECTS_DIR = obj/$(PLATFORM) 8OBJECTS_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()
258} 258}
259 259
260void KDialogBase::slotOk() 260void KDialogBase::slotOk()
261{ 261{
262 qDebug("KDialogBase::slotOk");
262 emit okClicked(); 263 emit okClicked();
263 QDialog::accept(); 264 accept();
264} 265}
265 266
266void KDialogBase::slotApply() 267void KDialogBase::slotApply()
267{ 268{