Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

11 files changed, 130 insertions, 130 deletions

diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index 52fe81a11..bad2ceb78 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -20,8 +20,8 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 
 #include <kprocess.h>
 #include <kdebug.h>
@@ -59,18 +59,18 @@ int main( int argc, char **argv )
     return 1;
   }
 
-  QString inputFile( args->arg( 0 ) );
+  TQString inputFile( args->arg( 0 ) );
 
-  QFile file( inputFile );
+  TQFile file( inputFile );
   if ( !file.open( IO_ReadOnly ) ) {
     qDebug( "Unable to open file '%s' for reading!", file.name().latin1() );
     return 1;
   }
 
-  QString text;
+  TQString text;
 
-  QTextStream s( &file );
-  s.setEncoding( QTextStream::Latin1 );
+  TQTextStream s( &file );
+  s.setEncoding( TQTextStream::Latin1 );
   text = s.read();
   file.close();
 
diff --git a/kabc/vcardparser/testread2.cpp b/kabc/vcardparser/testread2.cpp
index 19a02e3c9..ba73081e7 100644
--- a/kabc/vcardparser/testread2.cpp
+++ b/kabc/vcardparser/testread2.cpp
@@ -9,7 +9,7 @@ int
 main()
 {
     Addressee::List l = vCardsAsAddresseeList();
-    QString vcards = vCardsAsText();
+    TQString vcards = vCardsAsText();
 
     VCardConverter vct;
 
diff --git a/kabc/vcardparser/testutils.cpp b/kabc/vcardparser/testutils.cpp
index 086dd297e..df4b60c9c 100644
--- a/kabc/vcardparser/testutils.cpp
+++ b/kabc/vcardparser/testutils.cpp
@@ -1,6 +1,6 @@
 #include <vcardparser.h>
 #include <kabc/addressee.h>
-#include <qfile.h>
+#include <tqfile.h>
 
 using namespace KABC;
 
@@ -62,12 +62,12 @@ vcard3()
 
 
 QString
-vcardAsText( const QString& location )
+vcardAsText( const TQString& location )
 {
-    QString line;
-    QFile file( location );
+    TQString line;
+    TQFile file( location );
     if ( file.open( IO_ReadOnly ) ) {
-        QTextStream stream( &file );
+        TQTextStream stream( &file );
         if ( !stream.eof() ) {
             line = stream.read();
         }
@@ -91,7 +91,7 @@ vCardsAsAddresseeList()
 QString
 vCardsAsText()
 {
-    QString vcards = vcardAsText( "tests/vcard1.vcf" );
+    TQString vcards = vcardAsText( "tests/vcard1.vcf" );
     vcards += vcardAsText( "tests/vcard2.vcf" );
     vcards += vcardAsText( "tests/vcard3.vcf" );
 
diff --git a/kabc/vcardparser/testutils.h b/kabc/vcardparser/testutils.h
index 369912ac0..4f2024177 100644
--- a/kabc/vcardparser/testutils.h
+++ b/kabc/vcardparser/testutils.h
@@ -2,13 +2,13 @@
 #define TESTUTILS_H
 
 #include <kabc/addressee.h>
-#include <qstring.h>
+#include <tqstring.h>
 
 KABC::Addressee vcard1();
 KABC::Addressee vcard2();
 KABC::Addressee vcard3();
 KABC::Addressee::List vCardsAsAddresseeList();
-QString   vCardAsText( const QString& location );
-QString   vCardsAsText();
+TQString   vCardAsText( const TQString& location );
+TQString   vCardsAsText();
 
 #endif
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index 7d2f77c83..f6e894f4b 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -28,8 +28,8 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 
 #include "vcardconverter.h"
 
@@ -46,7 +46,7 @@ int main( int argc, char **argv )
 
   addressee.setNameFromString( "Mr. Tobias Koenig Jr." );
   addressee.setNickName( "tokoe" );
-  addressee.setBirthday( QDate( 1982, 7, 19 ) );
+  addressee.setBirthday( TQDate( 1982, 7, 19 ) );
   addressee.setMailer( "mutt1.2" );
   addressee.setTimeZone( KABC::TimeZone( +2 ) );
 
@@ -60,26 +60,26 @@ int main( int argc, char **argv )
   addressee.setOrganization( "KDE" );
   addressee.setNote( "nerver\ntouch a running system" );
   addressee.setProductId( "testId" );
-  addressee.setRevision( QDateTime::currentDateTime() );
+  addressee.setRevision( TQDateTime::currentDateTime() );
   addressee.setSortString( "koenig" );
   addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
   addressee.setSecrecy(  KABC::Secrecy( KABC::Secrecy::Confidential ) );
 /*
-  QImage img;
+  TQImage img;
   img.load( "testimg.png", "PNG" );
   KABC::Picture photo;
   photo.setData( img );
   addressee.setPhoto( photo );
 
-  QImage img2;
+  TQImage img2;
   img2.load( "testimg.png", "PNG" );
   KABC::Picture logo;
   logo.setData( img2 );
   addressee.setLogo( logo );
 
-  QFile soundFile( "testsound.wav" );
+  TQFile soundFile( "testsound.wav" );
   soundFile.open( IO_ReadOnly );
-  QByteArray data = soundFile.readAll();
+  TQByteArray data = soundFile.readAll();
   soundFile.close();
   KABC::Sound sound;
   sound.setData( data );
@@ -96,7 +96,7 @@ int main( int argc, char **argv )
   KABC::Key key( "secret key", KABC::Key::X509 );
   addressee.insertKey( key );
 
-  QStringList categories;
+  TQStringList categories;
   categories << "Friends" << "School" << "KDE";
   addressee.setCategories( categories );
 
@@ -115,18 +115,18 @@ int main( int argc, char **argv )
   KABC::Addressee::List list;
   for ( int i = 0; i < 1000; ++i ) {
     KABC::Addressee addr = addressee;
-    addr.setUid( QString::number( i ) );
+    addr.setUid( TQString::number( i ) );
     list.append( addr );
   }
 
   KABC::VCardConverter converter;
-  QString txt = converter.createVCards( list );
+  TQString txt = converter.createVCards( list );
 
-  QFile file( "out.vcf" );
+  TQFile file( "out.vcf" );
   file.open( IO_WriteOnly );
 
-  QTextStream s( &file );
-  s.setEncoding( QTextStream::UnicodeUTF8 );
+  TQTextStream s( &file );
+  s.setEncoding( TQTextStream::UnicodeUTF8 );
   s << txt;
   file.close();
 
diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp
index 410a958d1..30a8e1c49 100644
--- a/kabc/vcardparser/vcard.cpp
+++ b/kabc/vcardparser/vcard.cpp
@@ -50,7 +50,7 @@ void VCard::clear()
   mLineMap.clear();
 }
 
-QStringList VCard::identifiers() const
+TQStringList VCard::identifiers() const
 {
   return mLineMap.keys();
 }
@@ -60,7 +60,7 @@ void VCard::addLine( const VCardLine& line )
   mLineMap[ line.identifier() ].append( line );
 }
 
-VCardLine::List VCard::lines( const QString& identifier ) const
+VCardLine::List VCard::lines( const TQString& identifier ) const
 {
   LineMap::ConstIterator it = mLineMap.find( identifier );
   if ( it == mLineMap.end() )
@@ -69,7 +69,7 @@ VCardLine::List VCard::lines( const QString& identifier ) const
   return *it;
 }
 
-VCardLine VCard::line( const QString& identifier ) const
+VCardLine VCard::line( const TQString& identifier ) const
 {
   LineMap::ConstIterator it = mLineMap.find( identifier );
   if ( it == mLineMap.end() )
diff --git a/kabc/vcardparser/vcard.h b/kabc/vcardparser/vcard.h
index 73fcd1ea2..6afeeda26 100644
--- a/kabc/vcardparser/vcard.h
+++ b/kabc/vcardparser/vcard.h
@@ -22,17 +22,17 @@
 #define VCARDPARSER_VCARD_H
 
 #include "vcardline.h"
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
 
 namespace KABC {
 
 class VCard
 {
   public:
-    typedef QValueList<VCard> List;
-    typedef QMap< QString, VCardLine::List > LineMap;
+    typedef TQValueList<VCard> List;
+    typedef TQMap< TQString, VCardLine::List > LineMap;
 
     enum Version { v2_1, v3_0 };
 
@@ -52,7 +52,7 @@ class VCard
      * Returns a list of all identifiers that exists in the
      * vCard.
      */
-    QStringList identifiers() const;
+    TQStringList identifiers() const;
 
     /**
      * Adds a VCardLine to the VCard
@@ -62,12 +62,12 @@ class VCard
     /**
      * Returns all lines of the vcard with a special identifier.
      */
-    VCardLine::List lines( const QString& identifier ) const;
+    VCardLine::List lines( const TQString& identifier ) const;
 
     /**
      * Returns only the first line of the vcard with a special identifier.
      */
-    VCardLine line( const QString& identifier ) const;
+    VCardLine line( const TQString& identifier ) const;
 
     /**
      * Set the version of the vCard.
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 247604ebb..6680cf7d0 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -25,7 +25,7 @@ using namespace KABC;
 class VCardLine::VCardLinePrivate
 {
   public:
-    QString mGroup;
+    TQString mGroup;
 };
 
 VCardLine::VCardLine()
@@ -33,13 +33,13 @@ VCardLine::VCardLine()
 {
 }
 
-VCardLine::VCardLine( const QString &identifier )
+VCardLine::VCardLine( const TQString &identifier )
   : d( 0 )
 {
   mIdentifier = identifier;
 }
 
-VCardLine::VCardLine( const QString &identifier, const QVariant &value )
+VCardLine::VCardLine( const TQString &identifier, const TQVariant &value )
   : d( 0 )
 {
   mIdentifier = identifier;
@@ -72,27 +72,27 @@ VCardLine& VCardLine::operator=( const VCardLine& line )
   return *this;
 }
 
-void VCardLine::setIdentifier( const QString& identifier )
+void VCardLine::setIdentifier( const TQString& identifier )
 {
   mIdentifier = identifier;
 }
 
-QString VCardLine::identifier() const
+TQString VCardLine::identifier() const
 {
   return mIdentifier;
 }
 
-void VCardLine::setValue( const QVariant& value )
+void VCardLine::setValue( const TQVariant& value )
 {
   mValue = value;
 }
 
-QVariant VCardLine::value() const
+TQVariant VCardLine::value() const
 {
   return mValue;
 }
 
-void VCardLine::setGroup( const QString& group )
+void VCardLine::setGroup( const TQString& group )
 {
   if ( !d )
     d = new VCardLinePrivate();
@@ -100,12 +100,12 @@ void VCardLine::setGroup( const QString& group )
   d->mGroup = group;
 }
 
-QString VCardLine::group() const
+TQString VCardLine::group() const
 {
   if ( d )
     return d->mGroup;
   else
-    return QString();
+    return TQString();
 }
 
 bool VCardLine::hasGroup() const
@@ -116,35 +116,35 @@ bool VCardLine::hasGroup() const
     return d->mGroup.isEmpty();
 }
 
-QStringList VCardLine::parameterList() const
+TQStringList VCardLine::parameterList() const
 {
   return mParamMap.keys();
 }
 
-void VCardLine::addParameter( const QString& param, const QString& value )
+void VCardLine::addParameter( const TQString& param, const TQString& value )
 {
-  QStringList &list = mParamMap[ param ];
+  TQStringList &list = mParamMap[ param ];
   if ( list.findIndex( value ) == -1 ) // not included yet
     list.append( value );
 }
 
-QStringList VCardLine::parameters( const QString& param ) const
+TQStringList VCardLine::parameters( const TQString& param ) const
 {
   ParamMap::ConstIterator it = mParamMap.find( param );
   if ( it == mParamMap.end() )
-    return QStringList();
+    return TQStringList();
   else
     return *it;
 }
 
-QString VCardLine::parameter( const QString& param ) const
+TQString VCardLine::parameter( const TQString& param ) const
 {
   ParamMap::ConstIterator it = mParamMap.find( param );
   if ( it == mParamMap.end() )
-    return QString::null;
+    return TQString::null;
   else {
     if ( (*it).isEmpty() )
-      return QString::null;
+      return TQString::null;
     else
       return (*it).first();
   }
diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h
index d6ad9dd77..92fe743f6 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/kabc/vcardparser/vcardline.h
@@ -21,23 +21,23 @@
 #ifndef VCARDLINE_H
 #define VCARDLINE_H
 
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qvariant.h>
-#include <qmap.h>
-#include <qstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqvariant.h>
+#include <tqmap.h>
+#include <tqstring.h>
 
 namespace KABC {
 
 class VCardLine
 {
   public:
-    typedef QValueList<VCardLine> List;
-    typedef QMap<QString, QStringList> ParamMap;
+    typedef TQValueList<VCardLine> List;
+    typedef TQMap<TQString, TQStringList> ParamMap;
 
     VCardLine();
-    VCardLine( const QString &identifier );
-    VCardLine( const QString &identifier, const QVariant &value );
+    VCardLine( const TQString &identifier );
+    VCardLine( const TQString &identifier, const TQVariant &value );
     VCardLine( const VCardLine& );
 
     ~VCardLine();
@@ -47,32 +47,32 @@ class VCardLine
     /**
      * Sets the identifier of this line e.g. UID, FN, CLASS
      */
-    void setIdentifier( const QString& identifier );
+    void setIdentifier( const TQString& identifier );
 
     /**
      * Returns the identifier of this line.
      */
-    QString identifier() const;
+    TQString identifier() const;
 
     /**
      * Sets the value of of this line.
      */
-    void setValue( const QVariant& value );
+    void setValue( const TQVariant& value );
 
     /**
      * Returns the value of this line.
      */
-    QVariant value() const;
+    TQVariant value() const;
 
     /**
      * Sets the group the line belongs to.
      */
-    void setGroup( const QString& group );
+    void setGroup( const TQString& group );
 
     /**
      * Returns the group the line belongs to.
      */
-    QString group() const;
+    TQString group() const;
 
     /**
      * Returns whether the line belongs to a group.
@@ -82,29 +82,29 @@ class VCardLine
     /**
      * Returns all parameters.
      */
-    QStringList parameterList() const;
+    TQStringList parameterList() const;
 
     /**
      * Add a new parameter to the line.
      */
-    void addParameter( const QString& param, const QString& value );
+    void addParameter( const TQString& param, const TQString& value );
 
     /**
      * Returns the values of a special parameter.
      * You can get a list of all parameters with paramList().
      */
-    QStringList parameters( const QString& param ) const;
+    TQStringList parameters( const TQString& param ) const;
 
     /**
      * Returns only the first value of a special parameter.
      * You can get a list of all parameters with paramList().
      */
-    QString parameter( const QString& param ) const;
+    TQString parameter( const TQString& param ) const;
 
   private:
     ParamMap mParamMap;
-    QString mIdentifier;
-    QVariant mValue;
+    TQString mIdentifier;
+    TQVariant mValue;
 
     class VCardLinePrivate;
     VCardLinePrivate *d;
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index df622b22f..67b1bc306 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <qregexp.h>
-#include <qtextcodec.h>
+#include <tqregexp.h>
+#include <tqtextcodec.h>
 
 #include <kmdcodec.h>
 
@@ -29,12 +29,12 @@
 
 using namespace KABC;
 
-static QString backslash( "\\\\" );
-static QString comma( "\\," );
-static QString newline( "\\n" );
-static QString cr( "\\r" );
+static TQString backslash( "\\\\" );
+static TQString comma( "\\," );
+static TQString newline( "\\n" );
+static TQString cr( "\\r" );
 
-static void addEscapes( QString &str )
+static void addEscapes( TQString &str )
 {
   str.replace( '\\', backslash );
   str.replace( ',', comma );
@@ -42,7 +42,7 @@ static void addEscapes( QString &str )
   str.replace( '\n', newline );
 }
 
-static void removeEscapes( QString &str )
+static void removeEscapes( TQString &str )
 {
   str.replace( cr, "\\r" );
   str.replace( newline, "\n" );
@@ -58,26 +58,26 @@ VCardParser::~VCardParser()
 {
 }
 
-VCard::List VCardParser::parseVCards( const QString& text )
+VCard::List VCardParser::parseVCards( const TQString& text )
 {
-  static QRegExp sep( "[\x0d\x0a]" );
+  static TQRegExp sep( "[\x0d\x0a]" );
 
   VCard currentVCard;
   VCard::List vCardList;
-  QString currentLine;
+  TQString currentLine;
 
-  const QStringList lines = QStringList::split( sep, text );
-  QStringList::ConstIterator it;
+  const TQStringList lines = TQStringList::split( sep, text );
+  TQStringList::ConstIterator it;
 
   bool inVCard = false;
-  QStringList::ConstIterator linesEnd( lines.end() );
+  TQStringList::ConstIterator linesEnd( lines.end() );
   for ( it = lines.begin(); it != linesEnd; ++it ) {
 
     if ( (*it).isEmpty() ) // empty line
       continue;
 
     if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous
-      currentLine += QString( *it ).remove( 0, 1 );
+      currentLine += TQString( *it ).remove( 0, 1 );
       continue;
     } else {
       if ( inVCard && !currentLine.isEmpty() ) { // now parse the line
@@ -88,23 +88,23 @@ VCard::List VCardParser::parseVCards( const QString& text )
         }
 
         VCardLine vCardLine;
-        const QString key = currentLine.left( colon ).stripWhiteSpace();
-        QString value = currentLine.mid( colon + 1 );
+        const TQString key = currentLine.left( colon ).stripWhiteSpace();
+        TQString value = currentLine.mid( colon + 1 );
 
-        QStringList params = QStringList::split( ';', key );
+        TQStringList params = TQStringList::split( ';', key );
 
         // check for group
         if ( params[0].find( '.' ) != -1 ) {
-          const QStringList groupList = QStringList::split( '.', params[0] );
+          const TQStringList groupList = TQStringList::split( '.', params[0] );
           vCardLine.setGroup( groupList[0] );
           vCardLine.setIdentifier( groupList[1] );
         } else
           vCardLine.setIdentifier( params[0] );
 
         if ( params.count() > 1 ) { // find all parameters
-          QStringList::ConstIterator paramIt = params.begin();
+          TQStringList::ConstIterator paramIt = params.begin();
           for ( ++paramIt; paramIt != params.end(); ++paramIt ) {
-            QStringList pair = QStringList::split( '=', *paramIt );
+            TQStringList pair = TQStringList::split( '=', *paramIt );
             if ( pair.size() == 1 ) {
               // correct the fucking 2.1 'standard'
               if ( pair[0].lower() == "quoted-printable" ) {
@@ -119,8 +119,8 @@ VCard::List VCardParser::parseVCards( const QString& text )
             }
             // This is pretty much a faster pair[1].contains( ',' )...
             if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format
-              const QStringList args = QStringList::split( ',', pair[ 1 ] );
-              QStringList::ConstIterator argIt;
+              const TQStringList args = TQStringList::split( ',', pair[ 1 ] );
+              TQStringList::ConstIterator argIt;
               for ( argIt = args.begin(); argIt != args.end(); ++argIt )
                 vCardLine.addParameter( pair[0].lower(), *argIt );
             } else
@@ -130,13 +130,13 @@ VCard::List VCardParser::parseVCards( const QString& text )
 
         removeEscapes( value );
 
-        QByteArray output;
+        TQByteArray output;
         bool wasBase64Encoded = false;
 
         params = vCardLine.parameterList();
         if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data
-          QByteArray input;
-          input = QCString(value.latin1());
+          TQByteArray input;
+          input = TQCString(value.latin1());
           if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
                vCardLine.parameter( "encoding" ).lower() == "base64" ) {
             KCodecs::base64Decode( input, output );
@@ -148,25 +148,25 @@ VCard::List VCardParser::parseVCards( const QString& text )
               value = value.remove( value.length() - 1, 1 ) + (*it);
               ++it;
             }
-            input = QCString(value.latin1());
+            input = TQCString(value.latin1());
             KCodecs::quotedPrintableDecode( input, output );
           }
         } else {
-          output = QCString(value.latin1());
+          output = TQCString(value.latin1());
         }
 
         if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
-          QTextCodec *codec =
-            QTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
+          TQTextCodec *codec =
+            TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
           if ( codec ) {
             vCardLine.setValue( codec->toUnicode( output ) );
           } else {
-            vCardLine.setValue( QString::fromUtf8( output ) );
+            vCardLine.setValue( TQString::fromUtf8( output ) );
           }
         } else if ( wasBase64Encoded ) {
             vCardLine.setValue( output );
         } else {  // if charset not given, assume it's in UTF-8 (as used in previous KDE versions)
-            vCardLine.setValue( QString::fromUtf8( output ) );
+            vCardLine.setValue( TQString::fromUtf8( output ) );
         }
 
         currentVCard.addLine( vCardLine );
@@ -195,17 +195,17 @@ VCard::List VCardParser::parseVCards( const QString& text )
   return vCardList;
 }
 
-QString VCardParser::createVCards( const VCard::List& list )
+TQString VCardParser::createVCards( const VCard::List& list )
 {
-  QString text;
-  QString textLine;
-  QString encodingType;
-  QStringList idents;
-  QStringList params;
-  QStringList values;
-  QStringList::ConstIterator identIt;
-  QStringList::Iterator paramIt;
-  QStringList::ConstIterator valueIt;
+  TQString text;
+  TQString textLine;
+  TQString encodingType;
+  TQStringList idents;
+  TQStringList params;
+  TQStringList values;
+  TQStringList::ConstIterator identIt;
+  TQStringList::Iterator paramIt;
+  TQStringList::ConstIterator valueIt;
 
   VCardLine::List lines;
   VCardLine::List::ConstIterator lineIt;
@@ -227,7 +227,7 @@ QString VCardParser::createVCards( const VCard::List& list )
       // iterate over the lines
       for ( lineIt = lines.constBegin(); lineIt != lines.constEnd(); ++lineIt ) {
         if ( !(*lineIt).value().asString().isEmpty() ) {
-          if ((*lineIt).identifier() != QString("URI")) {
+          if ((*lineIt).identifier() != TQString("URI")) {
             if ( (*lineIt).hasGroup() )
               textLine = (*lineIt).group() + "." + (*lineIt).identifier();
             else
@@ -252,7 +252,7 @@ QString VCardParser::createVCards( const VCard::List& list )
             }
 
             if ( hasEncoding ) { // have to encode the data
-              QByteArray input, output;
+              TQByteArray input, output;
               if ( encodingType == "b" ) {
                 input = (*lineIt).value().toByteArray();
                 KCodecs::base64Encode( input, output );
@@ -262,11 +262,11 @@ QString VCardParser::createVCards( const VCard::List& list )
                 KCodecs::quotedPrintableEncode( input, output, false );
               }
 
-              QString value( output );
+              TQString value( output );
               addEscapes( value );
               textLine.append( ":" + value );
             } else {
-              QString value( (*lineIt).value().asString() );
+              TQString value( (*lineIt).value().asString() );
               addEscapes( value );
               textLine.append( ":" + value );
             }
@@ -280,7 +280,7 @@ QString VCardParser::createVCards( const VCard::List& list )
           else {
             // URIs can be full of weird symbols, etc. so bypass all checks
             textLine = (*lineIt).identifier();
-            QString value( (*lineIt).value().asString() );
+            TQString value( (*lineIt).value().asString() );
             addEscapes( value );
             textLine.append( ":" + value );
             text.append( textLine + "\r\n" );
diff --git a/kabc/vcardparser/vcardparser.h b/kabc/vcardparser/vcardparser.h
index 31e13424c..da5fdd46e 100644
--- a/kabc/vcardparser/vcardparser.h
+++ b/kabc/vcardparser/vcardparser.h
@@ -31,8 +31,8 @@ class VCardParser
     VCardParser();
     ~VCardParser();
 
-    static VCard::List parseVCards( const QString& text );
-    static QString createVCards( const VCard::List& list );
+    static VCard::List parseVCards( const TQString& text );
+    static TQString createVCards( const VCard::List& list );
 
   private:
     class VCardParserPrivate;