summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-07-20 21:28:10 (UTC)
committer ulf69 <ulf69>2004-07-20 21:28:10 (UTC)
commit6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4 (patch) (unidiff)
tree8ce4d24be2dfd04c386665723530435b66701286
parentfba0c028ac0ce15d0f7473439e025c56f108145e (diff)
downloadkdepimpi-6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4.zip
kdepimpi-6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4.tar.gz
kdepimpi-6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4.tar.bz2
remove the export was successfull dialog if the user canceled the operation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp6
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp54
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp30
3 files changed, 45 insertions, 45 deletions
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index caee66d..d4d5475 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -116,3 +116,3 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
116 } 116 }
117 117
118#else //KAB_EMBEDDED 118#else //KAB_EMBEDDED
@@ -122,3 +122,3 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
122 if ( fileName.isEmpty() ) 122 if ( fileName.isEmpty() )
123 return true; 123 return false;
124 124
@@ -138,3 +138,3 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
138#endif //KAB_EMBEDDED 138#endif //KAB_EMBEDDED
139 139
140} 140}
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index db30d34..c9b0163 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -90,3 +90,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
90 QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; 90 QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
91 91
92#ifndef KAB_EMBEDDED 92#ifndef KAB_EMBEDDED
@@ -96,5 +96,5 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
96#endif //KAB_EMBEDDED 96#endif //KAB_EMBEDDED
97 97
98 if ( fileName.isEmpty() ) 98 if ( fileName.isEmpty() )
99 return true; 99 return false;
100 100
@@ -102,3 +102,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
102 OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); 102 OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
103 103
104 if ( !access ) { 104 if ( !access ) {
@@ -110,3 +110,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
110 KABC::OpieConverter mConverter; 110 KABC::OpieConverter mConverter;
111 111
112 bool res = mConverter.init(); 112 bool res = mConverter.init();
@@ -118,5 +118,5 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
118 delete access; 118 delete access;
119 return false; 119 return false;
120 } 120 }
121 121
122 //Now check if the file has already entries, and ask the user if he wants to delete them first. 122 //Now check if the file has already entries, and ask the user if he wants to delete them first.
@@ -131,4 +131,4 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
131 } 131 }
132 132
133 133
134 KABC::Addressee::List::ConstIterator it; 134 KABC::Addressee::List::ConstIterator it;
@@ -137,3 +137,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
137 KABC::Addressee addressee = (*it); 137 KABC::Addressee addressee = (*it);
138 138
139 res = mConverter.addresseeToOpie( *it, c ); 139 res = mConverter.addresseeToOpie( *it, c );
@@ -150,3 +150,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
150 } 150 }
151 151
152 access->save(); 152 access->save();
@@ -155,3 +155,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
155//US the deletion of the access object deletes the backend object as well. 155//US the deletion of the access object deletes the backend object as well.
156 156
157 return true; 157 return true;
@@ -162,5 +162,5 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
162 KABC::AddresseeList adrlst; 162 KABC::AddresseeList adrlst;
163 163
164 QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; 164 QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
165 165
166#ifndef KAB_EMBEDDED 166#ifndef KAB_EMBEDDED
@@ -170,3 +170,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
170#endif //KAB_EMBEDDED 170#endif //KAB_EMBEDDED
171 171
172 if ( fileName.isEmpty() ) 172 if ( fileName.isEmpty() )
@@ -176,3 +176,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
176 OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); 176 OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
177 177
178 if ( !access ) { 178 if ( !access ) {
@@ -184,3 +184,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
184 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available 184 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
185 185
186 KABC::OpieConverter mConverter; 186 KABC::OpieConverter mConverter;
@@ -196,4 +196,4 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
196 } 196 }
197 197
198 198
199 OContactAccess::List::Iterator it; 199 OContactAccess::List::Iterator it;
@@ -203,7 +203,7 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
203 OContact c = (*it); 203 OContact c = (*it);
204 204
205 KABC::Addressee addressee; 205 KABC::Addressee addressee;
206 206
207 res = mConverter.opieToAddressee( c, addressee ); 207 res = mConverter.opieToAddressee( c, addressee );
208 208
209 if ( !addressee.isEmpty() && res ) { 209 if ( !addressee.isEmpty() && res ) {
@@ -211,11 +211,11 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
211 } 211 }
212 212
213// qDebug("found %s", c.fullName().latin1()); 213// qDebug("found %s", c.fullName().latin1());
214 } 214 }
215 215
216 delete access; 216 delete access;
217//US the deletion of the access object deletes the backend object as well. 217//US the deletion of the access object deletes the backend object as well.
218 218
219 return adrlst; 219 return adrlst;
220 220
221} 221}
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index adf47cd..4819341 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -92,3 +92,3 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString
92 name = "addressbook.vcf"; 92 name = "addressbook.vcf";
93 93
94#ifndef KAB_EMBEDDED 94#ifndef KAB_EMBEDDED
@@ -98,5 +98,5 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString
98#endif //KAB_EMBEDDED 98#endif //KAB_EMBEDDED
99 99
100 if ( fileName.isEmpty() ) 100 if ( fileName.isEmpty() )
101 return true; 101 return false;
102 102
@@ -170,9 +170,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
170 } 170 }
171 171
172 } 172 }
173 173
174 174
175#else //KAB_EMBEDDED 175#else //KAB_EMBEDDED
176 176
177 177
178 if ( !XXPortManager::importData.isEmpty() ) 178 if ( !XXPortManager::importData.isEmpty() )
@@ -185,3 +185,3 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
185 return addrList; 185 return addrList;
186 186
187 } 187 }
@@ -193,6 +193,6 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
193 return addrList; 193 return addrList;
194 194
195 } 195 }
196 196
197 197
198 QFile file( fileName ); 198 QFile file( fileName );
@@ -205,6 +205,6 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
205 addrList = parseVCard( data ); 205 addrList = parseVCard( data );
206 206
207 } 207 }
208#endif //KAB_EMBEDDED 208#endif //KAB_EMBEDDED
209 209
210 return addrList; 210 return addrList;
@@ -213,4 +213,4 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
213KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const 213KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
214{ 214{
215 215
216 KABC::VCardTool tool; 216 KABC::VCardTool tool;