-rw-r--r-- | kabc/addressbook.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index fe59fcb..c700897 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -38,6 +38,6 @@ $Id$ | |||
38 | #include "errorhandler.h" | 38 | #include "errorhandler.h" |
39 | */ | 39 | */ |
40 | #include <qptrlist.h> | 40 | #include <q3ptrlist.h> |
41 | #include <qtextstream.h> | 41 | #include <q3textstream.h> |
42 | #include <qfile.h> | 42 | #include <qfile.h> |
43 | #include <qregexp.h> | 43 | #include <qregexp.h> |
@@ -245,5 +245,5 @@ void AddressBook::init(const QString &config, const QString &family ) | |||
245 | d = new AddressBookData; | 245 | d = new AddressBookData; |
246 | QString fami = family; | 246 | QString fami = family; |
247 | if (config != 0) { | 247 | if (!config.isEmpty()) { |
248 | if ( family == "syncContact" ) { | 248 | if ( family == "syncContact" ) { |
249 | qDebug("creating sync config "); | 249 | qDebug("creating sync config "); |
@@ -382,11 +382,11 @@ void AddressBook::export2File( QString fileName, QString resourceName ) | |||
382 | 382 | ||
383 | QFile outFile( fileName ); | 383 | QFile outFile( fileName ); |
384 | if ( !outFile.open( IO_WriteOnly ) ) { | 384 | if ( !outFile.open( QIODevice::WriteOnly ) ) { |
385 | QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); | 385 | QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); |
386 | KMessageBox::error( 0, text.arg( fileName ) ); | 386 | KMessageBox::error( 0, text.arg( fileName ) ); |
387 | return ; | 387 | return ; |
388 | } | 388 | } |
389 | QTextStream t( &outFile ); | 389 | Q3TextStream t( &outFile ); |
390 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 390 | t.setEncoding( Q3TextStream::UnicodeUTF8 ); |
391 | Iterator it; | 391 | Iterator it; |
392 | KABC::VCardConverter::Version version; | 392 | KABC::VCardConverter::Version version; |
@@ -469,8 +469,8 @@ bool AddressBook::export2PhoneFormat( QStringList uids ,QString fileName ) | |||
469 | 469 | ||
470 | QFile outFile(fileName); | 470 | QFile outFile(fileName); |
471 | if ( outFile.open(IO_WriteOnly) ) { | 471 | if ( outFile.open(QIODevice::WriteOnly) ) { |
472 | datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" ); | 472 | datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" ); |
473 | QTextStream t( &outFile ); // use a text stream | 473 | Q3TextStream t( &outFile ); // use a text stream |
474 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 474 | t.setEncoding( Q3TextStream::UnicodeUTF8 ); |
475 | t <<datastream; | 475 | t <<datastream; |
476 | t << "\r\n\r\n"; | 476 | t << "\r\n\r\n"; |
@@ -491,5 +491,5 @@ int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo | |||
491 | KABC::Addressee::List list; | 491 | KABC::Addressee::List list; |
492 | QFile file( fileName ); | 492 | QFile file( fileName ); |
493 | file.open( IO_ReadOnly ); | 493 | file.open( QIODevice::ReadOnly ); |
494 | QByteArray rawData = file.readAll(); | 494 | QByteArray rawData = file.readAll(); |
495 | file.close(); | 495 | file.close(); |
@@ -635,5 +635,5 @@ void AddressBook::findNewExtIds( QString fileName, QString currentSyncDevice ) | |||
635 | KABC::Addressee::List list; | 635 | KABC::Addressee::List list; |
636 | QFile file( fileName ); | 636 | QFile file( fileName ); |
637 | file.open( IO_ReadOnly ); | 637 | file.open( QIODevice::ReadOnly ); |
638 | QByteArray rawData = file.readAll(); | 638 | QByteArray rawData = file.readAll(); |
639 | file.close(); | 639 | file.close(); |
@@ -1219,7 +1219,7 @@ void AddressBook::removeResources() | |||
1219 | { | 1219 | { |
1220 | //remove all possible resources. This should cleanup the configfile. | 1220 | //remove all possible resources. This should cleanup the configfile. |
1221 | QPtrList<KABC::Resource> mResources = resources(); | 1221 | Q3PtrList<KABC::Resource> mResources = resources(); |
1222 | 1222 | ||
1223 | QPtrListIterator<KABC::Resource> it(mResources); | 1223 | Q3PtrListIterator<KABC::Resource> it(mResources); |
1224 | for ( ; it.current(); ++it ) { | 1224 | for ( ; it.current(); ++it ) { |
1225 | KABC::Resource *res = it.current(); | 1225 | KABC::Resource *res = it.current(); |
@@ -1241,7 +1241,7 @@ bool AddressBook::removeResource( Resource *resource ) | |||
1241 | } | 1241 | } |
1242 | 1242 | ||
1243 | QPtrList<Resource> AddressBook::resources() | 1243 | Q3PtrList<Resource> AddressBook::resources() |
1244 | { | 1244 | { |
1245 | QPtrList<Resource> list; | 1245 | Q3PtrList<Resource> list; |
1246 | 1246 | ||
1247 | // qDebug("AddressBook::resources() 1"); | 1247 | // qDebug("AddressBook::resources() 1"); |