initial public commit of qt4 portp1

72 files changed, 387 insertions, 297 deletions

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
@@ -24,8 +24,8 @@
 #ifndef  ADRPARAM_H
 #define  ADRPARAM_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardParam.h>
 
@@ -37,16 +37,16 @@ class AdrParam : public Param
 
 #include "AdrParam-generated.h"
         
-        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; }
         
         enum AdrType {
@@ -56,8 +56,8 @@ class AdrParam : public Param
         
         private:
                 
-                        QStrListadrTypeList_;
-                        QCStringtextParam_;
+                        Q3StrListadrTypeList_;
+                        Q3CStringtextParam_;
 };
 }
 
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
@@ -24,7 +24,9 @@
 #ifndef  ADRVALUE_H
 #define  ADRVALUE_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardValue.h>
 
 namespace VCARD
@@ -37,44 +39,44 @@ class AdrValue : public Value
         
         AdrValue *clone();
         
-        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_;}
         
         private:
                 
-                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
@@ -24,7 +24,7 @@
 #ifndef  AGENTPARAM_H
 #define  AGENTPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 #include <VCardURIValue.h>
@@ -46,7 +46,7 @@ class AgentParam : public Param
         void setRefer(bool b)
         { refer_ = b; assembled_ = false; }
 
-        void setURI(const QCString & s)
+        void setURI(const Q3CString & s)
         { uri_ = s; assembled_ = false; }
         
         private:
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
@@ -24,7 +24,7 @@
 #ifndef  AGENTVALUE_H
 #define  AGENTVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -24,7 +24,7 @@
 #ifndef  CLASSVALUE_H
 #define  CLASSVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -24,7 +24,9 @@
 #ifndef  CONTENTLINE_H
 #define  CONTENTLINE_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "VCardEnum.h"
 #include "VCardEntity.h"
@@ -39,18 +41,18 @@ class ContentLine : public Entity
 
 #include "ContentLine-generated.h"
         
-                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_;}
                 ParamList       paramList()     { parse(); return paramList_;}
                 ParamType       paramType()     { parse(); return paramType_;}
                 ValueType       valueType()     { parse(); return valueType_;}
                 EntityType      entityType()    { parse(); return entityType_;}
         
-                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; }
         
                 void setValue   (Value *s)
@@ -63,9 +65,9 @@ class ContentLine : public Entity
         
         private:
                 
-                        QCString        group_;
-                        QCString        name_;
-                        QPtrList<Param>         paramList_;
+                        Q3CString       group_;
+                        Q3CString       name_;
+                        Q3PtrList<Param>        paramList_;
                         Value           * value_;
                 
                         ParamType       paramType_;
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
@@ -24,7 +24,7 @@
 #ifndef  DATEPARAM_H
 #define  DATEPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.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
@@ -24,7 +24,7 @@
 #ifndef  DATEVALUE_H
 #define  DATEVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdatetime.h>
 
 #include <VCardValue.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
@@ -35,14 +35,14 @@
 
 #if 0
 #ifndef NDEBUG
-        #include <qcstring.h>
+        #include <q3cstring.h>
         #include <iostream>
         #ifdef __GNUG__
         #       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
 #else
         #define vDebug(a)
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
@@ -24,7 +24,7 @@
 #ifndef  EMAILPARAM_H
 #define  EMAILPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
@@ -36,10 +36,10 @@ class EmailParam : public Param
         
 #include "EmailParam-generated.h"
         
-                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; }
         
         void setPref(bool b)
@@ -47,7 +47,7 @@ class EmailParam : public Param
         
         private:
         
-                        QCStringemailType_;
+                        Q3CStringemailType_;
                         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
@@ -24,7 +24,7 @@
 #ifndef  ENTITY_H
 #define  ENTITY_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 namespace VCARD
 {
@@ -35,19 +35,19 @@ class Entity
                 
                 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);
                 
                 virtual bool operator == (Entity & e);
                 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);
                 
                 virtual ~Entity();
                 
-                QCString asString();
+                Q3CString asString();
                 
                 virtual void parse();
                 virtual void assemble();
@@ -57,7 +57,7 @@ class Entity
         
         protected:
                 
