| -rw-r--r-- | kabc/formats/binary/kabcformat_binaryE.pro | 2 | ||||
| -rw-r--r-- | kabc/formats/vcardformatplugin2.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro index 2d9594d..c71197e 100644 --- a/kabc/formats/binary/kabcformat_binaryE.pro +++ b/kabc/formats/binary/kabcformat_binaryE.pro @@ -10,3 +10,3 @@ MOC_DIR = moc DESTDIR = $(QPEDIR)/lib -LIBS += -lmicrokde -lmicrokabc +LIBS += -lxmicrokde -lxmicrokabc LIBS += -L$(QPEDIR)/lib diff --git a/kabc/formats/vcardformatplugin2.cpp b/kabc/formats/vcardformatplugin2.cpp index 41b0c9a..fbebe92 100644 --- a/kabc/formats/vcardformatplugin2.cpp +++ b/kabc/formats/vcardformatplugin2.cpp @@ -13,3 +13,3 @@ $Id$ -#include <qtextstream.h> +#include <q3textstream.h> #include <qfile.h> @@ -39,4 +39,4 @@ bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file ) - QTextStream t( file ); - t.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream t( file ); + t.setEncoding( Q3TextStream::UnicodeUTF8 ); data = t.read(); @@ -60,4 +60,4 @@ bool VCardFormatPlugin2::loadAll( AddressBook *addressBook, Resource *resource, - QTextStream t( file ); - t.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream t( file ); + t.setEncoding( Q3TextStream::UnicodeUTF8 ); data = t.read(); @@ -88,4 +88,4 @@ void VCardFormatPlugin2::save( const Addressee &addressee, QFile *file ) - QTextStream t( file ); - t.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream t( file ); + t.setEncoding( Q3TextStream::UnicodeUTF8 ); t << tool.createVCards( vcardlist ); @@ -107,4 +107,4 @@ void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *fi - QTextStream t( file ); - t.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream t( file ); + t.setEncoding( Q3TextStream::UnicodeUTF8 ); t << tool.createVCards( vcardlist ); @@ -116,3 +116,3 @@ bool VCardFormatPlugin2::checkFormat( QFile *file ) const - file->readLine( line, 1024 ); + char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp; line = line.stripWhiteSpace(); |