5 files changed, 12 insertions, 10 deletions
diff --git a/kabc/vcardparser/vcard.h b/kabc/vcardparser/vcard.h
index 0bee441..85b50e4 100644
--- a/kabc/vcardparser/vcard.h
+++ b/kabc/vcardparser/vcard.h
@@ -26,3 +26,3 @@
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
@@ -33,3 +33,3 @@ class VCard
   public:
-    typedef QValueList<VCard> List;
+    typedef Q3ValueList<VCard> List;
     typedef QMap< QString, VCardLine::List > LineMap;
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 8df2d32..c7254a0 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -21,2 +21,4 @@
 #include "vcardline.h"
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -45,3 +47,3 @@ VCardLine::VCardLine( const QString &identifier, const QString &value )
   mIdentifier = identifier;
-  mValue.assign( value.data(), value.length() );
+  mValue = value;
 }
@@ -88,3 +90,3 @@ void VCardLine::setValueString( const QString& value )
 }
-void VCardLine::setValueCString( const QCString& value )
+void VCardLine::setValueCString( const Q3CString& value )
 {
diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h
index 8dc9322..dc4bdec 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/kabc/vcardparser/vcardline.h
@@ -24,4 +24,4 @@
 #include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qcstring.h>
+#include <q3valuelist.h>
+#include <q3cstring.h>
 #include <qvariant.h>
@@ -35,3 +35,3 @@ class VCardLine
   public:
-    typedef QValueList<VCardLine> List;
+    typedef Q3ValueList<VCardLine> List;
     typedef QMap<QString, QStringList> ParamMap;
@@ -61,3 +61,3 @@ class VCardLine
     void setValueString( const QString& value );
-    void setValueCString( const QCString& value );
+    void setValueCString( const Q3CString& value );
     void setValueBytes( const QByteArray& value );
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 11622a0..a319531 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -220,3 +220,3 @@ QString VCardParser::createVCards( const VCard::List& list )
             else if ( encodingType == "quoted-printable" )
-              KCodecs::quotedPrintableEncode( input, output );
+              KCodecs::quotedPrintableEncode( input, output, true );
             textLine.append( ":" + QString( output ) );
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index 204326e..435c3b0 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -654,3 +654,3 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi
       QByteArray input;
-      QDataStream s( input, IO_WriteOnly );
+      QDataStream s( &input, QIODevice::WriteOnly );
       s.setVersion( 4 );