-                QCString strRep_;
+                Q3CString strRep_;
                 bool parsed_;
                 bool assembled_;
 };
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
@@ -24,12 +24,12 @@
 #ifndef  ENUM_H
 #define  ENUM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 namespace VCARD
 {
 
-extern const QCString paramNames [];
+extern const Q3CString paramNames [];
 
 enum EntityType {
         EntityName,
@@ -108,8 +108,8 @@ extern const ParamType paramTypesTable[];
 
 ParamType EntityTypeToParamType(EntityType);
 ValueType EntityTypeToValueType(EntityType);
-QCString EntityTypeToParamName(EntityType);
-EntityType EntityNameToEntityType(const QCString &);
+Q3CString EntityTypeToParamName(EntityType);
+EntityType EntityNameToEntityType(const Q3CString &);
 
 char * encodeBase64(const char *, unsigned long, unsigned long &);
 char * decodeBase64(const char *, unsigned long, unsigned long &);
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
@@ -24,7 +24,7 @@
 #ifndef  FLOATVALUE_H
 #define  FLOATVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -24,7 +24,7 @@
 #ifndef  IMGPARAM_H
 #define  IMGPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.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
@@ -24,7 +24,7 @@
 #ifndef  IMAGEVALUE_H
 #define  IMAGEVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -24,8 +24,8 @@
 #ifndef  LANGVALUE_H
 #define  LANGVALUE_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardValue.h>
 
@@ -36,14 +36,14 @@ class LangValue : public Value
 {
 #include "LangValue-generated.h"
         
-        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
@@ -25,6 +25,8 @@
 #define  NVALUE_H
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace VCARD
 {
@@ -34,21 +36,21 @@ class NValue : public Value
 #include "NValue-generated.h"
         NValue *clone();
 
-                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; }
         
         private:
         
-        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
@@ -24,8 +24,8 @@
 #ifndef  ORGVALUE_H
 #define  ORGVALUE_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardValue.h>
 
@@ -38,11 +38,11 @@ class OrgValue : public Value
 #include "OrgValue-generated.h"
         
         unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
         
         private:
                 
-                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
@@ -24,8 +24,8 @@
 #ifndef  PARAM_H
 #define  PARAM_H
 
-#include <qcstring.h>
-#include <qptrlist.h>
+#include <q3cstring.h>
+#include <q3ptrlist.h>
 
 #include <VCardEntity.h>
 
@@ -37,22 +37,22 @@ class Param : public Entity
 
 #include "Param-generated.h"
 
-        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();
         
         private:
                 
-                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
@@ -25,12 +25,12 @@
 #ifndef RTOKEN_H
 #define RTOKEN_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
 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
@@ -24,7 +24,7 @@
 #ifndef  SOUNDVALUE_H
 #define  SOUNDVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -24,7 +24,7 @@
 #ifndef  SOURCEPARAM_H
 #define  SOURCEPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
@@ -39,18 +39,18 @@ class SourceParam : public Param
         enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
         
                         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; }
         
         private:
                 
                 SourceParamType type_;
                 // 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
@@ -24,7 +24,9 @@
 #ifndef  TELPARAM_H
 #define  TELPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <VCardParam.h>
 
@@ -43,7 +45,7 @@ class TelParam : public Param
         
         private:
                 
-                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
@@ -24,7 +24,7 @@
 #ifndef  TELVALUE_H
 #define  TELVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -24,7 +24,7 @@
 #ifndef  TEXTBINPARAM_H
 #define  TEXTBINPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.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
@@ -24,7 +24,7 @@
 #ifndef  TEXTBINVALUE_H
 #define  TEXTBINVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -24,9 +24,9 @@
 #ifndef  TEXTLISTVALUE_H
 #define  TEXTLISTVALUE_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
@@ -39,11 +39,11 @@ class TextListValue : public Value
 #include "TextListValue-generated.h"
         
         unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
         
         private:
                 
-                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
@@ -24,7 +24,7 @@
 #ifndef  TEXTPARAM_H
 #define  TEXTPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.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
@@ -25,6 +25,8 @@
 #define  URIVALUE_H
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace VCARD
 {
@@ -33,18 +35,18 @@ class URIValue : public Value
 {
 #include "URIValue-generated.h"
 
-        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 &);
         
         private:
         
-                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
@@ -24,7 +24,7 @@
 #ifndef  UTCVALUE_H
 #define  UTCVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.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
@@ -25,7 +25,9 @@
 #define  VCARD_VCARD_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCardEnum.h>
 #include <VCardEntity.h>
@@ -40,22 +42,22 @@ class VCard : public Entity
 #include "VCard-generated.h"
         
         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_; }
         
         private:
 
-                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
@@ -25,7 +25,7 @@
 #define  VCARD_ENTITY_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <VCardEnum.h>
 #include <VCardVCard.h>
@@ -34,8 +34,8 @@
 namespace VCARD
 {
   
-typedef QPtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef Q3PtrList<VCard> VCardList;
+typedef Q3PtrListIterator<VCard> VCardListIterator;
 
 class VCardEntity : public Entity
 {
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
@@ -24,7 +24,7 @@
 #ifndef  VALUE_H
 #define  VALUE_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <VCardEntity.h>
 
@@ -38,8 +38,8 @@ class Value : public Entity
         virtual Value *clone() { return new Value( *this ); }
 };
 
-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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~AdrParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~AdrValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~AgentParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~AgentValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~ClassValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~ContentLine();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~DateParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~DateValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~EmailParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~FloatValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~GeoValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~Group();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~ImageParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~ImageValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~ImgParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~ImgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~LangValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~NValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~V_Name();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~OrgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~Param();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~V_ParamName();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~V_ParamValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~PhoneNumberValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~SoundValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~SourceParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TelParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TelValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TextBinParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TextBinValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TextListValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TextNSParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TextParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~TextValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~URIValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~UTCValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~VCard();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~VCardEntity();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 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);}
 
 virtual ~Value();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}