author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kabc/formats | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-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 | |||
@@ -8,7 +8,7 @@ INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcomp | |||
8 | OBJECTS_DIR = obj/$(PLATFORM) | 8 | OBJECTS_DIR = obj/$(PLATFORM) |
9 | MOC_DIR = moc | 9 | MOC_DIR = moc |
10 | DESTDIR = $(QPEDIR)/lib | 10 | DESTDIR = $(QPEDIR)/lib |
11 | LIBS += -lmicrokde -lmicrokabc | 11 | LIBS += -lxmicrokde -lxmicrokabc |
12 | LIBS += -L$(QPEDIR)/lib | 12 | LIBS += -L$(QPEDIR)/lib |
13 | DEFINES += KAB_EMBEDDED | 13 | DEFINES += KAB_EMBEDDED |
14 | 14 | ||
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 | |||
@@ -11,7 +11,7 @@ $Id$ | |||
11 | #include "addressee.h" | 11 | #include "addressee.h" |
12 | #include "vcardparser/vcardtool.h" | 12 | #include "vcardparser/vcardtool.h" |
13 | 13 | ||
14 | #include <qtextstream.h> | 14 | #include <q3textstream.h> |
15 | #include <qfile.h> | 15 | #include <qfile.h> |
16 | 16 | ||
17 | using namespace KABC; | 17 | using namespace KABC; |
@@ -37,8 +37,8 @@ bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file ) | |||
37 | qDebug("VCardFormatPlugin2::load"); | 37 | qDebug("VCardFormatPlugin2::load"); |
38 | QString data; | 38 | QString data; |
39 | 39 | ||
40 | QTextStream t( file ); | 40 | Q3TextStream t( file ); |
41 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 41 | t.setEncoding( Q3TextStream::UnicodeUTF8 ); |
42 | data = t.read(); | 42 | data = t.read(); |
43 | 43 | ||
44 | VCardTool tool; | 44 | VCardTool tool; |
@@ -58,8 +58,8 @@ bool VCardFormatPlugin2::loadAll( AddressBook *addressBook, Resource *resource, | |||
58 | qDebug("VCardFormatPlugin2::loadAll"); | 58 | qDebug("VCardFormatPlugin2::loadAll"); |
59 | QString data; | 59 | QString data; |
60 | 60 | ||
61 | QTextStream t( file ); | 61 | Q3TextStream t( file ); |
62 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 62 | t.setEncoding( Q3TextStream::UnicodeUTF8 ); |
63 | data = t.read(); | 63 | data = t.read(); |
64 | 64 | ||
65 | VCardTool tool; | 65 | VCardTool tool; |
@@ -86,8 +86,8 @@ void VCardFormatPlugin2::save( const Addressee &addressee, QFile *file ) | |||
86 | 86 | ||
87 | vcardlist.append( addressee ); | 87 | vcardlist.append( addressee ); |
88 | 88 | ||
89 | QTextStream t( file ); | 89 | Q3TextStream t( file ); |
90 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 90 | t.setEncoding( Q3TextStream::UnicodeUTF8 ); |
91 | t << tool.createVCards( vcardlist ); | 91 | t << tool.createVCards( vcardlist ); |
92 | } | 92 | } |
93 | 93 | ||
@@ -105,8 +105,8 @@ void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *fi | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | QTextStream t( file ); | 108 | Q3TextStream t( file ); |
109 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 109 | t.setEncoding( Q3TextStream::UnicodeUTF8 ); |
110 | t << tool.createVCards( vcardlist ); | 110 | t << tool.createVCards( vcardlist ); |
111 | } | 111 | } |
112 | 112 | ||
@@ -114,7 +114,7 @@ bool VCardFormatPlugin2::checkFormat( QFile *file ) const | |||
114 | { | 114 | { |
115 | QString line; | 115 | QString line; |
116 | 116 | ||
117 | file->readLine( line, 1024 ); | 117 | char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp; |
118 | line = line.stripWhiteSpace(); | 118 | line = line.stripWhiteSpace(); |
119 | if ( line == "BEGIN:VCARD" ) | 119 | if ( line == "BEGIN:VCARD" ) |
120 | return true; | 120 | return true; |