initial public commit of qt4 portp1

author: Michael Krelin <hacker@klever.net> 2007-07-04 11:23:42 (UTC)
committer: Michael Krelin <hacker@klever.net> 2007-07-04 11:23:42 (UTC)
commit: a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff)
tree: 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kabc/vcard
parent: 11edc920afe4f274c0964436633aa632c8288a40 (diff)
download: kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardRToken.h>
 #include <VCardAdrParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 AdrParam::AdrParam()
                :Param()
 {
@@ -35,13 +37,13 @@ AdrParam::AdrParam()
 AdrParam::AdrParam(const AdrParam & x)
                :Param(x),
                        adrTypeList_(x.adrTypeList_)
 {
 }
-AdrParam::AdrParam(const QCString & s)
+AdrParam::AdrParam(const Q3CString & s)
                :Param(s)
 {
 }
        AdrParam &
 AdrParam::operator = (AdrParam & x)
@@ -53,13 +55,13 @@ AdrParam::operator = (AdrParam & x)
        Param::operator = (x);
        return *this;
 }
        AdrParam &
-AdrParam::operator = (const QCString & s)
+AdrParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        
        adrTypeList_.clear();
        textParam_.truncate(0);
        
@@ -74,13 +76,13 @@ AdrParam::operator == (AdrParam & x)
        if (!x.textParam().isEmpty())
                return (x.textParam_ == textParam_);
        if (x.adrTypeList().count() != adrTypeList_.count())
                return false;
        
-        QStrListIterator it(x.adrTypeList_);
+        Q3StrListIterator it(x.adrTypeList_);
        
        for (; it.current(); ++it)
                if (!adrTypeList_.find(it.current()))
                        return false;
        
        return true;
