initial public commit of qt4 portp1

110 files changed, 617 insertions, 455 deletions

diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index fa46499..33d358c 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/kabc/vcard/AdrParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -40,3 +42,3 @@ AdrParam::AdrParam(const AdrParam & x)
 
-AdrParam::AdrParam(const QCString & s)
+AdrParam::AdrParam(const Q3CString & s)
 	:	Param(s)
@@ -58,3 +60,3 @@ AdrParam::operator = (AdrParam & x)
 	AdrParam &
-AdrParam::operator = (const QCString & s)
+AdrParam::operator = (const Q3CString & s)
 {
@@ -79,3 +81,3 @@ AdrParam::operator == (AdrParam & x)
 	
-	QStrListIterator it(x.adrTypeList_);
+	Q3StrListIterator it(x.adrTypeList_);
 	
@@ -116,3 +118,3 @@ AdrParam::_assemble()
 	
-	QStrListIterator it(adrTypeList_);
+	Q3StrListIterator it(adrTypeList_);
 	
diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp
index 7ecef33..51ca12a 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/kabc/vcard/AdrValue.cpp
@@ -27,2 +27,5 @@
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3StrList>
+#include <Q3CString>
 
@@ -47,3 +50,3 @@ AdrValue::AdrValue(const AdrValue & x)
 
-AdrValue::AdrValue(const QCString & s)
+AdrValue::AdrValue(const Q3CString & s)
 	:	Value(s)
@@ -70,3 +73,3 @@ AdrValue::operator = (AdrValue & x)
 	AdrValue &
-AdrValue::operator = (const QCString & s)
+AdrValue::operator = (const Q3CString & s)
 {
@@ -107,3 +110,3 @@ AdrValue::_parse()
 
-	QStrList l;
+	Q3StrList l;
 	RTokenise(strRep_, ";", l);
diff --git a/kabc/vcard/AgentParam.cpp b/kabc/vcard/AgentParam.cpp
index 5625e00..aae35ac 100644
--- a/kabc/vcard/AgentParam.cpp
+++ b/kabc/vcard/AgentParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -41,3 +43,3 @@ AgentParam::AgentParam(const AgentParam & x)
 
-AgentParam::AgentParam(const QCString & s)
+AgentParam::AgentParam(const Q3CString & s)
 	:	Param(s)
@@ -59,3 +61,3 @@ AgentParam::operator = (AgentParam & x)
 	AgentParam &
-AgentParam::operator = (const QCString & s)
+AgentParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/AgentValue.cpp b/kabc/vcard/AgentValue.cpp
index bccde80..14e73b1 100644
--- a/kabc/vcard/AgentValue.cpp
+++ b/kabc/vcard/AgentValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ AgentValue::AgentValue(const AgentValue & x)
 
-AgentValue::AgentValue(const QCString & s)
+AgentValue::AgentValue(const Q3CString & s)
 	:	Value(s)
@@ -54,3 +56,3 @@ AgentValue::operator = (AgentValue & x)
 	AgentValue &
-AgentValue::operator = (const QCString & s)
+AgentValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/ClassValue.cpp b/kabc/vcard/ClassValue.cpp
index f01e5a6..c088d7c 100644
--- a/kabc/vcard/ClassValue.cpp
+++ b/kabc/vcard/ClassValue.cpp
@@ -28,2 +28,4 @@
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -42,3 +44,3 @@ ClassValue::ClassValue(const ClassValue & x)
 
-ClassValue::ClassValue(const QCString & s)
+ClassValue::ClassValue(const Q3CString & s)
 	:	Value(s)
@@ -60,3 +62,3 @@ ClassValue::operator = (ClassValue & x)
 	ClassValue &
-ClassValue::operator = (const QCString & s)
+ClassValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 0a2f97d..1d4886c 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -23,4 +23,4 @@
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 #include <qregexp.h>
@@ -100,3 +100,3 @@ ContentLine::ContentLine(const ContentLine & x)
 
-ContentLine::ContentLine(const QCString & s)
+ContentLine::ContentLine(const Q3CString & s)
 	:	Entity(s),
@@ -131,3 +131,3 @@ ContentLine::operator = (ContentLine & x)
 	ContentLine &
-ContentLine::operator = (const QCString & s)
+ContentLine::operator = (const Q3CString & s)
 {
@@ -144,3 +144,3 @@ ContentLine::operator == (ContentLine & x)
 
-	QPtrListIterator<Param> it(x.paramList());
+	Q3PtrListIterator<Param> it(x.paramList());
 
@@ -165,7 +165,7 @@ ContentLine::_parse()
     // NLR
-    strRep_ = strRep_.replace( QRegExp( "\\r" ), "" );
+    strRep_ = strRep_.replace( "\\r" , "" );
 	// Unqote newlines	
-	strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
+	strRep_ = strRep_.replace( "\\\\n", "\n" );
     //NLR
-	strRep_ = strRep_.replace( QRegExp( "\\\\r" ), "\r" );
+	strRep_ = strRep_.replace( "\\\\r" , "\r" );
 
@@ -178,4 +178,4 @@ ContentLine::_parse()
 
-	QCString firstPart(strRep_.left(split));
-	QCString valuePart(strRep_.mid(split + 1));
+	Q3CString firstPart(strRep_.left(split));
+	Q3CString valuePart(strRep_.mid(split + 1));
 
@@ -194,3 +194,3 @@ ContentLine::_parse()
 
-	QStrList l;
+	Q3StrList l;
 
@@ -216,3 +216,3 @@ ContentLine::_parse()
 
-	QStrListIterator it(l);
+	Q3StrListIterator it(l);
 
@@ -220,3 +220,3 @@ ContentLine::_parse()
 
-		QCString str = *it;
+		Q3CString str = *it;
 
@@ -228,9 +228,9 @@ ContentLine::_parse()
 
-		QCString paraName = str.left(split);
-		QCString paraValue = str.mid(split + 1);
+		Q3CString paraName = str.left(split);
+		Q3CString paraValue = str.mid(split + 1);
 
-		QStrList paraValues;
+		Q3StrList paraValues;
 		RTokenise(paraValue, ",", paraValues);
 
-		QStrListIterator it2( paraValues );
+		Q3StrListIterator it2( paraValues );
 
@@ -311,3 +311,3 @@ ContentLine::_assemble()
 
-	QCString line;
+	Q3CString line;
 
diff --git a/kabc/vcard/DateParam.cpp b/kabc/vcard/DateParam.cpp
index 52af089..52fb828 100644
--- a/kabc/vcard/DateParam.cpp
+++ b/kabc/vcard/DateParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ DateParam::DateParam(const DateParam & x)
 
-DateParam::DateParam(const QCString & s)
+DateParam::DateParam(const Q3CString & s)
 	:	Param(s)
@@ -54,3 +56,3 @@ DateParam::operator = (DateParam & x)
 	DateParam &
-DateParam::operator = (const QCString & s)
+DateParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index c5c5c85..87c7007 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/kabc/vcard/DateValue.cpp
@@ -24,2 +24,4 @@
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -107,3 +109,3 @@ DateValue::DateValue(const DateValue & x)
 
-DateValue::DateValue(const QCString & s)
+DateValue::DateValue(const Q3CString & s)
 	:	Value(s)
@@ -122,3 +124,3 @@ DateValue::operator = (DateValue & x)
 	DateValue &
-DateValue::operator = (const QCString & s)
+DateValue::operator = (const Q3CString & s)
 {
@@ -156,4 +158,4 @@ DateValue::_parse()
 	
-	QCString dateStr;
-	QCString timeStr;
+	Q3CString dateStr;
+	Q3CString timeStr;
 	
@@ -175,3 +177,3 @@ DateValue::_parse()
 	
-	dateStr.replace(QRegExp("-"), "");
+	dateStr.replace("-", "");
 
@@ -198,3 +200,3 @@ DateValue::_parse()
 		
-		QCString zoneStr(timeStr.mid(zoneSep + 1));
+		Q3CString zoneStr(timeStr.mid(zoneSep + 1));
 		vDebug("zoneStr == " + zoneStr);
@@ -213,3 +215,3 @@ DateValue::_parse()
 	if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
-		QCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
+		Q3CString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
 		secFrac_ = quirkafleeg.toDouble();
@@ -219,3 +221,3 @@ DateValue::_parse()
 
-	timeStr.replace(QRegExp(":"), "");
+	timeStr.replace(":", "");
 	
@@ -231,5 +233,5 @@ DateValue::_assemble()
 
-	QCString year;
-	QCString month;
-	QCString day;
+	Q3CString year;
+	Q3CString month;
+	Q3CString day;
 	
@@ -245,5 +247,5 @@ DateValue::_assemble()
 	if ( hasTime_ ) {
-	    QCString hour;
-	    QCString minute;
-	    QCString second;
+	    Q3CString hour;
+	    Q3CString minute;
+	    Q3CString second;
 
diff --git a/kabc/vcard/EmailParam.cpp b/kabc/vcard/EmailParam.cpp
index 8c87477..877af60 100644
--- a/kabc/vcard/EmailParam.cpp
+++ b/kabc/vcard/EmailParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -42,3 +44,3 @@ EmailParam::EmailParam(const EmailParam & x)
 
-EmailParam::EmailParam(const QCString & s)
+EmailParam::EmailParam(const Q3CString & s)
 	:	Param(s)
@@ -60,3 +62,3 @@ EmailParam::operator = (EmailParam & x)
 	EmailParam &
-EmailParam::operator = (const QCString & s)
+EmailParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/Entity.cpp b/kabc/vcard/Entity.cpp
index b7d09e0..e38fa11 100644
--- a/kabc/vcard/Entity.cpp
+++ b/kabc/vcard/Entity.cpp
@@ -24,2 +24,4 @@
 #include <VCardEntity.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -42,3 +44,3 @@ Entity::Entity(const Entity & e)
 		
-Entity::Entity(const QCString & s)
+Entity::Entity(const Q3CString & s)
 	:	strRep_		(s),
@@ -63,3 +65,3 @@ Entity::operator = (const Entity & e)
 	Entity &
-Entity::operator = (const QCString & s)
+Entity::operator = (const Q3CString & s)
 {
@@ -85,3 +87,3 @@ Entity::operator != (Entity & e)
 	bool
-Entity::operator == (const QCString & s)
+Entity::operator == (const Q3CString & s)
 {
@@ -91,3 +93,3 @@ Entity::operator == (const QCString & s)
 	bool
-Entity::operator != (const QCString & s)
+Entity::operator != (const Q3CString & s)
 {
@@ -101,3 +103,3 @@ Entity::~Entity()
 		
-	QCString
+	Q3CString
 Entity::asString()
diff --git a/kabc/vcard/Enum.cpp b/kabc/vcard/Enum.cpp
index cc48b5a..036324c 100644
--- a/kabc/vcard/Enum.cpp
+++ b/kabc/vcard/Enum.cpp
@@ -23,3 +23,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <ctype.h>
@@ -31,3 +31,3 @@ using namespace VCARD;
 // There are 31 possible types, not including extensions.
-	const QCString
+	const Q3CString
 VCARD::paramNames [] =
@@ -224,3 +224,3 @@ VCARD::EntityTypeToValueType(EntityType e)
 
-	QCString
+	Q3CString
 VCARD::EntityTypeToParamName(EntityType e)
@@ -232,3 +232,3 @@ VCARD::EntityTypeToParamName(EntityType e)
 	EntityType
-VCARD::EntityNameToEntityType(const QCString & s)
+VCARD::EntityNameToEntityType(const Q3CString & s)
 {
diff --git a/kabc/vcard/FloatValue.cpp b/kabc/vcard/FloatValue.cpp
index 15bb664..7065081 100644
--- a/kabc/vcard/FloatValue.cpp
+++ b/kabc/vcard/FloatValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -47,3 +49,3 @@ FloatValue::FloatValue(const FloatValue & x)
 
-FloatValue::FloatValue(const QCString & s)
+FloatValue::FloatValue(const Q3CString & s)
 	:	Value(s)
@@ -65,3 +67,3 @@ FloatValue::operator = (FloatValue & x)
 	FloatValue &
-FloatValue::operator = (const QCString & s)
+FloatValue::operator = (const Q3CString & s)
 {
@@ -103,3 +105,3 @@ FloatValue::_assemble()
 {
-	strRep_ = QCString().setNum(value_);
+	strRep_ = Q3CString().setNum(value_);
 }
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index e02b402..ba57a6b 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -25,2 +25,4 @@
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -38,3 +40,3 @@ GeoValue::GeoValue(const GeoValue & x)
 
-GeoValue::GeoValue(const QCString & s)
+GeoValue::GeoValue(const Q3CString & s)
 	:	Value(s)
@@ -56,3 +58,3 @@ GeoValue::operator = (GeoValue & x)
 	GeoValue &
-GeoValue::operator = (const QCString & s)
+GeoValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/ImageParam.cpp b/kabc/vcard/ImageParam.cpp
index c9cf6fd..6da317d 100644
--- a/kabc/vcard/ImageParam.cpp
+++ b/kabc/vcard/ImageParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ ImageParam::ImageParam(const ImageParam & x)
 
-ImageParam::ImageParam(const QCString & s)
+ImageParam::ImageParam(const Q3CString & s)
 	:	Param(s)
@@ -54,3 +56,3 @@ ImageParam::operator = (ImageParam & x)
 	ImageParam &
-ImageParam::operator = (const QCString & s)
+ImageParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/ImageValue.cpp b/kabc/vcard/ImageValue.cpp
index 4630fac..678a81c 100644
--- a/kabc/vcard/ImageValue.cpp
+++ b/kabc/vcard/ImageValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ ImageValue::ImageValue(const ImageValue & x)
 
-ImageValue::ImageValue(const QCString & s)
+ImageValue::ImageValue(const Q3CString & s)
 	:	Value(s)
@@ -54,3 +56,3 @@ ImageValue::operator = (ImageValue & x)
 	ImageValue &
-ImageValue::operator = (const QCString & s)
+ImageValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/ImgValue.cpp b/kabc/vcard/ImgValue.cpp
index 7b961f8..1b289df 100644
--- a/kabc/vcard/ImgValue.cpp
+++ b/kabc/vcard/ImgValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ ImgValue::ImgValue(const ImgValue & x)
 
-ImgValue::ImgValue(const QCString & s)
+ImgValue::ImgValue(const Q3CString & s)
 	:	Value(s)
@@ -54,3 +56,3 @@ ImgValue::operator = (ImgValue & x)
 	ImgValue &
-ImgValue::operator = (const QCString & s)
+ImgValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp
index edf1804..52a0204 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/kabc/vcard/LangValue.cpp
@@ -28,2 +28,5 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3StrList>
 
@@ -41,3 +44,3 @@ LangValue::LangValue(const LangValue & x)
 
-LangValue::LangValue(const QCString & s)
+LangValue::LangValue(const Q3CString & s)
 	:	Value(s)
@@ -56,3 +59,3 @@ LangValue::operator = (LangValue & x)
 	LangValue &
-LangValue::operator = (const QCString & s)
+LangValue::operator = (const Q3CString & s)
 {
@@ -76,3 +79,3 @@ LangValue::_parse()
 {
-	QStrList l;
+	Q3StrList l;
 	RTokenise(strRep_, "-", l);
@@ -93,9 +96,10 @@ LangValue::_assemble()
 	
-	QStrListIterator it(subtags_);
+	Q3StrListIterator it(subtags_);
 	
-	for (; it.current(); ++it)
-		strRep_ += QCString('-') + it.current();
+	for (; it.current(); ++it) {
+		strRep_ += Q3CString('-'); strRep_ += it.current();
+	}
 }
 
-	QCString
+	Q3CString
 LangValue::primary()
@@ -106,3 +110,3 @@ LangValue::primary()
 	
-	QStrList
+	Q3StrList
 LangValue::subtags()
@@ -114,3 +118,3 @@ LangValue::subtags()
 	void
-LangValue::setPrimary(const QCString & s)
+LangValue::setPrimary(const Q3CString & s)
 {
@@ -121,3 +125,3 @@ LangValue::setPrimary(const QCString & s)
 	void
-LangValue::setSubTags(const QStrList & l)
+LangValue::setSubTags(const Q3StrList & l)
 {
diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp
index cdec621..6c0f365 100644
--- a/kabc/vcard/NValue.cpp
+++ b/kabc/vcard/NValue.cpp
@@ -23,3 +23,5 @@
 
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -48,3 +50,3 @@ NValue::NValue(const NValue & x)
 
-NValue::NValue(const QCString & s)
+NValue::NValue(const Q3CString & s)
 	:	Value(s)
@@ -70,3 +72,3 @@ NValue::operator = (NValue & x)
 	NValue &
-NValue::operator = (const QCString & s)
+NValue::operator = (const Q3CString & s)
 {
@@ -102,3 +104,3 @@ NValue::_parse()
 {
-	QStrList l;
+	Q3StrList l;
 	RTokenise(strRep_, ";", l);
diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp
index c3134c8..a6a32dd 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/kabc/vcard/OrgValue.cpp
@@ -28,2 +28,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -41,3 +43,3 @@ OrgValue::OrgValue(const OrgValue & x)
 
-OrgValue::OrgValue(const QCString & s)
+OrgValue::OrgValue(const Q3CString & s)
 	:	Value(s)
@@ -56,3 +58,3 @@ OrgValue::operator = (OrgValue & x)
 	OrgValue &
-OrgValue::operator = (const QCString & s)
+OrgValue::operator = (const Q3CString & s)
 {
@@ -84,3 +86,3 @@ OrgValue::_assemble()
 	
-	QStrListIterator it(valueList_);
+	Q3StrListIterator it(valueList_);
 	
@@ -100,3 +102,3 @@ OrgValue::numValues()
 
-	QCString
+	Q3CString
 OrgValue::value(unsigned int i)
diff --git a/kabc/vcard/Param.cpp b/kabc/vcard/Param.cpp
index c513613..bd6b299 100644
--- a/kabc/vcard/Param.cpp
+++ b/kabc/vcard/Param.cpp
@@ -28,2 +28,4 @@
 #include <VCardRToken.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -45,3 +47,3 @@ Param::Param(const Param & x)
 
-Param::Param(const QCString & s)
+Param::Param(const Q3CString & s)
 	:	Entity(s),
@@ -65,3 +67,3 @@ Param::operator = (Param & x)
 	Param &
-Param::operator = (const QCString & s)
+Param::operator = (const Q3CString & s)
 {
@@ -93,3 +95,3 @@ Param::_assemble()
 
-Param::Param(const QCString &name, const QCString &value)
+Param::Param(const Q3CString &name, const Q3CString &value)
 	:	Entity(),
@@ -103,3 +105,3 @@ Param::Param(const QCString &name, const QCString &value)
 	void
-Param::setName(const QCString & name)
+Param::setName(const Q3CString & name)
 {
@@ -111,3 +113,3 @@ Param::setName(const QCString & name)
 	void
-Param::setValue(const QCString & value)
+Param::setValue(const Q3CString & value)
 {
@@ -118,3 +120,3 @@ Param::setValue(const QCString & value)
 
-	QCString
+	Q3CString
 Param::name()
@@ -124,3 +126,3 @@ Param::name()
 
-	QCString
+	Q3CString
 Param::value()
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/kabc/vcard/PhoneNumberValue.cpp
index 17b1400..57aa336 100644
--- a/kabc/vcard/PhoneNumberValue.cpp
+++ b/kabc/vcard/PhoneNumberValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ PhoneNumberValue::PhoneNumberValue(const PhoneNumberValue & x)
 
-PhoneNumberValue::PhoneNumberValue(const QCString & s)
+PhoneNumberValue::PhoneNumberValue(const Q3CString & s)
 	:	Value(s)
@@ -54,3 +56,3 @@ PhoneNumberValue::operator = (PhoneNumberValue & x)
 	PhoneNumberValue &
-PhoneNumberValue::operator = (const QCString & s)
+PhoneNumberValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index 2a85820..8fc0558 100644
--- a/kabc/vcard/RToken.cpp
+++ b/kabc/vcard/RToken.cpp
@@ -26,4 +26,4 @@
 #include <stddef.h>
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
@@ -33,3 +33,3 @@ namespace VCARD
 	Q_UINT32
-RTokenise(const char * str, const char * delim, QStrList & l)
+RTokenise(const char * str, const char * delim, Q3StrList & l)
 {
diff --git a/kabc/vcard/SoundValue.cpp b/kabc/vcard/SoundValue.cpp
index 81040d1..4d098d2 100644
--- a/kabc/vcard/SoundValue.cpp
+++ b/kabc/vcard/SoundValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ SoundValue::SoundValue(const SoundValue & x)
 
-SoundValue::SoundValue(const QCString & s)
+SoundValue::SoundValue(const Q3CString & s)
 	:	Value(s)
@@ -54,3 +56,3 @@ SoundValue::operator = (SoundValue & x)
 	SoundValue &
-SoundValue::operator = (const QCString & s)
+SoundValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp
index cd51cbd..8f02113 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -43,3 +45,3 @@ SourceParam::SourceParam(const SourceParam & x)
 
-SourceParam::SourceParam(const QCString & s)
+SourceParam::SourceParam(const Q3CString & s)
 	:	Param(s),
@@ -62,3 +64,3 @@ SourceParam::operator = (SourceParam & x)
 	SourceParam &
-SourceParam::operator = (const QCString & s)
+SourceParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/TelParam.cpp b/kabc/vcard/TelParam.cpp
index 9d9fe4d..4bc8b6a 100644
--- a/kabc/vcard/TelParam.cpp
+++ b/kabc/vcard/TelParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ TelParam::TelParam(const TelParam & x)
 
-TelParam::TelParam(const QCString & s)
+TelParam::TelParam(const Q3CString & s)
 	:	Param(s)
@@ -54,3 +56,3 @@ TelParam::operator = (TelParam & x)
 	TelParam &
-TelParam::operator = (const QCString & s)
+TelParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/TelValue.cpp b/kabc/vcard/TelValue.cpp
index 349f99a..d9cbf3e 100644
--- a/kabc/vcard/TelValue.cpp
+++ b/kabc/vcard/TelValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ TelValue::TelValue(const TelValue & x)
 
-TelValue::TelValue(const QCString & s)
+TelValue::TelValue(const Q3CString & s)
 	:	Value(s)
@@ -54,3 +56,3 @@ TelValue::operator = (TelValue & x)
 	TelValue &
-TelValue::operator = (const QCString & s)
+TelValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/TextBinParam.cpp b/kabc/vcard/TextBinParam.cpp
index 66f2946..2866c12 100644
--- a/kabc/vcard/TextBinParam.cpp
+++ b/kabc/vcard/TextBinParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ TextBinParam::TextBinParam(const TextBinParam & x)
 
-TextBinParam::TextBinParam(const QCString & s)
+TextBinParam::TextBinParam(const Q3CString & s)
 	:	Param(s)
@@ -54,3 +56,3 @@ TextBinParam::operator = (TextBinParam & x)
 	TextBinParam &
-TextBinParam::operator = (const QCString & s)
+TextBinParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/TextBinValue.cpp b/kabc/vcard/TextBinValue.cpp
index c584009..a3a96ae 100644
--- a/kabc/vcard/TextBinValue.cpp
+++ b/kabc/vcard/TextBinValue.cpp
@@ -27,2 +27,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -43,3 +45,3 @@ TextBinValue::TextBinValue(const TextBinValue & x)
 
-TextBinValue::TextBinValue(const QCString & s)
+TextBinValue::TextBinValue(const Q3CString & s)
 	:	Value(s)
@@ -62,3 +64,3 @@ TextBinValue::operator = (TextBinValue & x)
 	TextBinValue &
-TextBinValue::operator = (const QCString & s)
+TextBinValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp
index c4ac1e3..919f4f7 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/kabc/vcard/TextListValue.cpp
@@ -28,2 +28,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -41,3 +43,3 @@ TextListValue::TextListValue(const TextListValue & x)
 
-TextListValue::TextListValue(const QCString & s)
+TextListValue::TextListValue(const Q3CString & s)
 	:	Value(s)
@@ -56,3 +58,3 @@ TextListValue::operator = (TextListValue & x)
 	TextListValue &
-TextListValue::operator = (const QCString & s)
+TextListValue::operator = (const Q3CString & s)
 {
@@ -84,3 +86,3 @@ TextListValue::_assemble()
 	
-	QStrListIterator it(valueList_);
+	Q3StrListIterator it(valueList_);
 	
@@ -100,3 +102,3 @@ TextListValue::numValues()
 
-	QCString
+	Q3CString
 TextListValue::value(unsigned int i)
diff --git a/kabc/vcard/TextParam.cpp b/kabc/vcard/TextParam.cpp
index 7c68700..ce6661f 100644
--- a/kabc/vcard/TextParam.cpp
+++ b/kabc/vcard/TextParam.cpp
@@ -26,2 +26,4 @@
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ TextParam::TextParam(const TextParam & x)
 
-TextParam::TextParam(const QCString & s)
+TextParam::TextParam(const Q3CString & s)
 	:	Param(s)
@@ -54,3 +56,3 @@ TextParam::operator = (TextParam & x)
 	TextParam &
-TextParam::operator = (const QCString & s)
+TextParam::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/TextValue.cpp b/kabc/vcard/TextValue.cpp
index 09934fa..d0d2996 100644
--- a/kabc/vcard/TextValue.cpp
+++ b/kabc/vcard/TextValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -39,3 +41,3 @@ TextValue::TextValue(const TextValue & x)
 
-TextValue::TextValue(const QCString & s)
+TextValue::TextValue(const Q3CString & s)
 	:	Value(s)
@@ -54,3 +56,3 @@ TextValue::operator = (TextValue & x)
 	TextValue &
-TextValue::operator = (const QCString & s)
+TextValue::operator = (const Q3CString & s)
 {
@@ -63,3 +65,3 @@ TextValue::operator == (TextValue & x)
 {
-	return strRep_ = x.strRep_;
+	return strRep_ == x.strRep_;
 }
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index c1d1022..26da7f4 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -34,3 +36,3 @@ URIValue::URIValue()
 
-URIValue::URIValue(const QCString & scheme, const QCString & schemeSpecificPart)
+URIValue::URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart)
 	:	Value(),
@@ -49,3 +51,3 @@ URIValue::URIValue(const URIValue & x)
 
-URIValue::URIValue(const QCString & s)
+URIValue::URIValue(const Q3CString & s)
 	:	Value(s)
@@ -67,3 +69,3 @@ URIValue::operator = (URIValue & x)
 	URIValue &
-URIValue::operator = (const QCString & s)
+URIValue::operator = (const Q3CString & s)
 {
@@ -105,3 +107,3 @@ URIValue::_assemble()
 
-	QCString
+	Q3CString
 URIValue::scheme()
@@ -112,3 +114,3 @@ URIValue::scheme()
 
-	QCString
+	Q3CString
 URIValue::schemeSpecificPart()
@@ -120,3 +122,3 @@ URIValue::schemeSpecificPart()
 	void
-URIValue::setScheme(const QCString & s)
+URIValue::setScheme(const Q3CString & s)
 {
@@ -127,3 +129,3 @@ URIValue::setScheme(const QCString & s)
 	void
-URIValue::setSchemeSpecificPart(const QCString & s)
+URIValue::setSchemeSpecificPart(const Q3CString & s)
 {
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 374306c..f35d986 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -26,2 +26,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -40,3 +42,3 @@ UTCValue::UTCValue(const UTCValue & x)
 
-UTCValue::UTCValue(const QCString & s)
+UTCValue::UTCValue(const Q3CString & s)
 	:	Value(s)
@@ -59,3 +61,3 @@ UTCValue::operator = (UTCValue & x)
 	UTCValue &
-UTCValue::operator = (const QCString & s)
+UTCValue::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index a2ff327..bae5385 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -25,2 +25,4 @@
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -43,3 +45,3 @@ VCardEntity::VCardEntity(const VCardEntity & x)
 
-VCardEntity::VCardEntity(const QCString & s)
+VCardEntity::VCardEntity(const Q3CString & s)
 	:	Entity(s)
@@ -59,3 +61,3 @@ VCardEntity::operator = (VCardEntity & x)
 	VCardEntity &
-VCardEntity::operator = (const QCString & s)
+VCardEntity::operator = (const Q3CString & s)
 {
@@ -85,3 +87,3 @@ VCardEntity::_parse()
 	vDebug("parse");
-	QCString s(strRep_);
+	Q3CString s(strRep_);
 
@@ -93,3 +95,3 @@ VCardEntity::_parse()
 
-		QCString cardStr(s.left(i));
+		Q3CString cardStr(s.left(i));
 
@@ -134,3 +136,3 @@ VCardEntity::_parse()
             char* dat = strRep_.data()+start;
-            VCard * v = new VCard( QCString (  dat,i-start ) );
+            VCard * v = new VCard( Q3CString (  dat,i-start ) );
             start = i;
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp
index bad2ef1..5dd675d 100644
--- a/kabc/vcard/VCardv.cpp
+++ b/kabc/vcard/VCardv.cpp
@@ -23,7 +23,7 @@
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 #include <qstringlist.h>
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
@@ -50,3 +50,3 @@ VCard::VCard(const VCard & x)
 
-  QPtrListIterator<ContentLine> it(x.contentLineList_);
+  Q3PtrListIterator<ContentLine> it(x.contentLineList_);
   for (; it.current(); ++it) {
@@ -58,3 +58,3 @@ VCard::VCard(const VCard & x)
 
-VCard::VCard(const QCString & s)
+VCard::VCard(const Q3CString & s)
 	:	Entity(s)
@@ -70,3 +70,3 @@ VCard::operator = (VCard & x)
 	group_				= x.group();
-    QPtrListIterator<ContentLine> it(x.contentLineList_);
+    Q3PtrListIterator<ContentLine> it(x.contentLineList_);
     for (; it.current(); ++it) {
@@ -81,3 +81,3 @@ VCard::operator = (VCard & x)
 	VCard &
-VCard::operator = (const QCString & s)
+VCard::operator = (const Q3CString & s)
 {
@@ -103,3 +103,3 @@ VCard::_parse()
 	QStringList l;
-	QStrList sl;
+	Q3StrList sl;
 
@@ -111,3 +111,4 @@ VCard::_parse()
 	}
-    l = QStringList::fromStrList( sl );
+    for(Q3StrList::iterator i=sl.begin();i!=sl.end();++i)
+	l.push_back(*i);
 	// Get the first line
@@ -182,3 +183,3 @@ VCard::_parse()
 	for (; it2 != refolded.end(); ++it2) {
-		ContentLine * cl = new ContentLine(QCString((*it2).latin1()));
+		ContentLine * cl = new ContentLine(Q3CString((*it2).latin1()));
 		cl->parse();
@@ -230,3 +231,3 @@ VCard::_assemble()
 
-	QPtrListIterator<ContentLine> it(contentLineList_);
+	Q3PtrListIterator<ContentLine> it(contentLineList_);
 
@@ -246,3 +247,3 @@ VCard::has(EntityType t)
 	bool
-VCard::has(const QCString & s)
+VCard::has(const Q3CString & s)
 {
@@ -261,3 +262,3 @@ VCard::add(const ContentLine & cl)
 	void
-VCard::add(const QCString & s)
+VCard::add(const Q3CString & s)
 {
@@ -272,3 +273,3 @@ VCard::contentLine(EntityType t)
 	parse();
-	QPtrListIterator<ContentLine> it(contentLineList_);
+	Q3PtrListIterator<ContentLine> it(contentLineList_);
 
@@ -282,6 +283,6 @@ VCard::contentLine(EntityType t)
 	ContentLine *
-VCard::contentLine(const QCString & s)
+VCard::contentLine(const Q3CString & s)
 {
 	parse();
-	QPtrListIterator<ContentLine> it(contentLineList_);
+	Q3PtrListIterator<ContentLine> it(contentLineList_);
 
diff --git a/kabc/vcard/Value.cpp b/kabc/vcard/Value.cpp
index 1978af2..3a4d406 100644
--- a/kabc/vcard/Value.cpp
+++ b/kabc/vcard/Value.cpp
@@ -25,2 +25,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -38,3 +40,3 @@ Value::Value(const Value & x)
 
-Value::Value(const QCString & s)
+Value::Value(const Q3CString & s)
 	:	Entity(s)
@@ -53,3 +55,3 @@ Value::operator = (Value & x)
 	Value &
-Value::operator = (const QCString & s)
+Value::operator = (const Q3CString & s)
 {
diff --git a/kabc/vcard/include/VCardAdrParam.h b/kabc/vcard/include/VCardAdrParam.h
index 89dcb64..6456624 100644
--- a/kabc/vcard/include/VCardAdrParam.h
+++ b/kabc/vcard/include/VCardAdrParam.h
@@ -26,4 +26,4 @@
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
@@ -39,12 +39,12 @@ class AdrParam : public Param
 	
-	QStrList adrTypeList()
+	Q3StrList adrTypeList()
 	{ parse(); return adrTypeList_; }
 	
-	QCString textParam()
+	Q3CString textParam()
 	{ parse(); return textParam_; }
 	
-	void setAdrTypeList(const QStrList & l)
+	void setAdrTypeList(const Q3StrList & l)
 	{ adrTypeList_ = l; assembled_ = false; }
 	
-	void setTextParam(const QCString & s)
+	void setTextParam(const Q3CString & s)
 	{ textParam_ = s; assembled_ = false; }
@@ -58,4 +58,4 @@ class AdrParam : public Param
 		
-		QStrList	adrTypeList_;
-		QCString	textParam_;
+		Q3StrList	adrTypeList_;
+		Q3CString	textParam_;
 };
diff --git a/kabc/vcard/include/VCardAdrValue.h b/kabc/vcard/include/VCardAdrValue.h
index 0731924..14ddb02 100644
--- a/kabc/vcard/include/VCardAdrValue.h
+++ b/kabc/vcard/include/VCardAdrValue.h
@@ -26,3 +26,5 @@
 
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardValue.h>
@@ -39,30 +41,30 @@ class AdrValue : public Value
 	
-	void setPOBox(const QCString & s)
+	void setPOBox(const Q3CString & s)
 	{ poBox_ = s; assembled_ = false; }
 	
-	void setExtAddress(const QCString & s)
+	void setExtAddress(const Q3CString & s)
 	{ extAddress_ = s; assembled_ = false; }
 
-	void setStreet(const QCString & s)
+	void setStreet(const Q3CString & s)
 	{ street_ = s; assembled_ = false; }
 
-	void setLocality(const QCString & s)
+	void setLocality(const Q3CString & s)
 	{ locality_ = s; assembled_ = false; }
 
-	void setRegion(const QCString & s)
+	void setRegion(const Q3CString & s)
 	{ region_ = s; assembled_ = false; }
 
-	void setPostCode(const QCString & s)
+	void setPostCode(const Q3CString & s)
 	{ postCode_ = s; assembled_ = false; }
 	
-	void setCountryName(const QCString & s)
+	void setCountryName(const Q3CString & s)
 	{ countryName_ = s; assembled_ = false; }
 	
-	QCString poBox()	{ parse(); return poBox_;	}
-	QCString extAddress()	{ parse(); return extAddress_;	}
-	QCString street()	{ parse(); return street_;	}
-	QCString locality()	{ parse(); return locality_;	}
-	QCString region()	{ parse(); return region_;	}
-	QCString postCode()	{ parse(); return postCode_;	}
-	QCString countryName()	{ parse(); return countryName_;	}
+	Q3CString poBox()	{ parse(); return poBox_;	}
+	Q3CString extAddress()	{ parse(); return extAddress_;	}
+	Q3CString street()	{ parse(); return street_;	}
+	Q3CString locality()	{ parse(); return locality_;	}
+	Q3CString region()	{ parse(); return region_;	}
+	Q3CString postCode()	{ parse(); return postCode_;	}
+	Q3CString countryName()	{ parse(); return countryName_;	}
 	
@@ -70,9 +72,9 @@ class AdrValue : public Value
 		
-		QCString poBox_;
-		QCString extAddress_;
-		QCString street_;
-		QCString locality_;
-		QCString region_;
-		QCString postCode_;
-		QCString countryName_;
+		Q3CString poBox_;
+		Q3CString extAddress_;
+		Q3CString street_;
+		Q3CString locality_;
+		Q3CString region_;
+		Q3CString postCode_;
+		Q3CString countryName_;
 };
diff --git a/kabc/vcard/include/VCardAgentParam.h b/kabc/vcard/include/VCardAgentParam.h
index 72a05db..5733540 100644
--- a/kabc/vcard/include/VCardAgentParam.h
+++ b/kabc/vcard/include/VCardAgentParam.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
@@ -48,3 +48,3 @@ class AgentParam : public Param
 
-	void setURI(const QCString & s)
+	void setURI(const Q3CString & s)
 	{ uri_ = s; assembled_ = false; }
diff --git a/kabc/vcard/include/VCardAgentValue.h b/kabc/vcard/include/VCardAgentValue.h
index f655836..b0d883b 100644
--- a/kabc/vcard/include/VCardAgentValue.h
+++ b/kabc/vcard/include/VCardAgentValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardClassValue.h b/kabc/vcard/include/VCardClassValue.h
index ff133c2..c450169 100644
--- a/kabc/vcard/include/VCardClassValue.h
+++ b/kabc/vcard/include/VCardClassValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardContentLine.h b/kabc/vcard/include/VCardContentLine.h
index 1c5f5be..c3c5253 100644
--- a/kabc/vcard/include/VCardContentLine.h
+++ b/kabc/vcard/include/VCardContentLine.h
@@ -26,3 +26,5 @@
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -41,4 +43,4 @@ class ContentLine : public Entity
 	
-	QCString	group()		{ parse(); return group_;	}
-	QCString	name()		{ parse(); return name_;	}
+	Q3CString	group()		{ parse(); return group_;	}
+	Q3CString	name()		{ parse(); return name_;	}
 	Value	*	value()		{ parse(); return value_;	}
@@ -49,6 +51,6 @@ class ContentLine : public Entity
 	
-	void setGroup		(const QCString & s)
+	void setGroup		(const Q3CString & s)
 	{ group_ = s; assembled_ = false; }
 	
-	void setName		(const QCString & s)
+	void setName		(const Q3CString & s)
 	{ name_ = s; assembled_ = false; }
@@ -65,5 +67,5 @@ class ContentLine : public Entity
 		
-		QCString		group_;
-		QCString		name_;
-		QPtrList<Param>		paramList_;
+		Q3CString		group_;
+		Q3CString		name_;
+		Q3PtrList<Param>		paramList_;
 		Value			* value_;
diff --git a/kabc/vcard/include/VCardDateParam.h b/kabc/vcard/include/VCardDateParam.h
index 21ac1f1..959b75b 100644
--- a/kabc/vcard/include/VCardDateParam.h
+++ b/kabc/vcard/include/VCardDateParam.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardDateValue.h b/kabc/vcard/include/VCardDateValue.h
index c248966..fc216c0 100644
--- a/kabc/vcard/include/VCardDateValue.h
+++ b/kabc/vcard/include/VCardDateValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdatetime.h>
diff --git a/kabc/vcard/include/VCardDefines.h b/kabc/vcard/include/VCardDefines.h
index 557410f..5d4f2f4 100644
--- a/kabc/vcard/include/VCardDefines.h
+++ b/kabc/vcard/include/VCardDefines.h
@@ -37,3 +37,3 @@
 #ifndef NDEBUG
-#	include <qcstring.h>
+#	include <q3cstring.h>
 #	include <iostream>
@@ -41,6 +41,6 @@
 #		define vDebug(a) cerr << className() << ":" << __FUNCTION__ << " (" \
-						<< __LINE__ << "): " << QCString((a)).data() << endl;
+						<< __LINE__ << "): " << Q3CString((a)).data() << endl;
 #	else
 #		define vDebug(a) cerr << className() << ": " \
-						<< QCString((a)).data() << endl;
+						<< Q3CString((a)).data() << endl;
 #	endif
diff --git a/kabc/vcard/include/VCardEmailParam.h b/kabc/vcard/include/VCardEmailParam.h
index 98d1b30..ff07324 100644
--- a/kabc/vcard/include/VCardEmailParam.h
+++ b/kabc/vcard/include/VCardEmailParam.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
@@ -38,6 +38,6 @@ class EmailParam : public Param
 	
-	QCString	emailType() { parse(); return emailType_;	}
+	Q3CString	emailType() { parse(); return emailType_;	}
 	bool		pref()		{ parse(); return pref_;		}
 	
-	void setEmailType(const QCString & s)
+	void setEmailType(const Q3CString & s)
 	{ emailType_ = s; assembled_ = false; }
@@ -49,3 +49,3 @@ class EmailParam : public Param
 	
-		QCString	emailType_;
+		Q3CString	emailType_;
 		bool		pref_;
diff --git a/kabc/vcard/include/VCardEntity.h b/kabc/vcard/include/VCardEntity.h
index 3c945b5..1a3d20f 100644
--- a/kabc/vcard/include/VCardEntity.h
+++ b/kabc/vcard/include/VCardEntity.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
@@ -37,6 +37,6 @@ class Entity
 		Entity(const Entity & e);
-		Entity(const QCString & s);
+		Entity(const Q3CString & s);
 		
 		virtual Entity & operator = (const Entity & e);
-		virtual Entity & operator = (const QCString & s);
+		virtual Entity & operator = (const Q3CString & s);
 		
@@ -44,4 +44,4 @@ class Entity
 		virtual bool operator != (Entity & e);
-		virtual bool operator == (const QCString & s);
-		virtual bool operator != (const QCString & s);
+		virtual bool operator == (const Q3CString & s);
+		virtual bool operator != (const Q3CString & s);
 		
@@ -49,3 +49,3 @@ class Entity
 		
-		QCString asString();
+		Q3CString asString();
 		
@@ -59,3 +59,3 @@ class Entity
 		
-		QCString strRep_;
+		Q3CString strRep_;
 		bool parsed_;
diff --git a/kabc/vcard/include/VCardEnum.h b/kabc/vcard/include/VCardEnum.h
index b4e4094..0c35e5e 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/kabc/vcard/include/VCardEnum.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
@@ -31,3 +31,3 @@ namespace VCARD
 
-extern const QCString paramNames [];
+extern const Q3CString paramNames [];
 
@@ -110,4 +110,4 @@ ParamType EntityTypeToParamType(EntityType);
 ValueType EntityTypeToValueType(EntityType);
-QCString EntityTypeToParamName(EntityType);
-EntityType EntityNameToEntityType(const QCString &);
+Q3CString EntityTypeToParamName(EntityType);
+EntityType EntityNameToEntityType(const Q3CString &);
 
diff --git a/kabc/vcard/include/VCardFloatValue.h b/kabc/vcard/include/VCardFloatValue.h
index 69fdc22..cac7a91 100644
--- a/kabc/vcard/include/VCardFloatValue.h
+++ b/kabc/vcard/include/VCardFloatValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardImageParam.h b/kabc/vcard/include/VCardImageParam.h
index ce99ccc..2785331 100644
--- a/kabc/vcard/include/VCardImageParam.h
+++ b/kabc/vcard/include/VCardImageParam.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardImageValue.h b/kabc/vcard/include/VCardImageValue.h
index 6ce0371..3b64731 100644
--- a/kabc/vcard/include/VCardImageValue.h
+++ b/kabc/vcard/include/VCardImageValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardLangValue.h b/kabc/vcard/include/VCardLangValue.h
index 991ceed..319de76 100644
--- a/kabc/vcard/include/VCardLangValue.h
+++ b/kabc/vcard/include/VCardLangValue.h
@@ -26,4 +26,4 @@
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
@@ -38,10 +38,10 @@ class LangValue : public Value
 	
-	QCString primary();
-	QStrList subtags();
+	Q3CString primary();
+	Q3StrList subtags();
 	
-	void setPrimary(const QCString &);	
-	void setSubTags(const QStrList &);
+	void setPrimary(const Q3CString &);	
+	void setSubTags(const Q3StrList &);
 	
-	QCString primary_;
-	QStrList subtags_;
+	Q3CString primary_;
+	Q3StrList subtags_;
 };
diff --git a/kabc/vcard/include/VCardNValue.h b/kabc/vcard/include/VCardNValue.h
index 306821b..ffc5355 100644
--- a/kabc/vcard/include/VCardNValue.h
+++ b/kabc/vcard/include/VCardNValue.h
@@ -27,2 +27,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -36,13 +38,13 @@ class NValue : public Value
 
-	QCString family()	{ parse(); return family_;	}
-	QCString given()	{ parse(); return given_;	}
-	QCString middle()	{ parse(); return middle_;	}
-	QCString prefix()	{ parse(); return prefix_;	}
-	QCString suffix()	{ parse(); return suffix_;	}
-
-	void setFamily	(const QCString & s) { family_	= s; assembled_ = false; }
-	void setGiven	(const QCString & s) { given_	= s; assembled_ = false; }
-	void setMiddle	(const QCString & s) { middle_	= s; assembled_ = false; }
-	void setPrefix	(const QCString & s) { prefix_	= s; assembled_ = false; }
-	void setSuffix	(const QCString & s) { suffix_	= s; assembled_ = false; }
+	Q3CString family()	{ parse(); return family_;	}
+	Q3CString given()	{ parse(); return given_;	}
+	Q3CString middle()	{ parse(); return middle_;	}
+	Q3CString prefix()	{ parse(); return prefix_;	}
+	Q3CString suffix()	{ parse(); return suffix_;	}
+
+	void setFamily	(const Q3CString & s) { family_	= s; assembled_ = false; }
+	void setGiven	(const Q3CString & s) { given_	= s; assembled_ = false; }
+	void setMiddle	(const Q3CString & s) { middle_	= s; assembled_ = false; }
+	void setPrefix	(const Q3CString & s) { prefix_	= s; assembled_ = false; }
+	void setSuffix	(const Q3CString & s) { suffix_	= s; assembled_ = false; }
 	
@@ -50,3 +52,3 @@ class NValue : public Value
 	
-	QCString family_, given_, middle_, prefix_, suffix_;
+	Q3CString family_, given_, middle_, prefix_, suffix_;
 };
diff --git a/kabc/vcard/include/VCardOrgValue.h b/kabc/vcard/include/VCardOrgValue.h
index c4f3f25..2e5d32f 100644
--- a/kabc/vcard/include/VCardOrgValue.h
+++ b/kabc/vcard/include/VCardOrgValue.h
@@ -26,4 +26,4 @@
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
@@ -40,3 +40,3 @@ class OrgValue : public Value
 	unsigned int numValues();
-	QCString value(unsigned int);
+	Q3CString value(unsigned int);
 	
@@ -44,3 +44,3 @@ class OrgValue : public Value
 		
-		QStrList valueList_;
+		Q3StrList valueList_;
 };
diff --git a/kabc/vcard/include/VCardParam.h b/kabc/vcard/include/VCardParam.h
index b61ce5c..b83fde1 100644
--- a/kabc/vcard/include/VCardParam.h
+++ b/kabc/vcard/include/VCardParam.h
@@ -26,4 +26,4 @@
 
-#include <qcstring.h>
-#include <qptrlist.h>
+#include <q3cstring.h>
+#include <q3ptrlist.h>
 
@@ -39,9 +39,9 @@ class Param : public Entity
 
-        Param(const QCString &name, const QCString &value);
+        Param(const Q3CString &name, const Q3CString &value);
 
-	void setName(const QCString &);
-	void setValue(const QCString &);
+	void setName(const Q3CString &);
+	void setValue(const Q3CString &);
 		
-	QCString name();
-	QCString value();
+	Q3CString name();
+	Q3CString value();
 	
@@ -49,8 +49,8 @@ class Param : public Entity
 		
-		QCString name_;
-		QCString value_;
+		Q3CString name_;
+		Q3CString value_;
 };
 
-typedef QPtrList<Param> ParamList;
-typedef QPtrListIterator<Param> ParamListIterator;
+typedef Q3PtrList<Param> ParamList;
+typedef Q3PtrListIterator<Param> ParamListIterator;
 
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 2f95f1b..4a5adb2 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -27,3 +27,3 @@
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
@@ -32,3 +32,3 @@ namespace VCARD
 
-Q_UINT32 RTokenise(const char * str, const char * delim, QStrList & l);
+Q_UINT32 RTokenise(const char * str, const char * delim, Q3StrList & l);
 
diff --git a/kabc/vcard/include/VCardSoundValue.h b/kabc/vcard/include/VCardSoundValue.h
index 994f55e..26f750b 100644
--- a/kabc/vcard/include/VCardSoundValue.h
+++ b/kabc/vcard/include/VCardSoundValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardSourceParam.h b/kabc/vcard/include/VCardSourceParam.h
index 887ea20..5218864 100644
--- a/kabc/vcard/include/VCardSourceParam.h
+++ b/kabc/vcard/include/VCardSourceParam.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
@@ -41,8 +41,8 @@ class SourceParam : public Param
 		SourceParamType type()	{ parse(); return type_;}
-		QCString par()			{ parse(); return par_; }
-		QCString val()			{ parse(); return val_; }
+		Q3CString par()			{ parse(); return par_; }
+		Q3CString val()			{ parse(); return val_; }
 		
 		void setType(SourceParamType t) { type_	= t; assembled_ = false; }
-		void setPar(const QCString & s) { par_	= s; assembled_ = false; }
-		void setVal(const QCString & s) { val_	= s; assembled_ = false; }
+		void setPar(const Q3CString & s) { par_	= s; assembled_ = false; }
+		void setVal(const Q3CString & s) { val_	= s; assembled_ = false; }
 	
@@ -52,3 +52,3 @@ class SourceParam : public Param
 		// May be "VALUE = uri" or "CONTEXT = word" or "x-name = *SAFE-CHAR"
-		QCString par_, val_; // Sub-parameter, value
+		Q3CString par_, val_; // Sub-parameter, value
 };
diff --git a/kabc/vcard/include/VCardTelParam.h b/kabc/vcard/include/VCardTelParam.h
index 27d7dcc..0c45a3a 100644
--- a/kabc/vcard/include/VCardTelParam.h
+++ b/kabc/vcard/include/VCardTelParam.h
@@ -26,3 +26,5 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
@@ -45,3 +47,3 @@ class TelParam : public Param
 		
-		QPtrList<TelType> types_;
+		Q3PtrList<TelType> types_;
 };
diff --git a/kabc/vcard/include/VCardTelValue.h b/kabc/vcard/include/VCardTelValue.h
index 9cf5a98..a119e4a 100644
--- a/kabc/vcard/include/VCardTelValue.h
+++ b/kabc/vcard/include/VCardTelValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/kabc/vcard/include/VCardTextBinParam.h
index 31dec86..d186995 100644
--- a/kabc/vcard/include/VCardTextBinParam.h
+++ b/kabc/vcard/include/VCardTextBinParam.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/kabc/vcard/include/VCardTextBinValue.h
index 8d44fdf..3924f2a 100644
--- a/kabc/vcard/include/VCardTextBinValue.h
+++ b/kabc/vcard/include/VCardTextBinValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardTextListValue.h b/kabc/vcard/include/VCardTextListValue.h
index 8e47af5..ac42a29 100644
--- a/kabc/vcard/include/VCardTextListValue.h
+++ b/kabc/vcard/include/VCardTextListValue.h
@@ -26,5 +26,5 @@
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
@@ -41,3 +41,3 @@ class TextListValue : public Value
 	unsigned int numValues();
-	QCString value(unsigned int);
+	Q3CString value(unsigned int);
 	
@@ -45,3 +45,3 @@ class TextListValue : public Value
 		
-		QStrList valueList_;
+		Q3StrList valueList_;
 };
diff --git a/kabc/vcard/include/VCardTextParam.h b/kabc/vcard/include/VCardTextParam.h
index 08b5f57..2503337 100644
--- a/kabc/vcard/include/VCardTextParam.h
+++ b/kabc/vcard/include/VCardTextParam.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardURIValue.h b/kabc/vcard/include/VCardURIValue.h
index 5fd7184..116e4c8 100644
--- a/kabc/vcard/include/VCardURIValue.h
+++ b/kabc/vcard/include/VCardURIValue.h
@@ -27,2 +27,4 @@
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -35,9 +37,9 @@ class URIValue : public Value
 
-	URIValue(const QCString & scheme, const QCString & schemeSpecificPart);
+	URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart);
 	
-	QCString scheme();
-	QCString schemeSpecificPart();
+	Q3CString scheme();
+	Q3CString schemeSpecificPart();
 	
-	void setScheme				(const QCString &);
-	void setSchemeSpecificPart	(const QCString &);
+	void setScheme				(const Q3CString &);
+	void setSchemeSpecificPart	(const Q3CString &);
 	
@@ -45,4 +47,4 @@ class URIValue : public Value
 	
-		QCString scheme_;
-		QCString schemeSpecificPart_;
+		Q3CString scheme_;
+		Q3CString schemeSpecificPart_;
 };
diff --git a/kabc/vcard/include/VCardUTCValue.h b/kabc/vcard/include/VCardUTCValue.h
index ff695e0..eb69829 100644
--- a/kabc/vcard/include/VCardUTCValue.h
+++ b/kabc/vcard/include/VCardUTCValue.h
@@ -26,3 +26,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
diff --git a/kabc/vcard/include/VCardVCard.h b/kabc/vcard/include/VCardVCard.h
index 5dec166..5b66074 100644
--- a/kabc/vcard/include/VCardVCard.h
+++ b/kabc/vcard/include/VCardVCard.h
@@ -27,3 +27,5 @@
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -42,13 +44,13 @@ class VCard : public Entity
 	bool has(EntityType);
-	bool has(const QCString &);
+	bool has(const Q3CString &);
 	
 	void add(const ContentLine &);
-	void add(const QCString &);
+	void add(const Q3CString &);
 	
 	ContentLine * contentLine(EntityType);
-	ContentLine * contentLine(const QCString &);
+	ContentLine * contentLine(const Q3CString &);
 	
-	QCString group() { parse(); return group_; }
+	Q3CString group() { parse(); return group_; }
 	
-	QPtrList<ContentLine>	contentLineList() { parse(); return contentLineList_; }
+	Q3PtrList<ContentLine>	contentLineList() { parse(); return contentLineList_; }
 	
@@ -56,4 +58,4 @@ class VCard : public Entity
 
-	QCString		group_;
-	QPtrList<ContentLine>	contentLineList_;
+	Q3CString		group_;
+	Q3PtrList<ContentLine>	contentLineList_;
 };
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/kabc/vcard/include/VCardVCardEntity.h
index 47ba370..8c824e7 100644
--- a/kabc/vcard/include/VCardVCardEntity.h
+++ b/kabc/vcard/include/VCardVCardEntity.h
@@ -27,3 +27,3 @@
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
@@ -36,4 +36,4 @@ namespace VCARD
   
-typedef QPtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef Q3PtrList<VCard> VCardList;
+typedef Q3PtrListIterator<VCard> VCardListIterator;
 
diff --git a/kabc/vcard/include/VCardValue.h b/kabc/vcard/include/VCardValue.h
index 7cfe4a0..024397c 100644
--- a/kabc/vcard/include/VCardValue.h
+++ b/kabc/vcard/include/VCardValue.h
@@ -26,3 +26,3 @@
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
@@ -40,4 +40,4 @@ class Value : public Entity
 
-typedef QPtrList<Value> ValueList;
-typedef QPtrListIterator<Value> ValueListIterator;
+typedef Q3PtrList<Value> ValueList;
+typedef Q3PtrListIterator<Value> ValueListIterator;
 
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/kabc/vcard/include/generated/AdrParam-generated.h
index 3e265d8..a11d142 100644
--- a/kabc/vcard/include/generated/AdrParam-generated.h
+++ b/kabc/vcard/include/generated/AdrParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ AdrParam();
 AdrParam(const AdrParam&);
-AdrParam(const QCString&);
+AdrParam(const Q3CString&);
 AdrParam & operator = (AdrParam&);
-AdrParam & operator = (const QCString&);
+AdrParam & operator = (const Q3CString&);
 bool operator ==(AdrParam&);
 bool operator !=(AdrParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/AdrValue-generated.h b/kabc/vcard/include/generated/AdrValue-generated.h
index e1d93e4..c0a33a3 100644
--- a/kabc/vcard/include/generated/AdrValue-generated.h
+++ b/kabc/vcard/include/generated/AdrValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ AdrValue();
 AdrValue(const AdrValue&);
-AdrValue(const QCString&);
+AdrValue(const Q3CString&);
 AdrValue & operator = (AdrValue&);
-AdrValue & operator = (const QCString&);
+AdrValue & operator = (const Q3CString&);
 bool operator ==(AdrValue&);
 bool operator !=(AdrValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/AgentParam-generated.h b/kabc/vcard/include/generated/AgentParam-generated.h
index 6423867..d5ed988 100644
--- a/kabc/vcard/include/generated/AgentParam-generated.h
+++ b/kabc/vcard/include/generated/AgentParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ AgentParam();
 AgentParam(const AgentParam&);
-AgentParam(const QCString&);
+AgentParam(const Q3CString&);
 AgentParam & operator = (AgentParam&);
-AgentParam & operator = (const QCString&);
+AgentParam & operator = (const Q3CString&);
 bool operator ==(AgentParam&);
 bool operator !=(AgentParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/AgentValue-generated.h b/kabc/vcard/include/generated/AgentValue-generated.h
index 76bb81c..eef5277 100644
--- a/kabc/vcard/include/generated/AgentValue-generated.h
+++ b/kabc/vcard/include/generated/AgentValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ AgentValue();
 AgentValue(const AgentValue&);
-AgentValue(const QCString&);
+AgentValue(const Q3CString&);
 AgentValue & operator = (AgentValue&);
-AgentValue & operator = (const QCString&);
+AgentValue & operator = (const Q3CString&);
 bool operator ==(AgentValue&);
 bool operator !=(AgentValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ClassValue-generated.h b/kabc/vcard/include/generated/ClassValue-generated.h
index df4ed5f..b84c98f 100644
--- a/kabc/vcard/include/generated/ClassValue-generated.h
+++ b/kabc/vcard/include/generated/ClassValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ ClassValue();
 ClassValue(const ClassValue&);
-ClassValue(const QCString&);
+ClassValue(const Q3CString&);
 ClassValue & operator = (ClassValue&);
-ClassValue & operator = (const QCString&);
+ClassValue & operator = (const Q3CString&);
 bool operator ==(ClassValue&);
 bool operator !=(ClassValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ClassValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ClassValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ContentLine-generated.h b/kabc/vcard/include/generated/ContentLine-generated.h
index 9efe273..84d0822 100644
--- a/kabc/vcard/include/generated/ContentLine-generated.h
+++ b/kabc/vcard/include/generated/ContentLine-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ ContentLine();
 ContentLine(const ContentLine&);
-ContentLine(const QCString&);
+ContentLine(const Q3CString&);
 ContentLine & operator = (ContentLine&);
-ContentLine & operator = (const QCString&);
+ContentLine & operator = (const Q3CString&);
 bool operator ==(ContentLine&);
 bool operator !=(ContentLine& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ContentLine a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ContentLine a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/DateParam-generated.h b/kabc/vcard/include/generated/DateParam-generated.h
index ff1da58..029c1da 100644
--- a/kabc/vcard/include/generated/DateParam-generated.h
+++ b/kabc/vcard/include/generated/DateParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ DateParam();
 DateParam(const DateParam&);
-DateParam(const QCString&);
+DateParam(const Q3CString&);
 DateParam & operator = (DateParam&);
-DateParam & operator = (const QCString&);
+DateParam & operator = (const Q3CString&);
 bool operator ==(DateParam&);
 bool operator !=(DateParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/DateValue-generated.h b/kabc/vcard/include/generated/DateValue-generated.h
index a382823..70eecce 100644
--- a/kabc/vcard/include/generated/DateValue-generated.h
+++ b/kabc/vcard/include/generated/DateValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ DateValue();
 DateValue(const DateValue&);
-DateValue(const QCString&);
+DateValue(const Q3CString&);
 DateValue & operator = (DateValue&);
-DateValue & operator = (const QCString&);
+DateValue & operator = (const Q3CString&);
 bool operator ==(DateValue&);
 bool operator !=(DateValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/EmailParam-generated.h b/kabc/vcard/include/generated/EmailParam-generated.h
index 428a6fc..f498931 100644
--- a/kabc/vcard/include/generated/EmailParam-generated.h
+++ b/kabc/vcard/include/generated/EmailParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ EmailParam();
 EmailParam(const EmailParam&);
-EmailParam(const QCString&);
+EmailParam(const Q3CString&);
 EmailParam & operator = (EmailParam&);
-EmailParam & operator = (const QCString&);
+EmailParam & operator = (const Q3CString&);
 bool operator ==(EmailParam&);
 bool operator !=(EmailParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {EmailParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {EmailParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/FloatValue-generated.h b/kabc/vcard/include/generated/FloatValue-generated.h
index cac55cf..c04b85f 100644
--- a/kabc/vcard/include/generated/FloatValue-generated.h
+++ b/kabc/vcard/include/generated/FloatValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ FloatValue();
 FloatValue(const FloatValue&);
-FloatValue(const QCString&);
+FloatValue(const Q3CString&);
 FloatValue & operator = (FloatValue&);
-FloatValue & operator = (const QCString&);
+FloatValue & operator = (const Q3CString&);
 bool operator ==(FloatValue&);
 bool operator !=(FloatValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {FloatValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {FloatValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/GeoValue-generated.h b/kabc/vcard/include/generated/GeoValue-generated.h
index 594f3ad..ab659bf 100644
--- a/kabc/vcard/include/generated/GeoValue-generated.h
+++ b/kabc/vcard/include/generated/GeoValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ GeoValue();
 GeoValue(const GeoValue&);
-GeoValue(const QCString&);
+GeoValue(const Q3CString&);
 GeoValue & operator = (GeoValue&);
-GeoValue & operator = (const QCString&);
+GeoValue & operator = (const Q3CString&);
 bool operator ==(GeoValue&);
 bool operator !=(GeoValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {GeoValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {GeoValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/Group-generated.h b/kabc/vcard/include/generated/Group-generated.h
index f39302d..ae16e3d 100644
--- a/kabc/vcard/include/generated/Group-generated.h
+++ b/kabc/vcard/include/generated/Group-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ Group();
 Group(const Group&);
-Group(const QCString&);
+Group(const Q3CString&);
 Group & operator = (Group&);
-Group & operator = (const QCString&);
+Group & operator = (const Q3CString&);
 bool operator ==(Group&);
 bool operator !=(Group& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Group a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Group a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ImageParam-generated.h b/kabc/vcard/include/generated/ImageParam-generated.h
index 81edfd2..91b09a4 100644
--- a/kabc/vcard/include/generated/ImageParam-generated.h
+++ b/kabc/vcard/include/generated/ImageParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ ImageParam();
 ImageParam(const ImageParam&);
-ImageParam(const QCString&);
+ImageParam(const Q3CString&);
 ImageParam & operator = (ImageParam&);
-ImageParam & operator = (const QCString&);
+ImageParam & operator = (const Q3CString&);
 bool operator ==(ImageParam&);
 bool operator !=(ImageParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ImageValue-generated.h b/kabc/vcard/include/generated/ImageValue-generated.h
index 5a2c493..d71282e 100644
--- a/kabc/vcard/include/generated/ImageValue-generated.h
+++ b/kabc/vcard/include/generated/ImageValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ ImageValue();
 ImageValue(const ImageValue&);
-ImageValue(const QCString&);
+ImageValue(const Q3CString&);
 ImageValue & operator = (ImageValue&);
-ImageValue & operator = (const QCString&);
+ImageValue & operator = (const Q3CString&);
 bool operator ==(ImageValue&);
 bool operator !=(ImageValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ImgParam-generated.h b/kabc/vcard/include/generated/ImgParam-generated.h
index 46a6ca0..461ca6d 100644
--- a/kabc/vcard/include/generated/ImgParam-generated.h
+++ b/kabc/vcard/include/generated/ImgParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ ImgParam();
 ImgParam(const ImgParam&);
-ImgParam(const QCString&);
+ImgParam(const Q3CString&);
 ImgParam & operator = (ImgParam&);
-ImgParam & operator = (const QCString&);
+ImgParam & operator = (const Q3CString&);
 bool operator ==(ImgParam&);
 bool operator !=(ImgParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ImgValue-generated.h b/kabc/vcard/include/generated/ImgValue-generated.h
index d75d545..80ee646 100644
--- a/kabc/vcard/include/generated/ImgValue-generated.h
+++ b/kabc/vcard/include/generated/ImgValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ ImgValue();
 ImgValue(const ImgValue&);
-ImgValue(const QCString&);
+ImgValue(const Q3CString&);
 ImgValue & operator = (ImgValue&);
-ImgValue & operator = (const QCString&);
+ImgValue & operator = (const Q3CString&);
 bool operator ==(ImgValue&);
 bool operator !=(ImgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/LangValue-generated.h b/kabc/vcard/include/generated/LangValue-generated.h
index 23e138b..434f762 100644
--- a/kabc/vcard/include/generated/LangValue-generated.h
+++ b/kabc/vcard/include/generated/LangValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ LangValue();
 LangValue(const LangValue&);
-LangValue(const QCString&);
+LangValue(const Q3CString&);
 LangValue & operator = (LangValue&);
-LangValue & operator = (const QCString&);
+LangValue & operator = (const Q3CString&);
 bool operator ==(LangValue&);
 bool operator !=(LangValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {LangValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {LangValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/NValue-generated.h b/kabc/vcard/include/generated/NValue-generated.h
index 082c253..086810f 100644
--- a/kabc/vcard/include/generated/NValue-generated.h
+++ b/kabc/vcard/include/generated/NValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ NValue();
 NValue(const NValue&);
-NValue(const QCString&);
+NValue(const Q3CString&);
 NValue & operator = (NValue&);
-NValue & operator = (const QCString&);
+NValue & operator = (const Q3CString&);
 bool operator ==(NValue&);
 bool operator !=(NValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {NValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {NValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/Name-generated.h b/kabc/vcard/include/generated/Name-generated.h
index 0e69abd..a3bcb25 100644
--- a/kabc/vcard/include/generated/Name-generated.h
+++ b/kabc/vcard/include/generated/Name-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ V_Name();
 V_Name(const V_Name&);
-V_Name(const QCString&);
+V_Name(const Q3CString&);
 V_Name & operator = (V_Name&);
-V_Name & operator = (const QCString&);
+V_Name & operator = (const Q3CString&);
 bool operator ==(V_Name&);
 bool operator !=(V_Name& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_Name a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_Name a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/OrgValue-generated.h b/kabc/vcard/include/generated/OrgValue-generated.h
index 51eb1b7..275f56f 100644
--- a/kabc/vcard/include/generated/OrgValue-generated.h
+++ b/kabc/vcard/include/generated/OrgValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ OrgValue();
 OrgValue(const OrgValue&);
-OrgValue(const QCString&);
+OrgValue(const Q3CString&);
 OrgValue & operator = (OrgValue&);
-OrgValue & operator = (const QCString&);
+OrgValue & operator = (const Q3CString&);
 bool operator ==(OrgValue&);
 bool operator !=(OrgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {OrgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {OrgValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/Param-generated.h b/kabc/vcard/include/generated/Param-generated.h
index cf4666a..1a35166 100644
--- a/kabc/vcard/include/generated/Param-generated.h
+++ b/kabc/vcard/include/generated/Param-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ Param();
 Param(const Param&);
-Param(const QCString&);
+Param(const Q3CString&);
 Param & operator = (Param&);
-Param & operator = (const QCString&);
+Param & operator = (const Q3CString&);
 bool operator ==(Param&);
 bool operator !=(Param& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Param a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Param a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ParamName-generated.h b/kabc/vcard/include/generated/ParamName-generated.h
index ef673c3..b45022e 100644
--- a/kabc/vcard/include/generated/ParamName-generated.h
+++ b/kabc/vcard/include/generated/ParamName-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ V_ParamName();
 V_ParamName(const V_ParamName&);
-V_ParamName(const QCString&);
+V_ParamName(const Q3CString&);
 V_ParamName & operator = (V_ParamName&);
-V_ParamName & operator = (const QCString&);
+V_ParamName & operator = (const Q3CString&);
 bool operator ==(V_ParamName&);
 bool operator !=(V_ParamName& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamName a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamName a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/ParamValue-generated.h b/kabc/vcard/include/generated/ParamValue-generated.h
index e73500f..956c8da 100644
--- a/kabc/vcard/include/generated/ParamValue-generated.h
+++ b/kabc/vcard/include/generated/ParamValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ V_ParamValue();
 V_ParamValue(const V_ParamValue&);
-V_ParamValue(const QCString&);
+V_ParamValue(const Q3CString&);
 V_ParamValue & operator = (V_ParamValue&);
-V_ParamValue & operator = (const QCString&);
+V_ParamValue & operator = (const Q3CString&);
 bool operator ==(V_ParamValue&);
 bool operator !=(V_ParamValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/PhoneNumberValue-generated.h b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
index 1320f18..0d206f4 100644
--- a/kabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ PhoneNumberValue();
 PhoneNumberValue(const PhoneNumberValue&);
-PhoneNumberValue(const QCString&);
+PhoneNumberValue(const Q3CString&);
 PhoneNumberValue & operator = (PhoneNumberValue&);
-PhoneNumberValue & operator = (const QCString&);
+PhoneNumberValue & operator = (const Q3CString&);
 bool operator ==(PhoneNumberValue&);
 bool operator !=(PhoneNumberValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {PhoneNumberValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {PhoneNumberValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/SoundValue-generated.h b/kabc/vcard/include/generated/SoundValue-generated.h
index a9ab2e8..2cc9c0d 100644
--- a/kabc/vcard/include/generated/SoundValue-generated.h
+++ b/kabc/vcard/include/generated/SoundValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ SoundValue();
 SoundValue(const SoundValue&);
-SoundValue(const QCString&);
+SoundValue(const Q3CString&);
 SoundValue & operator = (SoundValue&);
-SoundValue & operator = (const QCString&);
+SoundValue & operator = (const Q3CString&);
 bool operator ==(SoundValue&);
 bool operator !=(SoundValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SoundValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SoundValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/SourceParam-generated.h b/kabc/vcard/include/generated/SourceParam-generated.h
index 75fefb8..537e093 100644
--- a/kabc/vcard/include/generated/SourceParam-generated.h
+++ b/kabc/vcard/include/generated/SourceParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ SourceParam();
 SourceParam(const SourceParam&);
-SourceParam(const QCString&);
+SourceParam(const Q3CString&);
 SourceParam & operator = (SourceParam&);
-SourceParam & operator = (const QCString&);
+SourceParam & operator = (const Q3CString&);
 bool operator ==(SourceParam&);
 bool operator !=(SourceParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SourceParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SourceParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TelParam-generated.h b/kabc/vcard/include/generated/TelParam-generated.h
index 3ee77cc..8d9ba0f 100644
--- a/kabc/vcard/include/generated/TelParam-generated.h
+++ b/kabc/vcard/include/generated/TelParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TelParam();
 TelParam(const TelParam&);
-TelParam(const QCString&);
+TelParam(const Q3CString&);
 TelParam & operator = (TelParam&);
-TelParam & operator = (const QCString&);
+TelParam & operator = (const Q3CString&);
 bool operator ==(TelParam&);
 bool operator !=(TelParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TelValue-generated.h b/kabc/vcard/include/generated/TelValue-generated.h
index 3213e1c..b72fa7d 100644
--- a/kabc/vcard/include/generated/TelValue-generated.h
+++ b/kabc/vcard/include/generated/TelValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TelValue();
 TelValue(const TelValue&);
-TelValue(const QCString&);
+TelValue(const Q3CString&);
 TelValue & operator = (TelValue&);
-TelValue & operator = (const QCString&);
+TelValue & operator = (const Q3CString&);
 bool operator ==(TelValue&);
 bool operator !=(TelValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TextBinParam-generated.h b/kabc/vcard/include/generated/TextBinParam-generated.h
index d075c10..2e433b0 100644
--- a/kabc/vcard/include/generated/TextBinParam-generated.h
+++ b/kabc/vcard/include/generated/TextBinParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TextBinParam();
 TextBinParam(const TextBinParam&);
-TextBinParam(const QCString&);
+TextBinParam(const Q3CString&);
 TextBinParam & operator = (TextBinParam&);
-TextBinParam & operator = (const QCString&);
+TextBinParam & operator = (const Q3CString&);
 bool operator ==(TextBinParam&);
 bool operator !=(TextBinParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TextBinValue-generated.h b/kabc/vcard/include/generated/TextBinValue-generated.h
index e9553ac..bc3ad61 100644
--- a/kabc/vcard/include/generated/TextBinValue-generated.h
+++ b/kabc/vcard/include/generated/TextBinValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TextBinValue();
 TextBinValue(const TextBinValue&);
-TextBinValue(const QCString&);
+TextBinValue(const Q3CString&);
 TextBinValue & operator = (TextBinValue&);
-TextBinValue & operator = (const QCString&);
+TextBinValue & operator = (const Q3CString&);
 bool operator ==(TextBinValue&);
 bool operator !=(TextBinValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TextListValue-generated.h b/kabc/vcard/include/generated/TextListValue-generated.h
index 9f46124..9df8a46 100644
--- a/kabc/vcard/include/generated/TextListValue-generated.h
+++ b/kabc/vcard/include/generated/TextListValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TextListValue();
 TextListValue(const TextListValue&);
-TextListValue(const QCString&);
+TextListValue(const Q3CString&);
 TextListValue & operator = (TextListValue&);
-TextListValue & operator = (const QCString&);
+TextListValue & operator = (const Q3CString&);
 bool operator ==(TextListValue&);
 bool operator !=(TextListValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextListValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextListValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TextNSParam-generated.h b/kabc/vcard/include/generated/TextNSParam-generated.h
index d7f58ca..8842bd6 100644
--- a/kabc/vcard/include/generated/TextNSParam-generated.h
+++ b/kabc/vcard/include/generated/TextNSParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TextNSParam();
 TextNSParam(const TextNSParam&);
-TextNSParam(const QCString&);
+TextNSParam(const Q3CString&);
 TextNSParam & operator = (TextNSParam&);
-TextNSParam & operator = (const QCString&);
+TextNSParam & operator = (const Q3CString&);
 bool operator ==(TextNSParam&);
 bool operator !=(TextNSParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextNSParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextNSParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TextParam-generated.h b/kabc/vcard/include/generated/TextParam-generated.h
index 154e1bf..e56a8a5 100644
--- a/kabc/vcard/include/generated/TextParam-generated.h
+++ b/kabc/vcard/include/generated/TextParam-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TextParam();
 TextParam(const TextParam&);
-TextParam(const QCString&);
+TextParam(const Q3CString&);
 TextParam & operator = (TextParam&);
-TextParam & operator = (const QCString&);
+TextParam & operator = (const Q3CString&);
 bool operator ==(TextParam&);
 bool operator !=(TextParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/TextValue-generated.h b/kabc/vcard/include/generated/TextValue-generated.h
index e1c4dcc..3f205e0 100644
--- a/kabc/vcard/include/generated/TextValue-generated.h
+++ b/kabc/vcard/include/generated/TextValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ TextValue();
 TextValue(const TextValue&);
-TextValue(const QCString&);
+TextValue(const Q3CString&);
 TextValue & operator = (TextValue&);
-TextValue & operator = (const QCString&);
+TextValue & operator = (const Q3CString&);
 bool operator ==(TextValue&);
 bool operator !=(TextValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/URIValue-generated.h b/kabc/vcard/include/generated/URIValue-generated.h
index dbcb5c1..464178f 100644
--- a/kabc/vcard/include/generated/URIValue-generated.h
+++ b/kabc/vcard/include/generated/URIValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ URIValue();
 URIValue(const URIValue&);
-URIValue(const QCString&);
+URIValue(const Q3CString&);
 URIValue & operator = (URIValue&);
-URIValue & operator = (const QCString&);
+URIValue & operator = (const Q3CString&);
 bool operator ==(URIValue&);
 bool operator !=(URIValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {URIValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {URIValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/UTCValue-generated.h b/kabc/vcard/include/generated/UTCValue-generated.h
index 46e447b..1a34b5c 100644
--- a/kabc/vcard/include/generated/UTCValue-generated.h
+++ b/kabc/vcard/include/generated/UTCValue-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ UTCValue();
 UTCValue(const UTCValue&);
-UTCValue(const QCString&);
+UTCValue(const Q3CString&);
 UTCValue & operator = (UTCValue&);
-UTCValue & operator = (const QCString&);
+UTCValue & operator = (const Q3CString&);
 bool operator ==(UTCValue&);
 bool operator !=(UTCValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {UTCValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {UTCValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/VCard-generated.h b/kabc/vcard/include/generated/VCard-generated.h
index 4d7d96d..d09c789 100644
--- a/kabc/vcard/include/generated/VCard-generated.h
+++ b/kabc/vcard/include/generated/VCard-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ VCard();
 VCard(const VCard&);
-VCard(const QCString&);
+VCard(const Q3CString&);
 VCard & operator = (VCard&);
-VCard & operator = (const QCString&);
+VCard & operator = (const Q3CString&);
 bool operator ==(VCard&);
 bool operator !=(VCard& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCard a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCard a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/VCardEntity-generated.h b/kabc/vcard/include/generated/VCardEntity-generated.h
index 9f2dfbc..cbbe8e1 100644
--- a/kabc/vcard/include/generated/VCardEntity-generated.h
+++ b/kabc/vcard/include/generated/VCardEntity-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ VCardEntity();
 VCardEntity(const VCardEntity&);
-VCardEntity(const QCString&);
+VCardEntity(const Q3CString&);
 VCardEntity & operator = (VCardEntity&);
-VCardEntity & operator = (const QCString&);
+VCardEntity & operator = (const Q3CString&);
 bool operator ==(VCardEntity&);
 bool operator !=(VCardEntity& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCardEntity a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCardEntity a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/include/generated/Value-generated.h b/kabc/vcard/include/generated/Value-generated.h
index 7afac34..142e720 100644
--- a/kabc/vcard/include/generated/Value-generated.h
+++ b/kabc/vcard/include/generated/Value-generated.h
@@ -1 +1,3 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
@@ -5,9 +7,9 @@ Value();
 Value(const Value&);
-Value(const QCString&);
+Value(const Q3CString&);
 Value & operator = (Value&);
-Value & operator = (const QCString&);
+Value & operator = (const Q3CString&);
 bool operator ==(Value&);
 bool operator !=(Value& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Value a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Value a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
diff --git a/kabc/vcard/testread.cpp b/kabc/vcard/testread.cpp
index 919c661..4d66aaf 100644
--- a/kabc/vcard/testread.cpp
+++ b/kabc/vcard/testread.cpp
@@ -5,3 +5,5 @@
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -20,5 +22,5 @@ int main(int argc, char * argv[])
 	
-	QCString str;
+	Q3CString str;
 	
-	if (!f.open(IO_ReadOnly)) {
+	if (!f.open(QIODevice::ReadOnly)) {
 		cerr << "Couldn't open file \"" << argv[1] << endl;
@@ -27,3 +29,3 @@ int main(int argc, char * argv[])
 	
-	QTextStream t(&f);
+	Q3TextStream t(&f);
 	
@@ -54,3 +56,3 @@ int main(int argc, char * argv[])
 			
-			QCString s = v.contentLine(EntityEmail)->value()->asString();
+			Q3CString s = v.contentLine(EntityEmail)->value()->asString();
 			
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index e4bbe7b..846e51a 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -7,2 +7,4 @@
 #include <VCard.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -35,3 +37,3 @@ int main(int argc,char **argv)
 
-  QCString str = v.asString();
+  Q3CString str = v.asString();