Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

32 files changed, 152 insertions, 152 deletions

diff --git a/kabc/address.cpp b/kabc/address.cpp
index 0787bcc4e..714dd571e 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
     return it.data();
 
   TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
     return TQString::null;
 
   TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index bf6d0d17a..29bbd0f1f 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a )
   Addressee addr( a );
   if ( !fAddr.isEmpty() ) {
     if ( fAddr != a )
-      addr.setRevision( TQDateTime::currentDateTime() );
+      addr.setRevision( TQDateTime::tqcurrentDateTime() );
     else {
       if ( fAddr.resource() == 0 ) {
         fAddr.setResource( resource );
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 052f2599b..ec8e7be05 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 #include <tqregexp.h>
diff --git a/kabc/distributionlistdialog.cpp b/kabc/distributionlistdialog.cpp
index 0bad0041e..b00b14d42 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/kabc/distributionlistdialog.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp
index d3575aed3..573f0970a 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/kabc/distributionlisteditor.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqbuttongroup.h>
diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp
index a82a017a3..f9d0d705d 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/kabc/formats/binaryformat.cpp
@@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
   }
 
   // set real number of entries
-  stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
+  stream.tqdevice()->tqat( 2 * sizeof( TQ_UINT32 ) );
   stream << counter;
 }
 
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index f350371b5..2a3683597 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kabapi.h>
 #include <kaboutdata.h>
@@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   TQString name;
   TQString comment;
 
-  if ( entry.at( entry.length() -1 ) == ')' ) {
+  if ( entry.tqat( entry.length() -1 ) == ')' ) {
     int br = entry.findRev( '(' );
     if ( br >= 0 ) {
       comment = entry.mid( br + 1, entry.length() - br - 2 );
       entry.truncate( br );
-      if ( entry.at( entry.length() - 1 ).isSpace() ) {
+      if ( entry.tqat( entry.length() - 1 ).isSpace() ) {
         entry.truncate( br - 1 );
       }
     }
@@ -80,22 +80,22 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
     name = entry.left( posSpace );
   }
 
-  if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) {
+  if ( email.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) {
     email = email.mid( 1, email.length() - 2 );
   }
-  if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) {
+  if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) {
     name = name.mid( 1, name.length() - 2 );
   }
-  if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) {
+  if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) {
     name = name.mid( 1, name.length() - 2 );
   }
 
-  if ( name.at( name.length() -1 ) == ')' ) {
+  if ( name.tqat( name.length() -1 ) == ')' ) {
     int br = name.findRev( '(' );
     if ( br >= 0 ) {
       comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
       name.truncate( br );
-      if ( name.at( name.length() - 1 ).isSpace() ) {
+      if ( name.tqat( name.length() - 1 ).isSpace() ) {
         name.truncate( br - 1 );
       }
     }
@@ -148,16 +148,16 @@ void importKMailAddressBook( KABC::AddressBook *ab )
 
   TQStringList::ConstIterator it;
   for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) {
-    if ( (*it).at( 0 ) == '#' ) continue;
+    if ( (*it).tqat( 0 ) == '#' ) continue;
     bool insideQuote = false;
     int end = (*it).length() - 1;
     for ( int i = end; i; i-- ) {
-      if ( (*it).at( i ) == '"' ) {
+      if ( (*it).tqat( i ) == '"' ) {
         if ( insideQuote )
           insideQuote = false;
         else
           insideQuote = true;
-      } else if ( (*it).at( i ) == ',' && !insideQuote ) {
+      } else if ( (*it).tqat( i ) == ',' && !insideQuote ) {
         readKMailEntry( (*it).mid( i + 1, end - i ), ab );
         end = i - 1;
       }
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 5ca506be8..6ce467a46 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -26,7 +26,7 @@
 #include <tqimage.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqurl.h>
 
 #include <kapplication.h>
@@ -50,7 +50,7 @@ public:
 
 TQString LdapObject::toString() const
 {
-  TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
+  TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
   for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
     TQString attr = it.key();
     for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index bb1ed3ad5..b0a899d8c 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqobjectlist.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqvgroupbox.h>
diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp
index 96024a0e7..d4c7b22df 100644
--- a/kabc/ldifconverter.cpp
+++ b/kabc/ldifconverter.cpp
@@ -36,7 +36,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
   data.setRawData( latinstr, latinstrlen );
   ldif.setLDIF( data );
   if (!dt.isValid())
-    dt = TQDateTime::currentDateTime();
+    dt = TQDateTime::tqcurrentDateTime();
   a.setRevision(dt);
   homeAddr = Address( Address::Home );
   workAddr = Address( Address::Work );
@@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
                                   Address &workAddr,
                                   TQString &fieldname, TQString &value )
 {
-  if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false!
+  if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false!
     return false;
 
   if ( fieldname.startsWith("#") ) {
@@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "givenname" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) {
     a.setGivenName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
-       fieldname == TQString::fromLatin1( "nickname") ) {
+  if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") ||
+       fieldname == TQString::tqfromLatin1( "nickname") ) {
     a.setNickName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "sn" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "sn" ) ) {
     a.setFamilyName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "uid" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "uid" ) ) {
     a.setUid( value );
     return true;
   }
-  if ( fieldname == TQString::fromLatin1( "mail" ) ||
-       fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
+       fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
     if ( a.emails().findIndex( value ) == -1 )
       a.insertEmail( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "title" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "title" ) ) {
     a.setTitle( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) {
     a.setPrefix( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "cn" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "cn" ) ) {
     a.setFormattedName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "o" ) ||
-       fieldname == TQString::fromLatin1( "organization" ) ||      // Exchange
-       fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
+  if ( fieldname == TQString::tqfromLatin1( "o" ) ||
+       fieldname == TQString::tqfromLatin1( "organization" ) ||      // Exchange
+       fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange
     a.setOrganization( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "description" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "description" ) ) {
 addComment:
     if ( !a.note().isEmpty() )
       a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "custom1" ) ||
-       fieldname == TQString::fromLatin1( "custom2" ) ||
-       fieldname == TQString::fromLatin1( "custom3" ) ||
-       fieldname == TQString::fromLatin1( "custom4" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "custom1" ) ||
+       fieldname == TQString::tqfromLatin1( "custom2" ) ||
+       fieldname == TQString::tqfromLatin1( "custom3" ) ||
+       fieldname == TQString::tqfromLatin1( "custom4" ) ) {
     goto addComment;
   }
 
-  if ( fieldname == TQString::fromLatin1( "homeurl" ) ||
-       fieldname == TQString::fromLatin1( "workurl" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "homeurl" ) ||
+       fieldname == TQString::tqfromLatin1( "workurl" ) ) {
     if (a.url().isEmpty()) {
       a.setUrl( KURL( value ) );
       return true;
@@ -325,139 +325,139 @@ addComment:
     // TODO: change this with KDE 4
   }
 
-  if ( fieldname == TQString::fromLatin1( "homephone" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "mobile" ) ) { 	// mozilla/Netscape 7
+  if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { 	// mozilla/Netscape 7
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "cellphone" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "pager" )  ||       // mozilla
-       fieldname == TQString::fromLatin1( "pagerphone" ) ) {  // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "pager" )  ||       // mozilla
+       fieldname == TQString::tqfromLatin1( "pagerphone" ) ) {  // mozilla
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) {
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla
     a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "street" ) ||
-       fieldname == TQString::fromLatin1( "streethomeaddress" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "street" ) ||
+       fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) {
     homeAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) {  // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) {  // mozilla
     workAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) {  // mozilla
-    workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value );
+  if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) {  // mozilla
+    workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "postalcode" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) {
     workAddr.setPostalCode( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) {
     workAddr.setPostOfficeBox( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) {  // Netscape 7
+  if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) {  // Netscape 7
     homeAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) {  // mozilla
-    homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value );
+  if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) {  // mozilla
+    homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) {  // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) {  // mozilla
     homeAddr.setLocality( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "mozillahomestate" )	) { // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" )	) { // mozilla
     homeAddr.setRegion( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) {  // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) {  // mozilla
     homeAddr.setPostalCode( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla
     if ( value.length() <= 2 )
       value = Address::ISOtoCountry(value);
     homeAddr.setCountry( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "locality" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "locality" ) ) {
     workAddr.setLocality( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
+  if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x
     workAddr.setStreet( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "countryname" ) ||
-       fieldname == TQString::fromLatin1( "c" ) ) {  // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "countryname" ) ||
+       fieldname == TQString::tqfromLatin1( "c" ) ) {  // mozilla
     if ( value.length() <= 2 )
       value = Address::ISOtoCountry(value);
     workAddr.setCountry( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "l" ) ) {  // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "l" ) ) {  // mozilla
     workAddr.setLocality( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "st" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "st" ) ) {
     workAddr.setRegion( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "ou" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "ou" ) ) {
     a.setRole( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "department" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "department" ) ) {
     a.setDepartment( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "member" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "member" ) ) {
     // this is a mozilla list member (cn=xxx, mail=yyy)
     TQStringList list( TQStringList::split( ',', value ) );
     TQString name, email;
@@ -476,8 +476,8 @@ addComment:
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) {
-    if (value == TQString::fromLatin1("0Z")) // ignore
+  if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) {
+    if (value == TQString::tqfromLatin1("0Z")) // ignore
       return true;
     TQDateTime dt = VCardStringToDate( value );
     if ( dt.isValid() ) {
@@ -486,7 +486,7 @@ addComment:
     }
   }
 
-  if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore
+  if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
     return true;
 
   kdWarning() << TQString(TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h
index a8052a65f..a2225ad2d 100644
--- a/kabc/ldifconverter.h
+++ b/kabc/ldifconverter.h
@@ -44,7 +44,7 @@ namespace KABC {
    * @param dt          The date & time value of the last modification (e.g. file modification time).
    * @since 3.2
    */
-  KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() );
+  KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() );
 
   /**
    * Converts a list of addressees to a LDIF string.
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index cb2bd3109..819d75d96 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index ae8bdbfa3..92b07594f 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index fa8176a21..271328525 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqvbox.h>
diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/kabc/plugins/net/resourcenetconfig.cpp
index af2e3ba98..b441fbd98 100644
--- a/kabc/plugins/net/resourcenetconfig.cpp
+++ b/kabc/plugins/net/resourcenetconfig.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp
index 1b750a120..ef1651cde 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/kabc/plugins/sql/resourcesqlconfig.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqvbox.h>
 
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index d548b52ab..3d01bfc8e 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -24,7 +24,7 @@
 #include <kstdguiitem.h>
 
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "resource.h"
 #include "addressbook.h"
@@ -64,7 +64,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   uint counter = 0;
   TQPtrList<Resource> list = ab->resources();
   for ( uint i = 0; i < list.count(); ++i ) {
-    Resource *resource = list.at( i );
+    Resource *resource = list.tqat( i );
     if ( resource && !resource->readOnly() ) {
       mResourceMap.insert( counter, resource );
       mResourceId->insertItem( resource->resourceName() );
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index 4a6322d51..b57724c15 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqregexp.h>
 
 #include <kaboutdata.h>
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index e7cc123f1..7075dcdd8 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -64,12 +64,12 @@ int main(int /*argc*/,char /* **argv*/)
   list.append(f);
 
   list.sortBy(FamilyName);
-  if ( !(   (*list.at(0)).uid()=="78ze"
-         && (*list.at(1)).uid()=="Rsdf"
-         && (*list.at(2)).uid()=="Fhwn"
-         && (*list.at(3)).uid()=="kk45"
-         && (*list.at(4)).uid()=="Asdf"
-         && (*list.at(5)).uid()=="Z2hk"
+  if ( !(   (*list.tqat(0)).uid()=="78ze"
+         && (*list.tqat(1)).uid()=="Rsdf"
+         && (*list.tqat(2)).uid()=="Fhwn"
+         && (*list.tqat(3)).uid()=="kk45"
+         && (*list.tqat(4)).uid()=="Asdf"
+         && (*list.tqat(5)).uid()=="Z2hk"
         ) ) {
       kdError() << "SORTING BY FAMILY NAME NOT CORRECT!" << endl;
       kdDebug() << "list sorted by family name:" << endl;
@@ -79,12 +79,12 @@ int main(int /*argc*/,char /* **argv*/)
   }
   list.setReverseSorting(true);
   list.sort();
-  if ( !(   (*list.at(5)).uid()=="78ze"
-         && (*list.at(4)).uid()=="Rsdf"
-         && (*list.at(3)).uid()=="Fhwn"
-         && (*list.at(2)).uid()=="kk45"
-         && (*list.at(1)).uid()=="Asdf"
-         && (*list.at(0)).uid()=="Z2hk"
+  if ( !(   (*list.tqat(5)).uid()=="78ze"
+         && (*list.tqat(4)).uid()=="Rsdf"
+         && (*list.tqat(3)).uid()=="Fhwn"
+         && (*list.tqat(2)).uid()=="kk45"
+         && (*list.tqat(1)).uid()=="Asdf"
+         && (*list.tqat(0)).uid()=="Z2hk"
         ) ) {
       kdError() << "REVERSE SORTING BY FAMILY NAME NOT CORRECT!" << endl;
       kdDebug() << "list reverse sorted by family name:" << endl;
@@ -95,12 +95,12 @@ int main(int /*argc*/,char /* **argv*/)
 
   list.setReverseSorting(false);
   list.sortBy(FormattedName);
-  if ( !(   (*list.at(0)).uid()=="78ze"
-         && (*list.at(1)).uid()=="Rsdf"
-         && (*list.at(2)).uid()=="Fhwn"
-         && (*list.at(3)).uid()=="kk45"
-         && (*list.at(4)).uid()=="Z2hk"
-         && (*list.at(5)).uid()=="Asdf"
+  if ( !(   (*list.tqat(0)).uid()=="78ze"
+         && (*list.tqat(1)).uid()=="Rsdf"
+         && (*list.tqat(2)).uid()=="Fhwn"
+         && (*list.tqat(3)).uid()=="kk45"
+         && (*list.tqat(4)).uid()=="Z2hk"
+         && (*list.tqat(5)).uid()=="Asdf"
         ) ) {
       kdError() << "SORTING BY FORMATTED NAME NOT CORRECT!" << endl;
       kdDebug() << "list sorted by formatted name:" << endl;
@@ -110,12 +110,12 @@ int main(int /*argc*/,char /* **argv*/)
   }
   list.setReverseSorting(true);
   list.sort();
-  if ( !(   (*list.at(5)).uid()=="78ze"
-         && (*list.at(4)).uid()=="Rsdf"
-         && (*list.at(3)).uid()=="Fhwn"
-         && (*list.at(2)).uid()=="kk45"
-         && (*list.at(1)).uid()=="Z2hk"
-         && (*list.at(0)).uid()=="Asdf"
+  if ( !(   (*list.tqat(5)).uid()=="78ze"
+         && (*list.tqat(4)).uid()=="Rsdf"
+         && (*list.tqat(3)).uid()=="Fhwn"
+         && (*list.tqat(2)).uid()=="kk45"
+         && (*list.tqat(1)).uid()=="Z2hk"
+         && (*list.tqat(0)).uid()=="Asdf"
         ) ) {
       kdError() << "REVERSE SORTING BY FORMATTED NAME NOT CORRECT!" << endl;
       kdDebug() << "list reverse sorted by formatted name:" << endl;
@@ -127,12 +127,12 @@ int main(int /*argc*/,char /* **argv*/)
 
   list.setReverseSorting(false);
   list.sortBy(Uid);
-  if ( !(   (*list.at(0)).uid()=="78ze"
-         && (*list.at(1)).uid()=="Asdf"
-         && (*list.at(2)).uid()=="Fhwn"
-         && (*list.at(3)).uid()=="Rsdf"
-         && (*list.at(4)).uid()=="Z2hk"
-         && (*list.at(5)).uid()=="kk45"
+  if ( !(   (*list.tqat(0)).uid()=="78ze"
+         && (*list.tqat(1)).uid()=="Asdf"
+         && (*list.tqat(2)).uid()=="Fhwn"
+         && (*list.tqat(3)).uid()=="Rsdf"
+         && (*list.tqat(4)).uid()=="Z2hk"
+         && (*list.tqat(5)).uid()=="kk45"
         ) ) {
       kdError() << "SORTING BY UID NOT CORRECT!" << endl;
       kdDebug() << "list sorted by Uid:" << endl;
@@ -142,12 +142,12 @@ int main(int /*argc*/,char /* **argv*/)
   }
   list.setReverseSorting(true);
   list.sortBy(Uid);
-  if ( !(   (*list.at(5)).uid()=="78ze"
-         && (*list.at(4)).uid()=="Asdf"
-         && (*list.at(3)).uid()=="Fhwn"
-         && (*list.at(2)).uid()=="Rsdf"
-         && (*list.at(1)).uid()=="Z2hk"
-         && (*list.at(0)).uid()=="kk45"
+  if ( !(   (*list.tqat(5)).uid()=="78ze"
+         && (*list.tqat(4)).uid()=="Asdf"
+         && (*list.tqat(3)).uid()=="Fhwn"
+         && (*list.tqat(2)).uid()=="Rsdf"
+         && (*list.tqat(1)).uid()=="Z2hk"
+         && (*list.tqat(0)).uid()=="kk45"
         ) ) {
       kdError() << "REVERSE SORTING BY UID NOT CORRECT!" << endl;
       kdDebug() << "list sorted by Uid:" << endl;
@@ -170,8 +170,8 @@ int main(int /*argc*/,char /* **argv*/)
   list2.append(f);
   list2.setReverseSorting(false);
   list2.sort();
-  if ( !(   (*list2.at(0)).uid()=="78ze"
-         && (*list2.at(1)).uid()=="Asdf"
+  if ( !(   (*list2.tqat(0)).uid()=="78ze"
+         && (*list2.tqat(1)).uid()=="Asdf"
         ) ) {
       kdError() << "SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl;
       kdDebug() << "list sorted by formatted name, two entries:" << endl;
@@ -181,8 +181,8 @@ int main(int /*argc*/,char /* **argv*/)
   }
   list2.setReverseSorting(true);
   list2.sort();
-  if ( !(   (*list2.at(1)).uid()=="78ze"
-         && (*list2.at(0)).uid()=="Asdf"
+  if ( !(   (*list2.tqat(1)).uid()=="78ze"
+         && (*list2.tqat(0)).uid()=="Asdf"
         ) ) {
       kdError() << "REVERSE SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl;
       kdDebug() << "list reverse sorted by formatted name, two entries:" << endl;
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 2d72317ad..4674606e0 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -35,7 +35,7 @@
 
 #include <tqwidget.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqlistview.h>
 #include <tqdir.h>
diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp
index 535ba6980..dc6384417 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/kabc/vcard/AdrValue.cpp
@@ -112,13 +112,13 @@ AdrValue::_parse()
 		
 		switch (i) {
 			
-			case 0: poBox_		= l.at(0);	break;
-			case 1: extAddress_	= l.at(1);	break;
-			case 2: street_		= l.at(2);	break;
-			case 3: locality_	= l.at(3);	break;
-			case 4: region_		= l.at(4);	break;
-			case 5: postCode_	= l.at(5);	break;
-			case 6: countryName_	= l.at(6);	break;
+			case 0: poBox_		= l.tqat(0);	break;
+			case 1: extAddress_	= l.tqat(1);	break;
+			case 2: street_		= l.tqat(2);	break;
+			case 3: locality_	= l.tqat(3);	break;
+			case 4: region_		= l.tqat(4);	break;
+			case 5: postCode_	= l.tqat(5);	break;
+			case 6: countryName_	= l.tqat(6);	break;
 			default:							break;
 		}
 	}
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 52bcdf4f5..034cb1d32 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -174,7 +174,7 @@ ContentLine::_parse()
 		return;
 	}
 	
-	name_ = l.at(0);
+	name_ = l.tqat(0);
 
 	// Now we have the name, so the rest of 'l' is the params.
 	// Remove the name part.
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp
index f7e5a759e..d41c61d96 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/kabc/vcard/LangValue.cpp
@@ -79,7 +79,7 @@ LangValue::_parse()
 	
 	if (l.count() == 0) return;
 	
-	primary_ = l.at(0);
+	primary_ = l.tqat(0);
 	
 	l.remove(0u);
 	
diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp
index e63268134..7bcfa1397 100644
--- a/kabc/vcard/NValue.cpp
+++ b/kabc/vcard/NValue.cpp
@@ -106,11 +106,11 @@ NValue::_parse()
 	for (unsigned int i = 0; i < l.count(); i++) {
 
 		switch (i) {
-			case 0: family_	= l.at(0);	break;
-			case 1: given_	= l.at(1);	break;
-			case 2: middle_	= l.at(2);	break;
-			case 3: prefix_	= l.at(3);	break;
-			case 4: suffix_	= l.at(4);	break;
+			case 0: family_	= l.tqat(0);	break;
+			case 1: given_	= l.tqat(1);	break;
+			case 2: middle_	= l.tqat(2);	break;
+			case 3: prefix_	= l.tqat(3);	break;
+			case 4: suffix_	= l.tqat(4);	break;
 			default:			break;
 		}
 	}
diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp
index 94ca18243..d3fb93ac7 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/kabc/vcard/OrgValue.cpp
@@ -102,6 +102,6 @@ OrgValue::numValues()
 OrgValue::value(unsigned int i)
 {
 	parse();
-	return valueList_.at(i);
+	return valueList_.tqat(i);
 }
 
diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp
index 2bec2e181..ef2b5d07d 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/kabc/vcard/TextListValue.cpp
@@ -102,6 +102,6 @@ TextListValue::numValues()
 TextListValue::value(unsigned int i)
 {
 	parse();
-	return valueList_.at(i);
+	return valueList_.tqat(i);
 }
 
diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp
index 50c25da59..a1a9d1ba1 100644
--- a/kabc/vcard/VCard.cpp
+++ b/kabc/vcard/VCard.cpp
@@ -95,7 +95,7 @@ VCard::_parse()
 	}
 
 	// Get the first line
-	TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace();
+	TQCString beginLine = TQCString(l.tqat(0)).stripWhiteSpace();
 
 	vDebug("Begin line == \"" + beginLine + "\"");
 
diff --git a/kabc/vcard/testread.cpp b/kabc/vcard/testread.cpp
index d1341fb49..3a33c7d54 100644
--- a/kabc/vcard/testread.cpp
+++ b/kabc/vcard/testread.cpp
@@ -3,7 +3,7 @@
 #include <assert.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <VCard.h>
 
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index 8926e5bc2..bad2ceb78 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kprocess.h>
 #include <kdebug.h>
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index 04d72f537..f24f1ad25 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -29,7 +29,7 @@
 #include <kcmdlineargs.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "vcardconverter.h"
 
@@ -60,7 +60,7 @@ int main( int argc, char **argv )
   addressee.setOrganization( "KDE" );
   addressee.setNote( "nerver\ntouch a running system" );
   addressee.setProductId( "testId" );
-  addressee.setRevision( TQDateTime::currentDateTime() );
+  addressee.setRevision( TQDateTime::tqcurrentDateTime() );
   addressee.setSortString( "koenig" );
   addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
   addressee.setSecrecy(  KABC::Secrecy( KABC::Secrecy::Confidential ) );
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 8fb9ab10f..82ab96714 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kmdcodec.h>
 
@@ -144,7 +144,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
           }
           else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) {
             // join any qp-folded lines
-            while ( value.at( value.length() - 1 ) == '=' && it != linesEnd ) {
+            while ( value.tqat( value.length() - 1 ) == '=' && it != linesEnd ) {
               value = value.remove( value.length() - 1, 1 ) + (*it);
               ++it;
             }
diff --git a/kabc/vcardtool.cpp b/kabc/vcardtool.cpp
index 295360a03..08bcf93e4 100644
--- a/kabc/vcardtool.cpp
+++ b/kabc/vcardtool.cpp
@@ -36,7 +36,7 @@ static bool needsEncoding( const TQString &value )
 {
   uint length = value.length();
   for ( uint i = 0; i < length; ++i ) {
-    char c = value.at( i ).latin1();
+    char c = value.tqat( i ).latin1();
     if ( (c < 33 || c > 126) && c != ' ' && c != '=' )
       return true;
   }