@@ -111,13 +113,13 @@ AdrParam::_assemble()
 {
        if (!textParam_.isEmpty()) {
                strRep_ = textParam_;
                return;
        }
        
-        QStrListIterator it(adrTypeList_);
+        Q3StrListIterator it(adrTypeList_);
        
        for (; it.current(); ++it) {
                
                strRep_ += it.current();
                
                if (it.current() != adrTypeList_.last())
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
@@ -22,12 +22,15 @@
 */
 #include <VCardRToken.h>
 #include <VCardAdrValue.h>
 #include <VCardValue.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3StrList>
+#include <Q3CString>
 using namespace VCARD;
 AdrValue::AdrValue()
                :Value()
 {
@@ -42,13 +45,13 @@ AdrValue::AdrValue(const AdrValue & x)
                        region_         (x.region_),
                        postCode_(x.postCode_),
                        countryName_(x.countryName_)
 {
 }
-AdrValue::AdrValue(const QCString & s)
+AdrValue::AdrValue(const Q3CString & s)
                :Value(s)
 {
 }
        AdrValue &
 AdrValue::operator = (AdrValue & x)
@@ -65,13 +68,13 @@ AdrValue::operator = (AdrValue & x)
        Value::operator = (x);
        return *this;
 }
        AdrValue &
-AdrValue::operator = (const QCString & s)
+AdrValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -102,13 +105,13 @@ AdrValue::clone()
        void
 AdrValue::_parse()
 {
        vDebug("AdrValue::_parse()");
-        QStrList l;
+        Q3StrList l;
        RTokenise(strRep_, ";", l);
        
        for (unsigned int i = 0; i < l.count(); i++) {
                
                switch (i) {
                        
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardAgentParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 AgentParam::AgentParam()
                :Param()
 {
@@ -36,13 +38,13 @@ AgentParam::AgentParam(const AgentParam & x)
                :Param(x),
                        refer_(x.refer_),
                        uri_(x.uri_)
 {
 }
-AgentParam::AgentParam(const QCString & s)
+AgentParam::AgentParam(const Q3CString & s)
                :Param(s)
 {
 }
        AgentParam &
 AgentParam::operator = (AgentParam & x)
@@ -54,13 +56,13 @@ AgentParam::operator = (AgentParam & x)
        Param::operator = (x);
        return *this;
 }
        AgentParam &
-AgentParam::operator = (const QCString & s)
+AgentParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardAgentValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 AgentValue::AgentValue()
                :Value()
 {
@@ -34,13 +36,13 @@ AgentValue::AgentValue()
 AgentValue::AgentValue(const AgentValue & x)
                :Value(x)
 {
 }
-AgentValue::AgentValue(const QCString & s)
+AgentValue::AgentValue(const Q3CString & s)
                :Value(s)
 {
 }
        AgentValue &
 AgentValue::operator = (AgentValue & x)
@@ -49,13 +51,13 @@ AgentValue::operator = (AgentValue & x)
        Value::operator = (x);
        return *this;
 }
        AgentValue &
-AgentValue::operator = (const QCString & s)
+AgentValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -23,12 +23,14 @@
 #include <VCardClassValue.h>
 #include <VCardValue.h>
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ClassValue::ClassValue()
                :Value()
 {
@@ -37,13 +39,13 @@ ClassValue::ClassValue()
 ClassValue::ClassValue(const ClassValue & x)
                :Value(x),
                classType_(x.classType_)
 {
 }
-ClassValue::ClassValue(const QCString & s)
+ClassValue::ClassValue(const Q3CString & s)
                :Value(s)
 {
 }
        ClassValue &
 ClassValue::operator = (ClassValue & x)
@@ -55,13 +57,13 @@ ClassValue::operator = (ClassValue & x)
        Value::operator = (x);
        return *this;
 }
        ClassValue &
-ClassValue::operator = (const QCString & s)
+ClassValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -18,14 +18,14 @@
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <qregexp.h>
 #include <kdebug.h>
 #include <VCardAdrParam.h>
 #include <VCardAgentParam.h>
@@ -95,13 +95,13 @@ ContentLine::ContentLine(const ContentLine & x)
        p->setValue( it.current()->value() );
    paramList_.append(p);
  }
 }
-ContentLine::ContentLine(const QCString & s)
+ContentLine::ContentLine(const Q3CString & s)
                :Entity(s),
                value_(0),
                paramType_( ParamUnknown ),
                valueType_( ValueUnknown ),
                entityType_( EntityUnknown )
 {
@@ -126,26 +126,26 @@ ContentLine::operator = (ContentLine & x)
        Entity::operator = (x);
        return *this;
 }
        ContentLine &
-ContentLine::operator = (const QCString & s)
+ContentLine::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        delete value_;
        value_ = 0;
        return *this;
 }
        bool
 ContentLine::operator == (ContentLine & x)
 {
        x.parse();
-        QPtrListIterator<Param> it(x.paramList());
+        Q3PtrListIterator<Param> it(x.paramList());
        if (!paramList_.find(it.current()))
                return false;
        return true;
 }
@@ -160,27 +160,27 @@ ContentLine::~ContentLine()
 ContentLine::_parse()
 {
        vDebug("parse");
    // Unfold folded lines
    // 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" );
        int split = strRep_.find(':');
        if (split == -1) { // invalid content line
                vDebug("No ':'");
                return;
        }
-        QCString firstPart(strRep_.left(split));
+        Q3CString firstPart(strRep_.left(split));
-        QCString valuePart(strRep_.mid(split + 1));
+        Q3CString valuePart(strRep_.mid(split + 1));
        split = firstPart.find('.');
        if (split != -1) {
                        group_  = firstPart.left(split);
                        firstPart= firstPart.mid(split + 1);
@@ -189,13 +189,13 @@ ContentLine::_parse()
        vDebug("Group == " + group_);
        vDebug("firstPart == " + firstPart);
        vDebug("valuePart == " + valuePart);
        // Now we have the group, the name and param list together and the value.
-        QStrList l;
+        Q3StrList l;
        RTokenise(firstPart, ";", l);
        if (l.count() == 0) {// invalid - no name !
                vDebug("No name for this content line !");
                return;
@@ -211,31 +211,31 @@ ContentLine::_parse()
                paramType_= EntityTypeToParamType(entityType_);
        unsigned int i = 0;
        // For each parameter, create a new parameter of the correct type.
-        QStrListIterator it(l);
+        Q3StrListIterator it(l);
        for (; it.current(); ++it, i++) {
-                QCString str = *it;
+                Q3CString str = *it;
                split = str.find("=");
                if (split < 0 ) {
                        vDebug("No '=' in paramter.");
                        continue;
                }
-                QCString paraName = str.left(split);
+                Q3CString paraName = str.left(split);
-                QCString paraValue = str.mid(split + 1);
+                Q3CString paraValue = str.mid(split + 1);
-                QStrList paraValues;
+                Q3StrList paraValues;
                RTokenise(paraValue, ",", paraValues);
-                QStrListIterator it2( paraValues );
+                Q3StrListIterator it2( paraValues );
                for(; it2.current(); ++it2) {
                        Param *p = new Param;
                        p->setName( paraName );
                        p->setValue( *it2 );
@@ -306,13 +306,13 @@ ContentLine::_assemble()
    strRep_ = cut.latin1();
    //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
 #if 0
        vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
        strRep_.truncate(0);
-        QCString line;
+        Q3CString line;
        if (!group_.isEmpty())
                line += group_ + '.';
        line += name_;
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardDateParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 DateParam::DateParam()
                :Param()
 {
@@ -34,13 +36,13 @@ DateParam::DateParam()
 DateParam::DateParam(const DateParam & x)
                :Param(x)
 {
 }
-DateParam::DateParam(const QCString & s)
+DateParam::DateParam(const Q3CString & s)
                :Param(s)
 {
 }
        DateParam &
 DateParam::operator = (DateParam & x)
@@ -49,13 +51,13 @@ DateParam::operator = (DateParam & x)
        Param::operator = (x);
        return *this;
 }
        DateParam &
-DateParam::operator = (const QCString & s)
+DateParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -19,12 +19,14 @@
  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <kdebug.h>
 #include <VCardDefines.h>
 #include <VCardDateValue.h>
 #include <VCardValue.h>
@@ -102,13 +104,13 @@ DateValue::DateValue(const DateValue & x)
        zoneHour_ = x.zoneHour_;
        zoneMinute_ = x.zoneMinute_;
        secFrac_ = x.secFrac_;
        hasTime_ = x.hasTime_;
 }
-DateValue::DateValue(const QCString & s)
+DateValue::DateValue(const Q3CString & s)
                :Value(s)
 {
 }
        DateValue &
 DateValue::operator = (DateValue & x)
@@ -117,13 +119,13 @@ DateValue::operator = (DateValue & x)
        Value::operator = (x);
        return *this;
 }
        DateValue &
-DateValue::operator = (const QCString & s)
+DateValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -151,14 +153,14 @@ DateValue::_parse()
        // date = date-full-year ["-"] date-month ["-"] date-mday
        // time = time-hour [":"] time-minute [":"] time-second [":"]
        // [time-secfrac] [time-zone]
        
        int timeSep = strRep_.find('T');
        
-        QCString dateStr;
+        Q3CString dateStr;
-        QCString timeStr;
+        Q3CString timeStr;
        
        if (timeSep == -1) {
                
                dateStr = strRep_;
                vDebug("Has date string \"" + dateStr + "\"");
                
@@ -170,13 +172,13 @@ DateValue::_parse()
                timeStr = strRep_.mid(timeSep + 1);
                vDebug("Has time string \"" + timeStr + "\"");
        }
        
        /////////////////////////////////////////////////////////////// DATE
        
-        dateStr.replace(QRegExp("-"), "");
+        dateStr.replace("-", "");
        kdDebug(5710) << "dateStr: " << dateStr << endl;
                year_= dateStr.left(4).toInt();
                month_= dateStr.mid(4, 2).toInt();
                day_= dateStr.right(2).toInt();
@@ -193,13 +195,13 @@ DateValue::_parse()
        /////////////////////////////////////////////////////////////// ZONE
        
        int zoneSep = timeStr.find('Z');
        
        if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
                
-                QCString zoneStr(timeStr.mid(zoneSep + 1));
+                Q3CString zoneStr(timeStr.mid(zoneSep + 1));
                vDebug("zoneStr == " + zoneStr);
                        zonePositive_= (zoneStr[0] == '+');
                        zoneHour_       = zoneStr.mid(1, 2).toInt();
                        zoneMinute_     = zoneStr.right(2).toInt();
                
@@ -208,47 +210,47 @@ DateValue::_parse()
        //////////////////////////////////////////////////// SECOND FRACTION
        
        int secFracSep = timeStr.findRev(',');
        
        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();
        }
        
        /////////////////////////////////////////////////////////////// HMS
-        timeStr.replace(QRegExp(":"), "");
+        timeStr.replace(":", "");
        
                hour_= timeStr.left(2).toInt();
                minute_= timeStr.mid(2, 2).toInt();
                second_= timeStr.mid(4, 2).toInt();
 }
        void
 DateValue::_assemble()
 {
        vDebug("DateValue::_assemble");
-        QCString year;
+        Q3CString year;
-        QCString month;
+        Q3CString month;
-        QCString day;
+        Q3CString day;
        
        year.setNum( year_ );
        month.setNum( month_ );
        day.setNum( day_ );
        if ( month.length() < 2 ) month.prepend( "0" );
        if ( day.length() < 2 ) day.prepend( "0" );
        strRep_ = year + '-' + month + '-' + day;
        if ( hasTime_ ) {
-            QCString hour;
+            Q3CString hour;
-            QCString minute;
+            Q3CString minute;
-            QCString second;
+            Q3CString second;
            hour.setNum( hour_ );
            minute.setNum( minute_ );
            second.setNum( second_ );
            if ( hour.length() < 2 ) hour.prepend( "0" );
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardEmailParam.h>
 #include <VCardParam.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 EmailParam::EmailParam()
                :Param()
 {
@@ -37,13 +39,13 @@ EmailParam::EmailParam(const EmailParam & x)
                :Param(x),
                        emailType_(x.emailType_),
                        pref_   (x.pref_)
 {
 }
-EmailParam::EmailParam(const QCString & s)
+EmailParam::EmailParam(const Q3CString & s)
                :Param(s)
 {
 }
        EmailParam &
 EmailParam::operator = (EmailParam & x)
@@ -55,13 +57,13 @@ EmailParam::operator = (EmailParam & x)
        Param::operator = (x);
        return *this;
 }
        EmailParam &
-EmailParam::operator = (const QCString & s)
+EmailParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -19,12 +19,14 @@
  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardEntity.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 Entity::Entity()
                :       parsed_         (false),
                        assembled_(true)
@@ -37,13 +39,13 @@ Entity::Entity(const Entity & e)
                        parsed_         (e.parsed_),
                        assembled_(e.assembled_)
 {
        // empty
 }
                
-Entity::Entity(const QCString & s)
+Entity::Entity(const Q3CString & s)
                :       strRep_         (s),
                        parsed_         (false),
                        assembled_(true)
 {
        // empty
 }
@@ -58,13 +60,13 @@ Entity::operator = (const Entity & e)
                assembled_= e.assembled_;
        return *this;
 }
                
        Entity &
-Entity::operator = (const QCString & s)
+Entity::operator = (const Q3CString & s)
 {
                strRep_         = s;
                parsed_         = false;
                assembled_= true;
        
        return *this;
@@ -80,29 +82,29 @@ Entity::operator == (Entity & e)
 Entity::operator != (Entity & e)
 {
        return !(*this == e);
 }
                
        bool
-Entity::operator == (const QCString & s)
+Entity::operator == (const Q3CString & s)
 {
        return asString() == s;
 }
                
        bool
-Entity::operator != (const QCString & s)
+Entity::operator != (const Q3CString & s)
 {
        return !(*this == s);
 }
                
 Entity::~Entity()
 {
        // empty
 }
                
-        QCString
+        Q3CString
 Entity::asString()
 {
        //vDebug("Entity::asString()");
        assemble();
        return strRep_;
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
@@ -18,21 +18,21 @@
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <ctype.h>
 #include <VCardEnum.h>
 using namespace VCARD;
 // There are 31 possible types, not including extensions.
-        const QCString
+        const Q3CString
 VCARD::paramNames [] =
 {
        "NAME",
        "PROFILE",
        "SOURCE",
        "FN",
@@ -219,21 +219,21 @@ VCARD::EntityTypeToValueType(EntityType e)
        }
        
        return t;
 }
-        QCString
+        Q3CString
 VCARD::EntityTypeToParamName(EntityType e)
 {
        if ( e > EntityUnknown ) e = EntityUnknown;
        return paramNames[ int( e ) ];
 }
        EntityType
-VCARD::EntityNameToEntityType(const QCString & s)
+VCARD::EntityNameToEntityType(const Q3CString & s)
 {
        if (s.isEmpty()) return EntityUnknown;
        
        EntityType t(EntityUnknown);
        
        switch (s[0]) {
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardFloatValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 FloatValue::FloatValue()
                :Value()
 {
@@ -42,13 +44,13 @@ FloatValue::FloatValue(float f)
 FloatValue::FloatValue(const FloatValue & x)
                :Value(x)
 {
        value_ = x.value_;
 }
-FloatValue::FloatValue(const QCString & s)
+FloatValue::FloatValue(const Q3CString & s)
                :Value(s)
 {
 }
        FloatValue &
 FloatValue::operator = (FloatValue & x)
@@ -60,13 +62,13 @@ FloatValue::operator = (FloatValue & x)
        Value::operator = (x);
        return *this;
 }
        FloatValue &
-FloatValue::operator = (const QCString & s)
+FloatValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -98,13 +100,13 @@ FloatValue::_parse()
                value_ = -value_;
 }
        void
 FloatValue::_assemble()
 {
-        strRep_ = QCString().setNum(value_);
+        strRep_ = Q3CString().setNum(value_);
 }
        float
 FloatValue::value()
 {
        parse();
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
@@ -20,12 +20,14 @@
 #include <VCardGeoValue.h>
 #include <VCardValue.h>
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 GeoValue::GeoValue()
                :Value()
 {
@@ -33,13 +35,13 @@ GeoValue::GeoValue()
 GeoValue::GeoValue(const GeoValue & x)
                :Value(x), latitude_(x.latitude_), longitude_(x.longitude_)
 {
 }
-GeoValue::GeoValue(const QCString & s)
+GeoValue::GeoValue(const Q3CString & s)
                :Value(s)
 {
 }
        GeoValue &
 GeoValue::operator = (GeoValue & x)
@@ -51,13 +53,13 @@ GeoValue::operator = (GeoValue & x)
        Value::operator = (x);
        return *this;
 }
        GeoValue &
-GeoValue::operator = (const QCString & s)
+GeoValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardImageParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ImageParam::ImageParam()
                :Param()
 {
@@ -34,13 +36,13 @@ ImageParam::ImageParam()
 ImageParam::ImageParam(const ImageParam & x)
                :Param(x)
 {
 }
-ImageParam::ImageParam(const QCString & s)
+ImageParam::ImageParam(const Q3CString & s)
                :Param(s)
 {
 }
        ImageParam &
 ImageParam::operator = (ImageParam & x)
@@ -49,13 +51,13 @@ ImageParam::operator = (ImageParam & x)
        Param::operator = (x);
        return *this;
 }
        ImageParam &
-ImageParam::operator = (const QCString & s)
+ImageParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardImageValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ImageValue::ImageValue()
                :Value()
 {
@@ -34,13 +36,13 @@ ImageValue::ImageValue()
 ImageValue::ImageValue(const ImageValue & x)
                :Value(x)
 {
 }
-ImageValue::ImageValue(const QCString & s)
+ImageValue::ImageValue(const Q3CString & s)
                :Value(s)
 {
 }
        ImageValue &
 ImageValue::operator = (ImageValue & x)
@@ -49,13 +51,13 @@ ImageValue::operator = (ImageValue & x)
        Value::operator = (x);
        return *this;
 }
        ImageValue &
-ImageValue::operator = (const QCString & s)
+ImageValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardImgValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ImgValue::ImgValue()
                :Value()
 {
@@ -34,13 +36,13 @@ ImgValue::ImgValue()
 ImgValue::ImgValue(const ImgValue & x)
                :Value(x)
 {
 }
-ImgValue::ImgValue(const QCString & s)
+ImgValue::ImgValue(const Q3CString & s)
                :Value(s)
 {
 }
        ImgValue &
 ImgValue::operator = (ImgValue & x)
@@ -49,13 +51,13 @@ ImgValue::operator = (ImgValue & x)
        Value::operator = (x);
        return *this;
 }
        ImgValue &
-ImgValue::operator = (const QCString & s)
+ImgValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -23,12 +23,15 @@
 #include <VCardRToken.h>
 #include <VCardLangValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3StrList>
 using namespace VCARD;
 LangValue::LangValue()
                :Value()
 {
@@ -36,13 +39,13 @@ LangValue::LangValue()
 LangValue::LangValue(const LangValue & x)
                :Value(x)
 {
 }
-LangValue::LangValue(const QCString & s)
+LangValue::LangValue(const Q3CString & s)
                :Value(s)
 {
 }
        LangValue &
 LangValue::operator = (LangValue & x)
@@ -51,13 +54,13 @@ LangValue::operator = (LangValue & x)
        Value::operator = (x);
        return *this;
 }
        LangValue &
-LangValue::operator = (const QCString & s)
+LangValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -71,13 +74,13 @@ LangValue::~LangValue()
 {
 }
        void
 LangValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
        RTokenise(strRep_, "-", l);
        
        if (l.count() == 0) return;
        
        primary_ = l.at(0);
        
@@ -88,40 +91,41 @@ LangValue::_parse()
        void
 LangValue::_assemble()
 {
        strRep_ = primary_;
        
-        QStrListIterator it(subtags_);
+        Q3StrListIterator it(subtags_);
        
-        for (; it.current(); ++it)
+        for (; it.current(); ++it) {
-                strRep_ += QCString('-') + it.current();
+                strRep_ += Q3CString('-'); strRep_ += it.current();
+        }
 }
-        QCString
+        Q3CString
 LangValue::primary()
 {
        parse();
        return primary_;
 }
        
-        QStrList
+        Q3StrList
 LangValue::subtags()
 {
        parse();
        return subtags_;
 }
        
        void
-LangValue::setPrimary(const QCString & s)
+LangValue::setPrimary(const Q3CString & s)
 {
        parse();
        primary_ = s;
 }
        void
-LangValue::setSubTags(const QStrList & l)
+LangValue::setSubTags(const Q3StrList & l)
 {
        parse();
        subtags_ = 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
@@ -18,13 +18,15 @@
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardRToken.h>
 #include <VCardNValue.h>
 #include <VCardValue.h>
 #include <VCardDefines.h>
@@ -43,13 +45,13 @@ NValue::NValue(const NValue & x)
                        middle_(x.middle_),
                        prefix_(x.prefix_),
                        suffix_(x.suffix_)
 {
 }
-NValue::NValue(const QCString & s)
+NValue::NValue(const Q3CString & s)
                :Value(s)
 {
        vDebug("ctor");
 }
        NValue &
@@ -65,13 +67,13 @@ NValue::operator = (NValue & x)
        Value::operator = (x);
        return *this;
 }
        NValue &
-NValue::operator = (const QCString & s)
+NValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -97,13 +99,13 @@ NValue::clone()
        return new NValue( *this );
 }
        void
 NValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
        RTokenise(strRep_, ";", l);
        
        for (unsigned int i = 0; i < l.count(); i++) {
                switch (i) {
                                case 0: family_         = l.at(0);break;
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
@@ -23,12 +23,14 @@
 #include <VCardRToken.h>
 #include <VCardOrgValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 OrgValue::OrgValue()
                :Value()
 {
@@ -36,13 +38,13 @@ OrgValue::OrgValue()
 OrgValue::OrgValue(const OrgValue & x)
                :Value(x)
 {
 }
-OrgValue::OrgValue(const QCString & s)
+OrgValue::OrgValue(const Q3CString & s)
                :Value(s)
 {
 }
        OrgValue &
 OrgValue::operator = (OrgValue & x)
@@ -51,13 +53,13 @@ OrgValue::operator = (OrgValue & x)
        Value::operator = (x);
        return *this;
 }
        OrgValue &
-OrgValue::operator = (const QCString & s)
+OrgValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -79,13 +81,13 @@ OrgValue::_parse()
        void
 OrgValue::_assemble()
 {
        bool first(true);
        
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
        
        for (; it.current(); ++it) {
                if (!first) strRep_ += ';';
                strRep_ += it.current();
                first = false;
        }
@@ -95,13 +97,13 @@ OrgValue::_assemble()
 OrgValue::numValues()
 {
        parse();
        return valueList_.count();
 }
-        QCString
+        Q3CString
 OrgValue::value(unsigned int i)
 {
        parse();
        return valueList_.at(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
@@ -23,12 +23,14 @@
 #include <VCardParam.h>
 #include <VCardEntity.h>
 #include <VCardRToken.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 Param::Param()
                :Entity(),
                name_(""),
@@ -40,13 +42,13 @@ Param::Param(const Param & x)
                :Entity(x),
                name_(x.name_),
                value_(x.value_)
 {
 }
-Param::Param(const QCString & s)
+Param::Param(const Q3CString & s)
                :Entity(s),
                name_(""),
                value_("")
 {
 }
@@ -60,13 +62,13 @@ Param::operator = (Param & x)
        value_ = x.value_;
        
        return *this;
 }
        Param &
-Param::operator = (const QCString & s)
+Param::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
        bool
@@ -88,42 +90,42 @@ Param::_parse()
        void
 Param::_assemble()
 {
        strRep_ = name_ + "=" + value_;
 }
-Param::Param(const QCString &name, const QCString &value)
+Param::Param(const Q3CString &name, const Q3CString &value)
                :Entity(),
                name_(name),
                value_(value)
 {
        parsed_ = true;
        assembled_ = false;
 }
        void
-Param::setName(const QCString & name)
+Param::setName(const Q3CString & name)
 {
        name_ = name;
        
        assembled_ = false;
 }
        void
-Param::setValue(const QCString & value)
+Param::setValue(const Q3CString & value)
 {
        value_ = value;
        
        assembled_ = false;
 }
-        QCString
+        Q3CString
 Param::name()
 {
        return name_;
 }
-        QCString
+        Q3CString
 Param::value()
 {
        return 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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardPhoneNumberValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 PhoneNumberValue::PhoneNumberValue()
                :Value()
 {
@@ -34,13 +36,13 @@ PhoneNumberValue::PhoneNumberValue()
 PhoneNumberValue::PhoneNumberValue(const PhoneNumberValue & x)
                :Value(x)
 {
 }
-PhoneNumberValue::PhoneNumberValue(const QCString & s)
+PhoneNumberValue::PhoneNumberValue(const Q3CString & s)
                :Value(s)
 {
 }
        PhoneNumberValue &
 PhoneNumberValue::operator = (PhoneNumberValue & x)
@@ -49,13 +51,13 @@ PhoneNumberValue::operator = (PhoneNumberValue & x)
        Value::operator = (x);
        return *this;
 }
        PhoneNumberValue &
-PhoneNumberValue::operator = (const QCString & s)
+PhoneNumberValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -21,20 +21,20 @@
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <string.h>
 #include <stddef.h>
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 namespace VCARD
 {
        Q_UINT32
-RTokenise(const char * str, const char * delim, QStrList & l)
+RTokenise(const char * str, const char * delim, Q3StrList & l)
 {
        // FIXME no stderr !
        l.clear();
        
        if (!delim || !str || strlen(delim) == 0 || strlen(str) == 0) return 0;
        
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardSoundValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 SoundValue::SoundValue()
                :Value()
 {
@@ -34,13 +36,13 @@ SoundValue::SoundValue()
 SoundValue::SoundValue(const SoundValue & x)
                :Value(x)
 {
 }
-SoundValue::SoundValue(const QCString & s)
+SoundValue::SoundValue(const Q3CString & s)
                :Value(s)
 {
 }
        SoundValue &
 SoundValue::operator = (SoundValue & x)
@@ -49,13 +51,13 @@ SoundValue::operator = (SoundValue & x)
        Value::operator = (x);
        return *this;
 }
        SoundValue &
-SoundValue::operator = (const QCString & s)
+SoundValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardSourceParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 SourceParam::SourceParam()
                :Param(),
                type_(SourceParam::TypeUnknown)
@@ -38,13 +40,13 @@ SourceParam::SourceParam(const SourceParam & x)
                        type_(x.type_),
                        par_(x.par_),
                        val_(x.val_)
 {
 }
-SourceParam::SourceParam(const QCString & s)
+SourceParam::SourceParam(const Q3CString & s)
                :Param(s),
                type_(SourceParam::TypeUnknown)
 {
 }
        SourceParam &
@@ -57,13 +59,13 @@ SourceParam::operator = (SourceParam & x)
        Param::operator = (x);
        return *this;
 }
        SourceParam &
-SourceParam::operator = (const QCString & s)
+SourceParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardTelParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TelParam::TelParam()
                :Param()
 {
@@ -34,13 +36,13 @@ TelParam::TelParam()
 TelParam::TelParam(const TelParam & x)
                :Param(x)
 {
 }
-TelParam::TelParam(const QCString & s)
+TelParam::TelParam(const Q3CString & s)
                :Param(s)
 {
 }
        TelParam &
 TelParam::operator = (TelParam & x)
@@ -49,13 +51,13 @@ TelParam::operator = (TelParam & x)
        Param::operator = (x);
        return *this;
 }
        TelParam &
-TelParam::operator = (const QCString & s)
+TelParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardTelValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TelValue::TelValue()
                :Value()
 {
@@ -34,13 +36,13 @@ TelValue::TelValue()
 TelValue::TelValue(const TelValue & x)
                :Value(x)
 {
 }
-TelValue::TelValue(const QCString & s)
+TelValue::TelValue(const Q3CString & s)
                :Value(s)
 {
 }
        TelValue &
 TelValue::operator = (TelValue & x)
@@ -49,13 +51,13 @@ TelValue::operator = (TelValue & x)
        Value::operator = (x);
        return *this;
 }
        TelValue &
-TelValue::operator = (const QCString & s)
+TelValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardTextBinParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextBinParam::TextBinParam()
                :Param()
 {
@@ -34,13 +36,13 @@ TextBinParam::TextBinParam()
 TextBinParam::TextBinParam(const TextBinParam & x)
                :Param(x)
 {
 }
-TextBinParam::TextBinParam(const QCString & s)
+TextBinParam::TextBinParam(const Q3CString & s)
                :Param(s)
 {
 }
        TextBinParam &
 TextBinParam::operator = (TextBinParam & x)
@@ -49,13 +51,13 @@ TextBinParam::operator = (TextBinParam & x)
        Param::operator = (x);
        return *this;
 }
        TextBinParam &
-TextBinParam::operator = (const QCString & s)
+TextBinParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -22,12 +22,14 @@
 */
 #include <kmdcodec.h>
 #include <VCardTextBinValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextBinValue::TextBinValue()
                :Value()
 {
@@ -38,13 +40,13 @@ TextBinValue::TextBinValue(const TextBinValue & x)
 {
  mIsBinary_ = x.mIsBinary_;
  mData_ = x.mData_;
  mUrl_ = x.mUrl_;
 }
-TextBinValue::TextBinValue(const QCString & s)
+TextBinValue::TextBinValue(const Q3CString & s)
                :Value(s)
 {
 }
        TextBinValue &
 TextBinValue::operator = (TextBinValue & x)
@@ -57,13 +59,13 @@ TextBinValue::operator = (TextBinValue & x)
        Value::operator = (x);
        return *this;
 }
        TextBinValue &
-TextBinValue::operator = (const QCString & s)
+TextBinValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -23,12 +23,14 @@
 #include <VCardRToken.h>
 #include <VCardTextListValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextListValue::TextListValue()
                :Value()
 {
@@ -36,13 +38,13 @@ TextListValue::TextListValue()
 TextListValue::TextListValue(const TextListValue & x)
                :Value(x)
 {
 }
-TextListValue::TextListValue(const QCString & s)
+TextListValue::TextListValue(const Q3CString & s)
                :Value(s)
 {
 }
        TextListValue &
 TextListValue::operator = (TextListValue & x)
@@ -51,13 +53,13 @@ TextListValue::operator = (TextListValue & x)
        Value::operator = (x);
        return *this;
 }
        TextListValue &
-TextListValue::operator = (const QCString & s)
+TextListValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -79,13 +81,13 @@ TextListValue::_parse()
        void
 TextListValue::_assemble()
 {
        bool first(true);
        
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
        
        for (; it.current(); ++it) {
                if (!first) strRep_ += ';';
                strRep_ += it.current();
                first = false;
        }
@@ -95,13 +97,13 @@ TextListValue::_assemble()
 TextListValue::numValues()
 {
        parse();
        return valueList_.count();
 }
-        QCString
+        Q3CString
 TextListValue::value(unsigned int i)
 {
        parse();
        return valueList_.at(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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardTextParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextParam::TextParam()
                :Param()
 {
@@ -34,13 +36,13 @@ TextParam::TextParam()
 TextParam::TextParam(const TextParam & x)
                :Param(x)
 {
 }
-TextParam::TextParam(const QCString & s)
+TextParam::TextParam(const Q3CString & s)
                :Param(s)
 {
 }
        TextParam &
 TextParam::operator = (TextParam & x)
@@ -49,13 +51,13 @@ TextParam::operator = (TextParam & x)
        Param::operator = (x);
        return *this;
 }
        TextParam &
-TextParam::operator = (const QCString & s)
+TextParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
        bool
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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardTextValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextValue::TextValue()
                :Value()
 {
@@ -34,13 +36,13 @@ TextValue::TextValue()
 TextValue::TextValue(const TextValue & x)
                :Value(x)
 {
 }
-TextValue::TextValue(const QCString & s)
+TextValue::TextValue(const Q3CString & s)
                :Value(s)
 {
 }
        TextValue &
 TextValue::operator = (TextValue & x)
@@ -49,22 +51,22 @@ TextValue::operator = (TextValue & x)
        Value::operator = (x);
        return *this;
 }
        TextValue &
-TextValue::operator = (const QCString & s)
+TextValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
 TextValue::operator == (TextValue & x)
 {
-        return strRep_ = x.strRep_;
+        return strRep_ == x.strRep_;
 }
 TextValue::~TextValue()
 {
 }
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
@@ -21,21 +21,23 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardURIValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 URIValue::URIValue()
                :Value()
 {
 }
-URIValue::URIValue(const QCString & scheme, const QCString & schemeSpecificPart)
+URIValue::URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart)
                :Value(),
                        scheme_                         (scheme),
                        schemeSpecificPart_(schemeSpecificPart)
 {
        parsed_ = true;
 }
@@ -44,13 +46,13 @@ URIValue::URIValue(const URIValue & x)
                :       Value                   (x),
                        scheme_                         (x.scheme_),
                        schemeSpecificPart_(x.schemeSpecificPart_)
 {
 }
-URIValue::URIValue(const QCString & s)
+URIValue::URIValue(const Q3CString & s)
                :Value(s)
 {
 }
        URIValue &
 URIValue::operator = (URIValue & x)
@@ -62,13 +64,13 @@ URIValue::operator = (URIValue & x)
        Value::operator = (x);
        return *this;
 }
        URIValue &
-URIValue::operator = (const QCString & s)
+URIValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
@@ -100,34 +102,34 @@ URIValue::_parse()
        void
 URIValue::_assemble()
 {
        strRep_ = scheme_ + ':' + schemeSpecificPart_;
 }
-        QCString
+        Q3CString
 URIValue::scheme()
 {
        parse();
        return scheme_;
 }
-        QCString
+        Q3CString
 URIValue::schemeSpecificPart()
 {
        parse();
        return schemeSpecificPart_;
 }
        void
-URIValue::setScheme(const QCString & s)
+URIValue::setScheme(const Q3CString & s)
 {
        parse();
        scheme_ = s;
 }
        void
-URIValue::setSchemeSpecificPart(const QCString & s)
+URIValue::setSchemeSpecificPart(const Q3CString & s)
 {
        parse();
        schemeSpecificPart_ = 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
@@ -21,12 +21,14 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardUTCValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 UTCValue::UTCValue()
                :Value()
 {
@@ -35,13 +37,13 @@ UTCValue::UTCValue()
 UTCValue::UTCValue(const UTCValue & x)
                :       Value(x),positive_(x.positive_), hour_(x.hour_), minute_(x.minute_)
 {
 }
-UTCValue::UTCValue(const QCString & s)
+UTCValue::UTCValue(const Q3CString & s)
                :Value(s)
 {
 }
        UTCValue &
 UTCValue::operator = (UTCValue & x)
@@ -54,13 +56,13 @@ UTCValue::operator = (UTCValue & x)
        Value::operator = (x);
        return *this;
 }
        UTCValue &
-UTCValue::operator = (const QCString & s)
+UTCValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
        bool
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
@@ -20,12 +20,14 @@
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <qregexp.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardDefines.h>
 #include <VCardVCardEntity.h>
 using namespace VCARD;
@@ -38,13 +40,13 @@ VCardEntity::VCardEntity()
 VCardEntity::VCardEntity(const VCardEntity & x)
                :Entity(x)
 {
  cardList_.setAutoDelete( TRUE );
 }
-VCardEntity::VCardEntity(const QCString & s)
+VCardEntity::VCardEntity(const Q3CString & s)
                :Entity(s)
 {
  cardList_.setAutoDelete( TRUE );
 }
        VCardEntity &
@@ -54,13 +56,13 @@ VCardEntity::operator = (VCardEntity & x)
        Entity::operator = (x);
        return *this;
 }
        VCardEntity &
-VCardEntity::operator = (const QCString & s)
+VCardEntity::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
        bool
@@ -80,21 +82,21 @@ VCardEntity::_parse()
 #if 0
    QTime tim;
    tim.start();
    int num  = 0;
    // old code 
        vDebug("parse");
-        QCString s(strRep_);
+        Q3CString s(strRep_);
        int i = s.find(QRegExp("BEGIN:VCARD", false));
        while (i != -1) {
                i = s.find(QRegExp("BEGIN:VCARD", false), 11);
-                QCString cardStr(s.left(i));
+                Q3CString cardStr(s.left(i));
                VCard * v = new VCard(cardStr);
                cardList_.append(v);
                v->parse();
@@ -129,13 +131,13 @@ VCardEntity::_parse()
            }
            ++i;
        }
        if ( i <= len ) {
            ++num;
            char* dat = strRep_.data()+start;
-            VCard * v = new VCard( QCString (  dat,i-start ) );
+            VCard * v = new VCard( Q3CString (  dat,i-start ) );
            start = i;
            cardList_.append(v);
            v->parse();
        }
        i+= 11;
        }
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
@@ -18,17 +18,17 @@
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <qstringlist.h>
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <VCardEntity.h>
 #include <VCardVCard.h>
 #include <VCardContentLine.h>
 #include <VCardRToken.h>
@@ -45,44 +45,44 @@ VCard::VCard()
 VCard::VCard(const VCard & x)
                :Entity(x),
                group_(x.group_)
 {
  contentLineList_.setAutoDelete( TRUE );
-  QPtrListIterator<ContentLine> it(x.contentLineList_);
+  Q3PtrListIterator<ContentLine> it(x.contentLineList_);
  for (; it.current(); ++it) {
    ContentLine * c = new ContentLine(*it.current());
    contentLineList_.append(c);
  }
 }
-VCard::VCard(const QCString & s)
+VCard::VCard(const Q3CString & s)
                :Entity(s)
 {
  contentLineList_.setAutoDelete( TRUE );
 }
        VCard &
 VCard::operator = (VCard & x)
 {
        if (*this == x) return *this;
                group_                  = x.group();
-    QPtrListIterator<ContentLine> it(x.contentLineList_);
+    Q3PtrListIterator<ContentLine> it(x.contentLineList_);
    for (; it.current(); ++it) {
      ContentLine * c = new ContentLine(*it.current());
      contentLineList_.append(c);
    }
        Entity::operator = (x);
        return *this;
 }
        VCard &
-VCard::operator = (const QCString & s)
+VCard::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
        bool
@@ -98,21 +98,22 @@ VCard::~VCard()
        void
 VCard::_parse()
 {
        
        QStringList l;
-        QStrList sl;
+        Q3StrList sl;
        RTokenise(strRep_, "\r\n", sl);
        if (sl.count() < 3) { // Invalid VCARD !
        //qDebug("invalid vcard ");
                return;
        }
-    l = QStringList::fromStrList( sl );
+    for(Q3StrList::iterator i=sl.begin();i!=sl.end();++i)
+        l.push_back(*i);
        // Get the first line
        QString beginLine = l[0].stripWhiteSpace();
        // Remove extra blank lines
        while (l.last().isEmpty())
                l.remove(l.last());
@@ -177,13 +178,13 @@ VCard::_parse()
                }
                --it;
                refolded.append(cur);
        }
    QStringList::Iterator it2 = refolded.begin();
        for (; it2 != refolded.end(); ++it2) {
-                ContentLine * cl = new ContentLine(QCString((*it2).latin1()));
+                ContentLine * cl = new ContentLine(Q3CString((*it2).latin1()));
                cl->parse();
                if (cl->value() == 0)
                {
                    qDebug("Content line could not be parsed. Discarded: %s", (*it2).latin1());
                    delete cl;
                }
@@ -225,13 +226,13 @@ VCard::_parse()
 VCard::_assemble()
 {
        vDebug("Assembling vcard");
        strRep_ = "BEGIN:VCARD\r\n";
        strRep_ += "VERSION:3.0\r\n";
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
        for (; it.current(); ++it)
                strRep_ += it.current()->asString() + "\r\n";
        strRep_ += "END:VCARD\r\n";
 }
@@ -241,13 +242,13 @@ VCard::has(EntityType t)
 {
        parse();
        return contentLine(t) == 0 ? false : true;
 }
        bool
-VCard::has(const QCString & s)
+VCard::has(const Q3CString & s)
 {
        parse();
        return contentLine(s) == 0 ? false : true;
 }
        void
@@ -256,37 +257,37 @@ VCard::add(const ContentLine & cl)
        parse();
        ContentLine * c = new ContentLine(cl);
        contentLineList_.append(c);
 }
        void
-VCard::add(const QCString & s)
+VCard::add(const Q3CString & s)
 {
        parse();
        ContentLine * c = new ContentLine(s);
        contentLineList_.append(c);
 }
        ContentLine *
 VCard::contentLine(EntityType t)
 {
        parse();
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
        for (; it.current(); ++it)
                if (it.current()->entityType() == t)
                        return it.current();
        return 0;
 }
        ContentLine *
-VCard::contentLine(const QCString & s)
+VCard::contentLine(const Q3CString & s)
 {
        parse();
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
        for (; it.current(); ++it)
                if (it.current()->entityType() == EntityNameToEntityType(s))
                        return it.current();
        return 0;
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
@@ -20,12 +20,14 @@
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <VCardEntity.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 Value::Value()
                :Entity()
 {
@@ -33,13 +35,13 @@ Value::Value()
 Value::Value(const Value & x)
                :Entity(x)
 {
 }
-Value::Value(const QCString & s)
+Value::Value(const Q3CString & s)
                :Entity(s)
 {
 }
        Value &
 Value::operator = (Value & x)
@@ -48,13 +50,13 @@ Value::operator = (Value & x)
        Entity::operator = (x);
        return *this;
 }
        Value &
-Value::operator = (const QCString & s)
+Value::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
        bool
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
@@ -21,44 +21,44 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  ADRPARAM_H
 #define  ADRPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <VCardParam.h>
 namespace VCARD
 {
        
 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 {
                AdrDom, AdrIntl, AdrPostal, AdrParcel, AdrHome, AdrWork, AdrPref,
                AdrIANA, AdrX
        };
        
        private:
                
-                        QStrListadrTypeList_;
+                        Q3StrListadrTypeList_;
-                        QCStringtextParam_;
+                        Q3CStringtextParam_;
 };
 }
 #endif
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
@@ -21,63 +21,65 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  ADRVALUE_H
 #define  ADRVALUE_H
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardValue.h>
 namespace VCARD
 {
 class AdrValue : public Value
 {
        
 #include "AdrValue-generated.h"
        
        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_;}
+                Q3CString poBox()       { parse(); return poBox_;}
-                QCString extAddress()   { parse(); return extAddress_;}
+                Q3CString extAddress()  { parse(); return extAddress_;}
-                QCString street()       { parse(); return street_;}
+                Q3CString street()      { parse(); return street_;}
-                QCString locality()     { parse(); return locality_;}
+                Q3CString locality()    { parse(); return locality_;}
-                QCString region()       { parse(); return region_;}
+                Q3CString region()      { parse(); return region_;}
-                QCString postCode()     { parse(); return postCode_;}
+                Q3CString postCode()    { parse(); return postCode_;}
-                QCString countryName()  { parse(); return countryName_;}
+                Q3CString countryName()         { parse(); return countryName_;}
        
        private:
                
-                QCString poBox_;
+                Q3CString poBox_;
-                QCString extAddress_;
+                Q3CString extAddress_;
-                QCString street_;
+                Q3CString street_;
-                QCString locality_;
+                Q3CString locality_;
-                QCString region_;
+                Q3CString region_;
-                QCString postCode_;
+                Q3CString postCode_;
-                QCString countryName_;
+                Q3CString countryName_;
 };
 }
 #endif
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  AGENTPARAM_H
 #define  AGENTPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 #include <VCardURIValue.h>
 namespace VCARD
 {
@@ -43,13 +43,13 @@ class AgentParam : public Param
        URIValue uri()
        { parse(); return uri_; }
        
        void setRefer(bool b)
        { refer_ = b; assembled_ = false; }
-        void setURI(const QCString & s)
+        void setURI(const Q3CString & s)
        { uri_ = s; assembled_ = false; }
        
        private:
                
                        bool    refer_;
                        URIValueuri_;
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  AGENTVALUE_H
 #define  AGENTVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  CLASSVALUE_H
 #define  CLASSVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 #include <kdebug.h>
 namespace VCARD
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
@@ -21,13 +21,15 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  CONTENTLINE_H
 #define  CONTENTLINE_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include "VCardEnum.h"
 #include "VCardEntity.h"
 #include "VCardParam.h"
 #include "VCardValue.h"
@@ -36,39 +38,39 @@ namespace VCARD
 class ContentLine : public Entity
 {
 #include "ContentLine-generated.h"
        
-                QCString        group()                 { parse(); return group_;}
+                Q3CString       group()                 { parse(); return group_;}
-                QCString        name()          { parse(); return name_;}
+                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)
        { value_ = s; assembled_ = false; }
        
                void setParamList(const ParamList & l)
        { paramList_ = l; assembled_ = false; }
                void clear      ();
        
        private:
                
-                        QCString        group_;
+                        Q3CString       group_;
-                        QCString        name_;
+                        Q3CString       name_;
-                        QPtrList<Param>         paramList_;
+                        Q3PtrList<Param>        paramList_;
                        Value           * value_;
                
                        ParamType       paramType_;
                        ValueType       valueType_;
                        EntityType      entityType_;
 };
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  DATEPARAM_H
 #define  DATEPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
 {
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  DATEVALUE_H
 #define  DATEVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdatetime.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -32,20 +32,20 @@
 #else
 #define vDebug(a)
 #endif
 #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)
 #endif
 #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
@@ -21,36 +21,36 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  EMAILPARAM_H
 #define  EMAILPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
 {
 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)
        { pref_ = b; assembled_ = false; }
        
        private:
        
-                        QCStringemailType_;
+                        Q3CStringemailType_;
                        bool    pref_;
 };
 }
 #endif
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
@@ -21,46 +21,46 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  ENTITY_H
 #define  ENTITY_H
-#include <qcstring.h>
+#include <q3cstring.h>
 namespace VCARD
 {
 class Entity
 {
        public:
                
                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 Q3CString & s);
-                virtual bool operator != (const QCString & s);
+                virtual bool operator != (const Q3CString & s);
                
                virtual ~Entity();
                
-                QCString asString();
+                Q3CString asString();
                
                virtual void parse();
                virtual void assemble();
                
                virtual void _parse() = 0;
                virtual void _assemble() = 0;
        
        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
@@ -21,18 +21,18 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #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,
        EntityProfile,
        EntitySource,
        EntityFullName,
@@ -105,14 +105,14 @@ enum ParamType {
 };
 extern const ParamType paramTypesTable[];
 ParamType EntityTypeToParamType(EntityType);
 ValueType EntityTypeToValueType(EntityType);
-QCString EntityTypeToParamName(EntityType);
+Q3CString EntityTypeToParamName(EntityType);
-EntityType EntityNameToEntityType(const QCString &);
+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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  FLOATVALUE_H
 #define  FLOATVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  IMGPARAM_H
 #define  IMGPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
 {
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  IMAGEVALUE_H
 #define  IMAGEVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -21,31 +21,31 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  LANGVALUE_H
 #define  LANGVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <VCardValue.h>
 namespace VCARD
 {
 class LangValue : public Value
 {
 #include "LangValue-generated.h"
        
-        QCString primary();
+        Q3CString primary();
-        QStrList subtags();
+        Q3StrList subtags();
        
-                void setPrimary(const QCString &);
+                void setPrimary(const Q3CString &);
-        void setSubTags(const QStrList &);
+        void setSubTags(const Q3StrList &);
        
-        QCString primary_;
+        Q3CString primary_;
-        QStrList subtags_;
+        Q3StrList subtags_;
 };
 }
 #endif
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
@@ -22,35 +22,37 @@
 */
 #ifndef  NVALUE_H
 #define  NVALUE_H
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 namespace VCARD
 {
 class NValue : public Value
 {
 #include "NValue-generated.h"
        NValue *clone();
-                QCString family()       { parse(); return family_;}
+                Q3CString family()      { parse(); return family_;}
-                QCString given()        { parse(); return given_;}
+                Q3CString given()       { parse(); return given_;}
-                QCString middle()       { parse(); return middle_;}
+                Q3CString middle()      { parse(); return middle_;}
-                QCString prefix()       { parse(); return prefix_;}
+                Q3CString prefix()      { parse(); return prefix_;}
-                QCString suffix()       { parse(); return suffix_;}
+                Q3CString suffix()      { parse(); return suffix_;}
-                void setFamily  (const QCString & s) { family_= s; assembled_ = false; }
+                void setFamily  (const Q3CString & s) { family_= s; assembled_ = false; }
-                void setGiven   (const QCString & s) { given_= s; assembled_ = false; }
+                void setGiven   (const Q3CString & s) { given_= s; assembled_ = false; }
-                void setMiddle  (const QCString & s) { middle_= s; assembled_ = false; }
+                void setMiddle  (const Q3CString & s) { middle_= s; assembled_ = false; }
-                void setPrefix  (const QCString & s) { prefix_= s; assembled_ = false; }
+                void setPrefix  (const Q3CString & s) { prefix_= s; assembled_ = false; }
-                void setSuffix  (const QCString & s) { suffix_= 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_;
 };
 }
 #endif
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
@@ -21,30 +21,30 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  ORGVALUE_H
 #define  ORGVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <VCardValue.h>
 namespace VCARD
 {
 class OrgValue : public Value
 {
        
 #include "OrgValue-generated.h"
        
        unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
        
        private:
                
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 }
 #endif
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
@@ -21,39 +21,39 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  PARAM_H
 #define  PARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <VCardEntity.h>
 namespace VCARD
 {
 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 setName(const Q3CString &);
-        void setValue(const QCString &);
+        void setValue(const Q3CString &);
                
-        QCString name();
+        Q3CString name();
-        QCString value();
+        Q3CString value();
        
        private:
                
-                QCString name_;
+                Q3CString name_;
-                QCString value_;
+                Q3CString value_;
 };
-typedef QPtrList<Param> ParamList;
+typedef Q3PtrList<Param> ParamList;
-typedef QPtrListIterator<Param> ParamListIterator;
+typedef Q3PtrListIterator<Param> ParamListIterator;
 }
 #endif
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
@@ -22,17 +22,17 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #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);
 }
 #endif
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  SOUNDVALUE_H
 #define  SOUNDVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  SOURCEPARAM_H
 #define  SOURCEPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
 {
@@ -36,23 +36,23 @@ class SourceParam : public Param
 #include "SourceParam-generated.h"
        
        enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
        
                        SourceParamType type(){ parse(); return type_;}
-                        QCString par()          { parse(); return par_; }
+                        Q3CString par()                 { parse(); return par_; }
-                        QCString val()          { parse(); return val_; }
+                        Q3CString val()                 { parse(); return val_; }
                
                        void setType(SourceParamType t) { type_= t; assembled_ = false; }
-                        void setPar(const QCString & s) { par_= s; assembled_ = false; }
+                        void setPar(const Q3CString & s) { par_= s; assembled_ = false; }
-                        void setVal(const QCString & s) { val_= 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
 };
 }
 #endif
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
@@ -21,13 +21,15 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  TELPARAM_H
 #define  TELPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include <VCardParam.h>
 namespace VCARD
 {
@@ -40,12 +42,12 @@ class TelParam : public Param
                TelPager, TelBBS, TelModem, TelCar, TelISDN, TelVideo, TelPCS,
                TelIANA, TelX
        };
        
        private:
                
-                QPtrList<TelType> types_;
+                Q3PtrList<TelType> types_;
 };
 }
 #endif
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  TELVALUE_H
 #define  TELVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  TEXTBINPARAM_H
 #define  TEXTBINPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
 {
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  TEXTBINVALUE_H
 #define  TEXTBINVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -21,31 +21,31 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  TEXTLISTVALUE_H
 #define  TEXTLISTVALUE_H
-#include <qstrlist.h>
+#include <q3strlist.h>
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
 class TextListValue : public Value
 {
        
 #include "TextListValue-generated.h"
        
        unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
        
        private:
                
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 }
 #endif
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  TEXTPARAM_H
 #define  TEXTPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
 {
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
@@ -22,31 +22,33 @@
 */
 #ifndef  URIVALUE_H
 #define  URIVALUE_H
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 namespace VCARD
 {
 class URIValue : public Value
 {
 #include "URIValue-generated.h"
-        URIValue(const QCString & scheme, const QCString & schemeSpecificPart);
+        URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart);
        
-        QCString scheme();
+        Q3CString scheme();
-        QCString schemeSpecificPart();
+        Q3CString schemeSpecificPart();
        
-                void setScheme                  (const QCString &);
+                void setScheme                  (const Q3CString &);
-                void setSchemeSpecificPart(const QCString &);
+                void setSchemeSpecificPart(const Q3CString &);
        
        private:
        
-                QCString scheme_;
+                Q3CString scheme_;
-                QCString schemeSpecificPart_;
+                Q3CString schemeSpecificPart_;
 };
 }
 #endif
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  UTCVALUE_H
 #define  UTCVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
 {
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
@@ -22,13 +22,15 @@
 */
 #ifndef  VCARD_VCARD_H
 #define  VCARD_VCARD_H
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardEnum.h>
 #include <VCardEntity.h>
 #include <VCardContentLine.h>
 namespace VCARD
@@ -37,27 +39,27 @@ namespace VCARD
 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_;
+                Q3CString       group_;
-                QPtrList<ContentLine>contentLineList_;
+                Q3PtrList<ContentLine>contentLineList_;
 };
 }
 #endif
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
@@ -22,23 +22,23 @@
 */
 #ifndef  VCARD_ENTITY_H
 #define  VCARD_ENTITY_H
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <VCardEnum.h>
 #include <VCardVCard.h>
 #include <VCardEntity.h>
 namespace VCARD
 {
  
-typedef QPtrList<VCard> VCardList;
+typedef Q3PtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef Q3PtrListIterator<VCard> VCardListIterator;
 class VCardEntity : public Entity
 {
 #include "VCardEntity-generated.h"
        
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
@@ -21,13 +21,13 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef  VALUE_H
 #define  VALUE_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <VCardEntity.h>
 namespace VCARD
 {
@@ -35,12 +35,12 @@ class Value : public Entity
 {
 #include "Value-generated.h"
        virtual Value *clone() { return new Value( *this ); }
 };
-typedef QPtrList<Value> ValueList;
+typedef Q3PtrList<Value> ValueList;
-typedef QPtrListIterator<Value> ValueListIterator;
+typedef Q3PtrListIterator<Value> ValueListIterator;
 }
 #endif
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,18 +1,20 @@
+//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 Q3CString& s) {AdrParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AdrParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {AdrValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AdrValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {AgentParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AgentParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {AgentValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AgentValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {ClassValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ClassValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {ContentLine a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ContentLine();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {DateParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~DateParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {DateValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~DateValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {EmailParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~EmailParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {FloatValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~FloatValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {GeoValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~GeoValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {Group a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~Group();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {ImageParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImageParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {ImageValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImageValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {ImgParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImgParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {ImgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {LangValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~LangValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {NValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~NValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {V_Name a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~V_Name();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {OrgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~OrgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {Param a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~Param();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {V_ParamName a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~V_ParamName();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {V_ParamValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~V_ParamValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {PhoneNumberValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~PhoneNumberValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {SoundValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~SoundValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {SourceParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~SourceParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TelParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TelParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TelValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TelValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TextBinParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextBinParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TextBinValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextBinValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TextListValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextListValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TextNSParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextNSParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TextParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {TextValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {URIValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~URIValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {UTCValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~UTCValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {VCard a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~VCard();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {VCardEntity a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~VCardEntity();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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,18 +1,20 @@
+//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 Q3CString& s) {Value a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~Value();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
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
@@ -1,12 +1,14 @@
 #include <iostream>
 #include <stdlib.h>
 #include <assert.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCard.h>
 using namespace std;
 int main(int argc, char * argv[])
@@ -15,20 +17,20 @@ int main(int argc, char * argv[])
                cerr << "Usage: " << argv[0] << " <filename>" << endl;
                exit(1);
        }
        
        QFile f(argv[1]);
        
-        QCString str;
+        Q3CString str;
        
-        if (!f.open(IO_ReadOnly)) {
+        if (!f.open(QIODevice::ReadOnly)) {
                cerr << "Couldn't open file \"" << argv[1] << endl;
                exit(1);
        }
        
-        QTextStream t(&f);
+        Q3TextStream t(&f);
        
        while (!t.eof())
                str += t.readLine().utf8() + '\n';
        
        using namespace VCARD; 
@@ -49,13 +51,13 @@ int main(int argc, char * argv[])
                // Create a vcard using the string representation.
                VCard & v (*it.current());
                if (v.has(EntityEmail)) {
                        cerr << "Email parameter found" << endl;
                        
-                        QCString s = v.contentLine(EntityEmail)->value()->asString();
+                        Q3CString s = v.contentLine(EntityEmail)->value()->asString();
                        
                        cerr << "Email value == " << s << endl;
                }
                
                if (v.has(EntityNickname)) {
                        cerr << "Nickname parameter found" << endl;
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
@@ -2,12 +2,14 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <VCard.h>
+//Added by qt3to4:
+#include <Q3CString>
 int main(int argc,char **argv)
 {
  KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
  KCmdLineArgs::init(argc,argv,&aboutData);
@@ -30,12 +32,12 @@ int main(int argc,char **argv)
  ParamList p;
  p.append( new TelParam("home") );
  p.append( new TelParam("fax") );
  cl2.setParamList( p );
  v.add(cl2);
-  QCString str = v.asString();
+  Q3CString str = v.asString();
  kdDebug() << "--- VCard begin ---" << endl
            << str
            << "--- VCard  end  ---" << endl;
 }
author	Michael Krelin <hacker@klever.net>	2007-07-04 11:23:42 (UTC)
committer	Michael Krelin <hacker@klever.net>	2007-07-04 11:23:42 (UTC)
commit	a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff)
tree	8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kabc/vcard
parent	11edc920afe4f274c0964436633aa632c8288a40 (diff)
download	kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2