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

68 files changed, 520 insertions, 520 deletions

diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index dde8f7dd..5a745b4f 100644
--- a/libtdepim/addresseeemailselection.cpp
+++ b/libtdepim/addresseeemailselection.cpp
@@ -143,8 +143,8 @@ bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uin
 
 bool AddresseeEmailSelection::itemMatches( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const
 {
-  return addressee.formattedName().tqstartsWith( pattern, false ) ||
-         email( addressee, index ).tqstartsWith( pattern, false );
+  return addressee.formattedName().startsWith( pattern, false ) ||
+         email( addressee, index ).startsWith( pattern, false );
 }
 
 bool AddresseeEmailSelection::itemEquals( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const
@@ -172,13 +172,13 @@ bool AddresseeEmailSelection::distributionListMatches( const KABC::DistributionL
                                                        const TQString &pattern ) const
 {
   // check whether the name of the distribution list matches the pattern or one of its entries.
-  bool ok = distributionList->name().tqstartsWith( pattern, false );
+  bool ok = distributionList->name().startsWith( pattern, false );
 
   KABC::DistributionList::Entry::List entries = distributionList->entries();
   KABC::DistributionList::Entry::List::ConstIterator it;
   for ( it = entries.begin(); it != entries.end(); ++it ) {
-    ok = ok || (*it).addressee.formattedName().tqstartsWith( pattern, false ) ||
-               (*it).email.tqstartsWith( pattern, false );
+    ok = ok || (*it).addressee.formattedName().startsWith( pattern, false ) ||
+               (*it).email.startsWith( pattern, false );
   }
 
   return ok;
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 687943ec..35c80b7a 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -57,7 +57,7 @@
 #include <tqregexp.h>
 #include <tqevent.h>
 #include <tqdragobject.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 using namespace KPIM;
 
@@ -344,7 +344,7 @@ void AddresseeLineEdit::mouseReleaseEvent( TQMouseEvent *e )
 {
   // reimplemented from TQLineEdit::mouseReleaseEvent()
   if ( m_useCompletion
-       && TQApplication::tqclipboard()->supportsSelection()
+       && TQApplication::clipboard()->supportsSelection()
        && !isReadOnly()
        && e->button() == Qt::MidButton ) {
     m_smartPaste = true;
@@ -389,7 +389,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e )
       }
     } else {
       // Let's see if this drop contains a comma separated list of emails
-      TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) );
+      TQString dropData = TQString::fromUtf8( e->encodedData( "text/plain" ) );
       TQStringList addrs = splitEmailAddrList( dropData );
       if ( addrs.count() > 0 ) {
         setText( normalizeAddressesAndDecodeIDNs( dropData ) );
@@ -852,7 +852,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
         TQPoint oldPosOfItemUnderMouse;
         if ( itemUnderMouse ) {
             oldTextUnderMouse = itemUnderMouse->text();
-            oldPosOfItemUnderMouse = completionBox->tqitemRect( itemUnderMouse ).topLeft();
+            oldPosOfItemUnderMouse = completionBox->itemRect( itemUnderMouse ).topLeft();
         }
 
         completionBox->setItems( items );
@@ -882,7 +882,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
               // if the mouse was over an item, before, but now that's elsewhere,
               // move the cursor, so folks don't accidently click the wrong item
               if ( newItemUnderMouse ) {
-                  TQRect r = completionBox->tqitemRect( newItemUnderMouse );
+                  TQRect r = completionBox->itemRect( newItemUnderMouse );
                   TQPoint target = r.topLeft();
                   if ( oldPosOfItemUnderMouse != target ) {
                       target.setX( target.x() + r.width()/2 );
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index 792d5762..006e4591 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -21,7 +21,7 @@
 
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsignalmapper.h>
 #include <tqtoolbutton.h>
 
@@ -267,7 +267,7 @@ void AddresseeSelector::init()
 
 void AddresseeSelector::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() );
   TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint() );
 
   TQLabel *label = new TQLabel( i18n( "Address book:" ), this );
@@ -284,7 +284,7 @@ void AddresseeSelector::initGUI()
 
   topLayout->setColStretch( 1, 1 );
 
-  tqlayout->addMultiCellLayout( topLayout, 0, 0, 0, 2 );
+  layout->addMultiCellLayout( topLayout, 0, 0, 0, 2 );
 
   int row = 1;
 
@@ -303,8 +303,8 @@ void AddresseeSelector::initGUI()
     mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i );
 
     TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
-    buttonLayout->tqsetAlignment( TQt::AlignBottom );
-    tqlayout->addLayout( buttonLayout, row, 1 );
+    buttonLayout->setAlignment( TQt::AlignBottom );
+    layout->addLayout( buttonLayout, row, 1 );
 
     // move button
     TQToolButton *moveButton = new TQToolButton( this );
@@ -327,7 +327,7 @@ void AddresseeSelector::initGUI()
     buttonLayout->addWidget( moveButton );
     buttonLayout->addWidget( removeButton );
 
-    tqlayout->addWidget( listView, row, 2 );
+    layout->addWidget( listView, row, 2 );
   }
 
   mAddresseeView = new KListView( this );
@@ -335,7 +335,7 @@ void AddresseeSelector::initGUI()
   mAddresseeView->header()->hide();
   mAddresseeView->setFullWidth( true );
 
-  tqlayout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 );
+  layout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 );
 }
 
 void AddresseeSelector::finish()
@@ -565,9 +565,9 @@ AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection,
   : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true )
 {
   TQFrame *frame = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame );
   mSelector = new KPIM::AddresseeSelector( selection, frame );
-  tqlayout->addWidget( mSelector );
+  layout->addWidget( mSelector );
 
   resize( 500, 490 );
 }
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 15c7215e..b3bccffa 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -151,27 +151,27 @@ void AddresseeView::enableLinks( int linkMask )
 TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask,
                                     bool internalLoading, FieldMask fieldMask )
 {
-  TQString image = TQString( "contact_%1_image" ).tqarg( addr.uid() );
+  TQString image = TQString( "contact_%1_image" ).arg( addr.uid() );
 
   // Style strings from Gentix; this is just an initial version.
   //
-  // These will be substituted into various HTML strings with .tqarg().
+  // These will be substituted into various HTML strings with .arg().
   // Search for @STYLE@ to find where. Note how we use %1 as a
   // placeholder where we fill in something else (in this case,
   // the global background color).
   //
   TQString backgroundColor = KGlobalSettings::alternateBackgroundColor().name();
-  TQString cellStyle = TQString::tqfromLatin1(
+  TQString cellStyle = TQString::fromLatin1(
         "style=\""
         "padding-right: 2px; "
         "border-right: #000 dashed 1px; "
-        "background: %1;\"").tqarg(backgroundColor);
+        "background: %1;\"").arg(backgroundColor);
   TQString backgroundColor2 = KGlobalSettings::baseColor().name();
-  TQString cellStyle2 = TQString::tqfromLatin1(
+  TQString cellStyle2 = TQString::fromLatin1(
         "style=\""
         "padding-left: 2px; "
-        "background: %1;\"").tqarg(backgroundColor2);
-  TQString tableStyle = TQString::tqfromLatin1(
+        "background: %1;\"").arg(backgroundColor2);
+  TQString tableStyle = TQString::fromLatin1(
         "style=\""
         "border: solid 1px; "
         "margin: 0em;\"");
@@ -179,17 +179,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
   // We'll be building a table to display the vCard in.
   // Each row of the table will be built using this string for its HTML.
   //
-  TQString rowFmtStr = TQString::tqfromLatin1(
+  TQString rowFmtStr = TQString::fromLatin1(
         "<tr>"
         "<td align=\"right\" valign=\"top\" width=\"30%\" "); // Tag unclosed
   rowFmtStr.append( cellStyle );
-  rowFmtStr.append( TQString::tqfromLatin1(
+  rowFmtStr.append( TQString::fromLatin1(
 	">" // Close tag
         "<b>%1</b>"
         "</td>"
         "<td align=\"left\" valign=\"top\" width=\"70%\" ") ); // Tag unclosed
   rowFmtStr.append( cellStyle2 );
-  rowFmtStr.append( TQString::tqfromLatin1(
+  rowFmtStr.append( TQString::fromLatin1(
 	">" // Close tag
         "%2"
         "</td>"
@@ -216,8 +216,8 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
     if ( date.isValid() )
       dynamicPart += rowFmtStr
-        .tqarg( KABC::Addressee::birthdayLabel() )
-        .tqarg( KGlobal::locale()->formatDate( date, true ) );
+        .arg( KABC::Addressee::birthdayLabel() )
+        .arg( KGlobal::locale()->formatDate( date, true ) );
   }
 
   if ( fieldMask & PhoneFields ) {
@@ -228,22 +228,22 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
       TQString url;
       if ( (*phoneIt).type() & KABC::PhoneNumber::Fax )
-        url = TQString::tqfromLatin1( "fax:" ) + number;
+        url = TQString::fromLatin1( "fax:" ) + number;
       else
-        url = TQString::tqfromLatin1( "phone:" ) + number;
+        url = TQString::fromLatin1( "phone:" ) + number;
 
       if ( linkMask & PhoneLinks ) {
         TQString smsURL;
         if ( (*phoneIt).type() & KABC::PhoneNumber::Cell )
-          smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).tqarg( number ).tqarg( i18n( "SMS") );
+          smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).arg( number ).arg( i18n( "SMS") );
 
         dynamicPart += rowFmtStr
-          .tqarg( (*phoneIt).typeLabel().replace( " ", "&nbsp;" ) )
-          .tqarg( TQString::tqfromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) );
+          .arg( (*phoneIt).typeLabel().replace( " ", "&nbsp;" ) )
+          .arg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).arg( url ).arg( number ).arg( smsURL ) );
       } else {
         dynamicPart += rowFmtStr
-          .tqarg( (*phoneIt).typeLabel().replace( " ", "&nbsp;" ) )
-          .tqarg( number );
+          .arg( (*phoneIt).typeLabel().replace( " ", "&nbsp;" ) )
+          .arg( number );
       }
     }
   }
@@ -257,11 +257,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
       TQUrl::encode( fullEmail );
 
       if ( linkMask & EmailLinks ) {
-        dynamicPart += rowFmtStr.tqarg( type )
-          .tqarg( TQString::tqfromLatin1( "<a href=\"mailto:%1\">%2</a>" )
-          .tqarg( fullEmail, TQStyleSheet::escape( *emailIt ) ) );
+        dynamicPart += rowFmtStr.arg( type )
+          .arg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" )
+          .arg( fullEmail, TQStyleSheet::escape( *emailIt ) ) );
       } else {
-        dynamicPart += rowFmtStr.tqarg( type ).tqarg( *emailIt );
+        dynamicPart += rowFmtStr.arg( type ).arg( *emailIt );
       }
     }
   }
@@ -276,7 +276,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
       } else {
         url = addr.url().prettyURL();
       }
-      dynamicPart += rowFmtStr.tqarg( i18n("Homepage") ).tqarg( url );
+      dynamicPart += rowFmtStr.arg( i18n("Homepage") ).arg( url );
     }
 
     TQString blog = addr.custom( "KADDRESSBOOK", "BlogFeed" );
@@ -284,7 +284,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
       if ( linkMask & URLLinks ) {
         blog = KStringHandler::tagURLs( blog );
       }
-      dynamicPart += rowFmtStr.tqarg( i18n("Blog Feed") ).tqarg( blog );
+      dynamicPart += rowFmtStr.arg( i18n("Blog Feed") ).arg( blog );
     }
   }
 
@@ -303,12 +303,12 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
         if ( linkMask & AddressLinks ) {
           dynamicPart += rowFmtStr
-            .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) )
-            .tqarg( link );
+            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( link );
         } else {
           dynamicPart += rowFmtStr
-            .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) )
-            .tqarg( formattedAddress );
+            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( formattedAddress );
         }
       } else {
         TQString link = "<a href=\"addr:" + (*addrIt).id() + "\">" +
@@ -316,12 +316,12 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
         if ( linkMask & AddressLinks ) {
           dynamicPart += rowFmtStr
-            .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) )
-            .tqarg( link );
+            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( link );
         } else {
           dynamicPart += rowFmtStr
-            .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) )
-            .tqarg( (*addrIt).label().replace( '\n', "<br>" ) );
+            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( (*addrIt).label().replace( '\n', "<br>" ) );
         }
       }
     }
@@ -333,7 +333,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
     // the data afterwards (keeps us safe from possible % signs
     // in either one).
     notes = TQStyleSheet::escape( addr.note() );
-    notes = rowFmtStr.tqarg( i18n( "Notes" ) ).tqarg( notes.replace( '\n', "<br>" ) ) ;
+    notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.replace( '\n', "<br>" ) ) ;
   }
 
   TQString customData;
@@ -371,7 +371,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
           if ( keyIt != titleMap.end() )
             key = keyIt.data();
 
-          customData += rowFmtStr.tqarg( key ).tqarg( TQStyleSheet::escape( value ) ) ;
+          customData += rowFmtStr.arg( key ).arg( TQStyleSheet::escape( value ) ) ;
         }
       }
     }
@@ -385,7 +385,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
     const TQString imAddress = addr.custom( "KADDRESSBOOK", "X-IMAddress" );
     if ( !imAddress.isEmpty() ) {
-      customData += rowFmtStr.tqarg( i18n( "IM Address" ) ).tqarg( TQStyleSheet::escape( imAddress ) ) ;
+      customData += rowFmtStr.arg( i18n( "IM Address" ) ).arg( TQStyleSheet::escape( imAddress ) ) ;
     }
 
     if ( proxy ) {
@@ -393,24 +393,24 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
         // set image source to either a TQMimeSourceFactory key or a data:/ URL
         TQString imgSrc;
         if ( internalLoading ) {
-          imgSrc = TQString::tqfromLatin1( "im_status_%1_image").tqarg( addr.uid() );
+          imgSrc = TQString::fromLatin1( "im_status_%1_image").arg( addr.uid() );
           TQMimeSourceFactory::defaultFactory()->setPixmap( imgSrc, proxy->presenceIcon( addr.uid() ) );
         } else
           imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) );
 
         // make the status a link, if required
-        TQString imtqStatus;
+        TQString imStatus;
         if ( linkMask & IMLinks )
-          imtqStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" );
+          imStatus = TQString::fromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" );
         else
-          imtqStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" );
+          imStatus = TQString::fromLatin1( "<img src=\"%1\"> (%2)" );
 
         // append our status to the rest of the dynamic part of the addressee
         dynamicPart += rowFmtStr
-                .tqarg( i18n( "Presence" ) )
-                .tqarg( imtqStatus
-                          .tqarg( imgSrc )
-                          .tqarg( proxy->presenceString( addr.uid() ) )
+                .arg( i18n( "Presence" ) )
+                .arg( imStatus
+                          .arg( imgSrc )
+                          .arg( proxy->presenceString( addr.uid() ) )
                     );
       }
     }
@@ -421,51 +421,51 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
   // do it this way to avoid cases where the substituted string
   // contains %1 and the like.
   //
-  TQString strAddr = TQString::tqfromLatin1(
+  TQString strAddr = TQString::fromLatin1(
     "<div align=\"center\">"
     "<table cellpadding=\"1\" cellspacing=\"0\" %1>"
-    "<tr>").tqarg(tableStyle);
+    "<tr>").arg(tableStyle);
 
-  strAddr.append( TQString::tqfromLatin1(
+  strAddr.append( TQString::fromLatin1(
     "<td align=\"right\" valign=\"top\" width=\"30%\" rowspan=\"3\" %2>")
-    .tqarg( cellStyle ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( cellStyle ) );
+  strAddr.append( TQString::fromLatin1(
     "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image
     "</td>")
-    .tqarg( image ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( image ) );
+  strAddr.append( TQString::fromLatin1(
     "<td align=\"left\" width=\"70%\" %2>")
-    .tqarg( cellStyle2 ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( cellStyle2 ) );
+  strAddr.append( TQString::fromLatin1(
     "<font size=\"+2\"><b>%2</b></font></td>"  // name
     "</tr>")
-    .tqarg( name ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( name ) );
+  strAddr.append( TQString::fromLatin1(
     "<tr>"
     "<td align=\"left\" width=\"70%\" %2>")
-    .tqarg( cellStyle2 ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( cellStyle2 ) );
+  strAddr.append( TQString::fromLatin1(
     "%3</td>"  // role
     "</tr>")
-    .tqarg( role ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( role ) );
+  strAddr.append( TQString::fromLatin1(
     "<tr>"
     "<td align=\"left\" width=\"70%\" %2>")
-    .tqarg( cellStyle2 ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( cellStyle2 ) );
+  strAddr.append( TQString::fromLatin1(
     "%4</td>"  // organization
     "</tr>")
-    .tqarg( organization ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( organization ) );
+  strAddr.append( TQString::fromLatin1(
     "<tr><td %2>")
-    .tqarg( cellStyle ) );
-  strAddr.append( TQString::tqfromLatin1(
+    .arg( cellStyle ) );
+  strAddr.append( TQString::fromLatin1(
     "&nbsp;</td><td %2>&nbsp;</td></tr>")
-    .tqarg( cellStyle2 ) );
+    .arg( cellStyle2 ) );
   strAddr.append( dynamicPart );
   strAddr.append( notes );
   strAddr.append( customData );
-  strAddr.append( TQString::tqfromLatin1( "</table></div>\n" ) );
+  strAddr.append( TQString::fromLatin1( "</table></div>\n" ) );
 
   if ( addr.resource() ) {
     TQString addrBookName = addr.resource()->resourceName();
@@ -476,7 +476,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
       if ( !label.isEmpty() )
         addrBookName = label;
     }
-    strAddr.append( i18n( "<p><b>Address book</b>: %1</p>" ).tqarg( addrBookName ) );
+    strAddr.append( i18n( "<p><b>Address book</b>: %1</p>" ).arg( addrBookName ) );
   }
   return strAddr;
 }
@@ -526,17 +526,17 @@ void AddresseeView::updateView()
   TQString strAddr = vCardAsHTML( mAddressee, mKIMProxy, (LinkMask)mLinkMask,
                                  true, (FieldMask)fieldMask );
 
-  strAddr = TQString::tqfromLatin1(
+  strAddr = TQString::fromLatin1(
     "<html>"
     "<body text=\"%1\" bgcolor=\"%2\">" // text and background color
     "%3" // dynamic part
     "</body>"
     "</html>" )
-     .tqarg( KGlobalSettings::textColor().name() )
-     .tqarg( KGlobalSettings::baseColor().name() )
-     .tqarg( strAddr );
+     .arg( KGlobalSettings::textColor().name() )
+     .arg( KGlobalSettings::baseColor().name() )
+     .arg( strAddr );
 
-  TQString imageURL = TQString( "contact_%1_image" ).tqarg( mAddressee.uid() );
+  TQString imageURL = TQString( "contact_%1_image" ).arg( mAddressee.uid() );
 
   KABC::Picture picture = mAddressee.photo();
   if ( picture.isIntern() && !picture.data().isNull() )
@@ -690,27 +690,27 @@ void AddresseeView::slotHighlighted( const TQString &link )
     TQString email = link.mid( 7 );
 
     emit emailHighlighted( email );
-    emit highlightedMessage( i18n( "Send mail to '%1'" ).tqarg( email ) );
+    emit highlightedMessage( i18n( "Send mail to '%1'" ).arg( email ) );
   } else if ( link.startsWith( "phone:" ) ) {
     TQString number = link.mid( 8 );
 
     emit phoneNumberHighlighted( strippedNumber( number ) );
-    emit highlightedMessage( i18n( "Call number %1" ).tqarg( number ) );
+    emit highlightedMessage( i18n( "Call number %1" ).arg( number ) );
   } else if ( link.startsWith( "fax:" ) ) {
     TQString number = link.mid( 6 );
 
     emit faxNumberHighlighted( strippedNumber( number ) );
-    emit highlightedMessage( i18n( "Send fax to %1" ).tqarg( number ) );
+    emit highlightedMessage( i18n( "Send fax to %1" ).arg( number ) );
   } else if ( link.startsWith( "addr:" ) ) {
     emit highlightedMessage( i18n( "Show address on map" ) );
   } else if ( link.startsWith( "sms:" ) ) {
     TQString number = link.mid( 6 );
-    emit highlightedMessage( i18n( "Send SMS to %1" ).tqarg( number ) );
+    emit highlightedMessage( i18n( "Send SMS to %1" ).arg( number ) );
   } else if ( link.startsWith( "http:" ) || link.startsWith( "https:" ) ) {
     emit urlHighlighted( link );
-    emit highlightedMessage( i18n( "Open URL %1" ).tqarg( link ) );
+    emit highlightedMessage( i18n( "Open URL %1" ).arg( link ) );
   } else if ( link.startsWith( "im:" ) ) {
-    emit highlightedMessage( i18n( "Chat with %1" ).tqarg( mAddressee.realName() ) );
+    emit highlightedMessage( i18n( "Chat with %1" ).arg( mAddressee.realName() ) );
   } else
     emit highlightedMessage( "" );
 }
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index a8d993bf..0a9e1ab0 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -53,7 +53,7 @@
 #include <kstandarddirs.h>
 
 #include <tqdict.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 
@@ -912,7 +912,7 @@ AddressesDialog::saveAs()
     KMessageBox::information( 0,
                               i18n( "<qt>Distribution list with the given name <b>%1</b> "
                                     "already exists. Please select a different name.</qt>" )
-                              .tqarg( name ) );
+                              .arg( name ) );
     return;
   }
 
diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui
index fc88d52a..8469730a 100644
--- a/libtdepim/addresspicker.ui
+++ b/libtdepim/addresspicker.ui
@@ -66,7 +66,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -82,7 +82,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -132,7 +132,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -181,7 +181,7 @@
             <property name="text">
                 <string>&amp;Selected Addresses</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -200,7 +200,7 @@
             <property name="text">
                 <string>&amp;Address Book</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -209,7 +209,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp
index 1c161379..a9e8a207 100644
--- a/libtdepim/broadcaststatus.cpp
+++ b/libtdepim/broadcaststatus.cpp
@@ -57,9 +57,9 @@ void BroadcastStatus::seStatusMsgWithTimestamp( const TQString& message )
 {
   KLocale* locale = KGlobal::locale();
   seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" )
-                .tqarg( locale->formatTime( TQTime::currentTime(),
+                .arg( locale->formatTime( TQTime::currentTime(),
                                           true /* with seconds */ ) )
-                .tqarg( message ) );
+                .arg( message ) );
 }
 
 void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages,
@@ -78,13 +78,13 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages,
                           "Transmission complete. %n new messages in %1 KB "
                           "(%2 KB remaining on the server).",
                           numMessages )
-                    .tqarg( numBytesRead / 1024 )
-                    .tqarg( numBytes / 1024 );
+                    .arg( numBytesRead / 1024 )
+                    .arg( numBytes / 1024 );
       else
         statusMsg = i18n( "Transmission complete. %n message in %1 KB.",
                          "Transmission complete. %n messages in %1 KB.",
                           numMessages )
-                    .tqarg( numBytesRead / 1024 );
+                    .arg( numBytesRead / 1024 );
     }
     else
       statusMsg = i18n( "Transmission complete. %n new message.",
@@ -96,7 +96,7 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages,
 
   seStatusMsgWithTimestamp( statusMsg );
   if ( item )
-    item->setqStatus( statusMsg );
+    item->seStatus( statusMsg );
 }
 
 void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account,
@@ -118,17 +118,17 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account,
                           "%n new messages in %1 KB "
                           "(%2 KB remaining on the server).",
                           numMessages )
-                    .tqarg( numBytesRead / 1024 )
-                    .tqarg( numBytes / 1024 )
-                    .tqarg( account );
+                    .arg( numBytesRead / 1024 )
+                    .arg( numBytes / 1024 )
+                    .arg( account );
       else
         statusMsg = i18n( "Transmission for account %2 complete. "
                           "%n message in %1 KB.",
                           "Transmission for account %2 complete. "
                           "%n messages in %1 KB.",
                           numMessages )
-                    .tqarg( numBytesRead / 1024 )
-                    .tqarg( account );
+                    .arg( numBytesRead / 1024 )
+                    .arg( account );
     }
     else
       statusMsg = i18n( "Transmission for account %1 complete. "
@@ -136,15 +136,15 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account,
                         "Transmission for account %1 complete. "
                         "%n new messages.",
                         numMessages )
-                  .tqarg( account );
+                  .arg( account );
   }
   else
     statusMsg = i18n( "Transmission for account %1 complete. No new messages.")
-                .tqarg( account );
+                .arg( account );
 
   seStatusMsgWithTimestamp( statusMsg );
   if ( item )
-    item->setqStatus( statusMsg );
+    item->seStatus( statusMsg );
 }
 
 void BroadcastStatus::setTransienStatusMsg( const TQString& msg )
diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp
index 72e1de8a..6c4afef6 100644
--- a/libtdepim/categoryeditdialog.cpp
+++ b/libtdepim/categoryeditdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <tqlineedit.h>
 #include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
 #include <klocale.h>
@@ -66,23 +66,23 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent,
   TQWidget *widget = new TQWidget( this );
   setMainWidget( widget );
 
-  TQGridLayout *tqlayout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() );
 
   d->mView = new TQListView( widget );
   d->mView->addColumn( "" );
   d->mView->header()->hide();
   d->mView->setDefaultRenameAction( TQListView::Accept );
 
-  tqlayout->addMultiCellWidget( d->mView, 0, 3, 0, 0 );
+  layout->addMultiCellWidget( d->mView, 0, 3, 0, 0 );
 
   d->mAddButton = new TQPushButton( i18n( "Add" ), widget );
-  tqlayout->addWidget( d->mAddButton, 0, 1 );
+  layout->addWidget( d->mAddButton, 0, 1 );
 
   d->mEditButton = new TQPushButton( i18n( "Edit" ), widget );
-  tqlayout->addWidget( d->mEditButton, 1, 1 );
+  layout->addWidget( d->mEditButton, 1, 1 );
 
   d->mDeleteButton = new TQPushButton( i18n( "Remove" ), widget );
-  tqlayout->addWidget( d->mDeleteButton, 2, 1 );
+  layout->addWidget( d->mDeleteButton, 2, 1 );
 
 
   fillList();
diff --git a/libtdepim/categoryeditdialog_base.ui b/libtdepim/categoryeditdialog_base.ui
index 11cd9874..9064bce3 100644
--- a/libtdepim/categoryeditdialog_base.ui
+++ b/libtdepim/categoryeditdialog_base.ui
@@ -54,7 +54,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout103</cstring>
+                <cstring>layout103</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -86,7 +86,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/libtdepim/categoryselectdialog_base.ui b/libtdepim/categoryselectdialog_base.ui
index 1e45bd46..b708e853 100644
--- a/libtdepim/categoryselectdialog_base.ui
+++ b/libtdepim/categoryselectdialog_base.ui
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/libtdepim/clicklineedit.cpp b/libtdepim/clicklineedit.cpp
index 28e66a0b..352b2679 100644
--- a/libtdepim/clicklineedit.cpp
+++ b/libtdepim/clicklineedit.cpp
@@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {}
 void ClickLineEdit::setClickMessage( const TQString &msg )
 {
   mClickMessage = msg;
-  tqrepaint();
+  repaint();
 }
 
 void ClickLineEdit::setText( const TQString &txt )
 {
   mDrawClickMsg = txt.isEmpty();
-  tqrepaint();
+  repaint();
   KLineEdit::setText( txt );
 }
 
@@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
   if ( mDrawClickMsg == true ) 
   { 
     mDrawClickMsg = false;
-    tqrepaint();
+    repaint();
   }
   TQLineEdit::focusInEvent( ev );
 }
@@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
   if ( text().isEmpty() )
   {
     mDrawClickMsg = true;
-    tqrepaint();
+    repaint();
   }
   TQLineEdit::focusOutEvent( ev );
 }
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 0ee36a29..68339f9e 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -88,7 +88,7 @@ class LDAPCompletionItem : public CompletionItem
 {
 public:
   LDAPCompletionItem( LdapClient* ldapClient ) : mLdapClient( ldapClient ) {}
-  virtual TQString label() const { return i18n( "LDAP server %1" ).tqarg( mLdapClient->server().host() ); }
+  virtual TQString label() const { return i18n( "LDAP server %1" ).arg( mLdapClient->server().host() ); }
   virtual int completionWeight() const { return mLdapClient->completionWeight(); }
   virtual void save( CompletionOrderEditor* );
 protected:
@@ -102,7 +102,7 @@ void LDAPCompletionItem::save( CompletionOrderEditor* )
 {
   KConfig * config = LdapSearch::config();
   config->setGroup( "LDAP" );
-  config->writeEntry( TQString( "SelectedCompletionWeight%1" ).tqarg( mLdapClient->clientNumber() ),
+  config->writeEntry( TQString( "SelectedCompletionWeight%1" ).arg( mLdapClient->clientNumber() ),
                       mWeight );
   config->sync();
 }
@@ -141,7 +141,7 @@ public:
   KABCImapSubResCompletionItem( ResourceABC* resource, const TQString& subResource )
     : mResource( resource ), mSubResource( subResource ), mWeight( completionWeight() ) {}
   virtual TQString label() const {
-    return TQString( "%1 %2" ).tqarg( mResource->resourceName() ).tqarg( mResource->subresourceLabel( mSubResource ) );
+    return TQString( "%1 %2" ).arg( mResource->resourceName() ).arg( mResource->subresourceLabel( mSubResource ) );
   }
   virtual int completionWeight() const {
     return mResource->subresourceCompletionWeight( mSubResource );
diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp
index 05f20e39..d773c7d6 100644
--- a/libtdepim/csshelper.cpp
+++ b/libtdepim/csshelper.cpp
@@ -73,10 +73,10 @@ namespace KPIM {
     mMetrics( pdm )
   {
     // initialize with defaults - should match the corresponding application defaults
-    mForegroundColor = TQApplication::tqpalette().active().text();
+    mForegroundColor = TQApplication::palette().active().text();
     mLinkColor = KGlobalSettings::linkColor();
     mVisitedLinkColor = KGlobalSettings::visitedLinkColor();
-    mBackgroundColor = TQApplication::tqpalette().active().base();
+    mBackgroundColor = TQApplication::palette().active().base();
     cHtmlWarning = TQColor( 0xFF, 0x40, 0x40 ); // warning frame color: light red
 
     cPgpEncrH = TQColor( 0x00, 0x80, 0xFF ); // light blue
@@ -184,9 +184,9 @@ namespace KPIM {
       ? level % numQuoteLevels + 1
       : kMin( level + 1, numQuoteLevels ) ;
     if ( level >= numQuoteLevels )
-      return TQString( "<div class=\"deepquotelevel%1\">" ).tqarg( effectiveLevel );
+      return TQString( "<div class=\"deepquotelevel%1\">" ).arg( effectiveLevel );
     else
-      return TQString( "<div class=\"quotelevel%1\">" ).tqarg( effectiveLevel );
+      return TQString( "<div class=\"quotelevel%1\">" ).arg( effectiveLevel );
   }
 
   TQString CSSHelper::nonQuotedFontTag() const {
@@ -214,9 +214,9 @@ namespace KPIM {
   TQString CSSHelper::printCssDefinitions( bool fixed ) const {
     const TQString headerFont = TQString( "  font-family: \"%1\" ! important;\n"
                                         "  font-size: %2pt ! important;\n" )
-                           .tqarg( mPrintFont.family() )
-                           .tqarg( mPrintFont.pointSize() );
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
+                           .arg( mPrintFont.family() )
+                           .arg( mPrintFont.pointSize() );
+    const TQColorGroup & cg = TQApplication::palette().active();
 
     const TQFont printFont = bodyFont( fixed, true /* print */ );
     TQString quoteCSS;
@@ -234,7 +234,7 @@ namespace KPIM {
                "  color: #000000 ! important;\n"
                "  background-color: #ffffff ! important\n"
                "}\n\n" )
-      .tqarg( printFont.family(),
+      .arg( printFont.family(),
             TQString::number( printFont.pointSize() ) )
       +
       TQString( "tr.textAtmH,\n"
@@ -288,7 +288,7 @@ namespace KPIM {
                "  display:none ! important;\n"
                "}\n\n"
             )
-      .tqarg( headerFont,
+      .arg( headerFont,
             cg.background().name(),
             cg.foreground().name() )
       + quoteCSS;
@@ -300,15 +300,15 @@ namespace KPIM {
     const TQString linkColor = mLinkColor.name();
     const TQString headerFont = TQString("  font-family: \"%1\" ! important;\n"
                                        "  font-size: %2px ! important;\n")
-      .tqarg( mBodyFont.family() )
-      .tqarg( pointsToPixel( helper->mMetrics, mBodyFont.pointSize() ) );
+      .arg( mBodyFont.family() )
+      .arg( pointsToPixel( helper->mMetrics, mBodyFont.pointSize() ) );
     const TQString background = ( mBackingPixmapOn
                          ? TQString( "  background-image:url(file://%1) ! important;\n" )
-                           .tqarg( mBackingPixmapStr )
+                           .arg( mBackingPixmapStr )
                          : TQString( "  background-color: %1 ! important;\n" )
-                           .tqarg( bgColor ) );
+                           .arg( bgColor ) );
     const TQString bodyFontSize = TQString::number( pointsToPixel( helper->mMetrics, fontSize( fixed ) ) ) + "px" ;
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
+    const TQColorGroup & cg = TQApplication::palette().active();
 
     TQString quoteCSS;
     if ( bodyFont( fixed ).italic() )
@@ -322,13 +322,13 @@ namespace KPIM {
     for ( int i = 0 ; i < 3 ; ++i ) {
       quoteCSS += TQString( "div.quotelevel%1 {\n"
                            "  color: %2 ! important;\n" )
-        .tqarg( TQString::number(i+1), mQuoteColor[i].name() );
+        .arg( TQString::number(i+1), mQuoteColor[i].name() );
       if ( mQuoteFont[i].italic() )
         quoteCSS += "  font-style: italic ! important;\n";
       if ( mQuoteFont[i].bold() )
         quoteCSS += "  font-weight: bold ! important;\n";
       if ( mShrinkQuotes )
-        quoteCSS += "  font-size: " + TQString::tqfromLatin1( quoteFontSizes[i] )
+        quoteCSS += "  font-size: " + TQString::fromLatin1( quoteFontSizes[i] )
           + "% ! important;\n";
       quoteCSS += "}\n\n";
     }
@@ -337,7 +337,7 @@ namespace KPIM {
     for ( int i = 0 ; i < 3 ; ++i ) {
       quoteCSS += TQString( "div.deepquotelevel%1 {\n"
                            "  color: %2 ! important;\n" )
-        .tqarg( TQString::number(i+1), mQuoteColor[i].name() );
+        .arg( TQString::number(i+1), mQuoteColor[i].name() );
       if ( mQuoteFont[i].italic() )
         quoteCSS += "  font-style: italic ! important;\n";
       if ( mQuoteFont[i].bold() )
@@ -354,7 +354,7 @@ namespace KPIM {
                "  color: %3 ! important;\n"
                "%4"
                "}\n\n" )
-      .tqarg( bodyFont( fixed ).family(),
+      .arg( bodyFont( fixed ).family(),
             bodyFontSize,
             fgColor,
             background )
@@ -392,7 +392,7 @@ namespace KPIM {
                "tr.rfc822H {\n"
                "%4"
                "}\n\n" )
-      .tqarg( linkColor, fgColor, bgColor, headerFont )
+      .arg( linkColor, fgColor, bgColor, headerFont )
       +
       TQString( "table.encr {\n"
                "  background-color: %1 ! important;\n"
@@ -404,7 +404,7 @@ namespace KPIM {
                "}\n\n"
 
                "tr.encrB { background-color: %4 ! important; }\n\n" )
-      .tqarg( cPgpEncrF.name(),
+      .arg( cPgpEncrF.name(),
             cPgpEncrH.name(),
             headerFont,
             cPgpEncrB.name() )
@@ -419,7 +419,7 @@ namespace KPIM {
                "}\n\n"
 
                "tr.signOkKeyOkB { background-color: %4 ! important; }\n\n" )
-      .tqarg( cPgpOk1F.name(),
+      .arg( cPgpOk1F.name(),
             cPgpOk1H.name(),
             headerFont,
             cPgpOk1B.name() )
@@ -434,7 +434,7 @@ namespace KPIM {
                "}\n\n"
 
                "tr.signOkKeyBadB { background-color: %4 ! important; }\n\n" )
-      .tqarg( cPgpOk0F.name(),
+      .arg( cPgpOk0F.name(),
             cPgpOk0H.name(),
             headerFont,
             cPgpOk0B.name() )
@@ -449,7 +449,7 @@ namespace KPIM {
                "}\n\n"
 
                "tr.signWarnB { background-color: %4 ! important; }\n\n" )
-      .tqarg( cPgpWarnF.name(),
+      .arg( cPgpWarnF.name(),
             cPgpWarnH.name(),
             headerFont,
             cPgpWarnB.name() )
@@ -464,7 +464,7 @@ namespace KPIM {
                "}\n\n"
 
                "tr.signErrB { background-color: %4 ! important; }\n\n" )
-      .tqarg( cPgpErrF.name(),
+      .arg( cPgpErrF.name(),
             cPgpErrH.name(),
             headerFont,
             cPgpErrB.name() )
@@ -472,7 +472,7 @@ namespace KPIM {
       TQString( "div.htmlWarn {\n"
                "  border: 2px solid %1 ! important;\n"
                "}\n\n" )
-      .tqarg( cHtmlWarning.name() )
+      .arg( cHtmlWarning.name() )
       +
       TQString( "div.header {\n"
                "%1"
@@ -519,12 +519,12 @@ namespace KPIM {
                "}\n\n"
                )
 
-      .tqarg( headerFont )
-      .tqarg( cg.highlight().name(),
+      .arg( headerFont )
+      .arg( cg.highlight().name(),
             cg.highlightedText().name(),
             cg.foreground().name(),
             cg.background().name() )
-      .tqarg( cg.mid().name() )
+      .arg( cg.mid().name() )
       + quoteCSS;
   }
 
diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp
index 1a07655f..8ead24b9 100644
--- a/libtdepim/designerfields.cpp
+++ b/libtdepim/designerfields.cpp
@@ -23,11 +23,11 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqdatetimeedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqspinbox.h>
 #include <tqregexp.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqwidgetfactory.h>
 
 #include <kdatepicker.h>
@@ -50,7 +50,7 @@ DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent,
 
 void DesignerFields::initGUI( const TQString &uiFile )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
 
   TQWidget *wdg = TQWidgetFactory::create( uiFile, 0, this );
   if ( !wdg ) {
@@ -61,7 +61,7 @@ void DesignerFields::initGUI( const TQString &uiFile )
   mTitle = wdg->caption();
   mIdentifier = wdg->name();
 
-  tqlayout->addWidget( wdg );
+  layout->addWidget( wdg );
 
   TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING );
   TQObjectListIt it( *list );
@@ -154,13 +154,13 @@ void DesignerFields::load( DesignerFields::Storage *storage )
       wdg->setChecked( false );
     } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
       TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() );
-      wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
+      wdg->setDateTime( TQDateTime::currentDateTime() );
     } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) {
       KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( widIt.data() );
-      wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
+      wdg->setDateTime( TQDateTime::currentDateTime() );
     } else if ( widIt.data()->inherits( "KDatePicker" ) ) {
       KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() );
-      wdg->setDate( TQDate::tqcurrentDate() );
+      wdg->setDate( TQDate::currentDate() );
     } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
       TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() );
       wdg->setCurrentItem( 0 );
diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp
index 3971bf36..fa5eea89 100644
--- a/libtdepim/embeddedurlpage.cpp
+++ b/libtdepim/embeddedurlpage.cpp
@@ -27,7 +27,7 @@
 #include <kparts/part.h>
 #include <kmimetype.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 using namespace KPIM;
@@ -41,9 +41,9 @@ EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype,
 
 void EmbeddedURLPage::initGUI( const TQString &url, const TQString &/*mimetype*/ )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-  tqlayout->setAutoAdd( true );
-  new TQLabel( i18n("Showing URL %1").tqarg( url ), this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  layout->setAutoAdd( true );
+  new TQLabel( i18n("Showing URL %1").arg( url ), this );
 }
 
 void EmbeddedURLPage::loadContents()
diff --git a/libtdepim/htmldiffalgodisplay.cpp b/libtdepim/htmldiffalgodisplay.cpp
index 726854e4..4be6b6cd 100644
--- a/libtdepim/htmldiffalgodisplay.cpp
+++ b/libtdepim/htmldiffalgodisplay.cpp
@@ -45,13 +45,13 @@ void HTMLDiffAlgoDisplay::begin()
 
   mText.append( "<html>" );
   mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" )
-               .tqarg( KGlobalSettings::textColor().name() )
-               .tqarg( KGlobalSettings::baseColor().name() ) );
+               .arg( KGlobalSettings::textColor().name() )
+               .arg( KGlobalSettings::baseColor().name() ) );
 
   mText.append( "<center><table>" );
   mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td>         </td><th align=\"center\">%2</th></tr>" )
-               .tqarg( mLeftTitle )
-               .tqarg( mRightTitle ) );
+               .arg( mLeftTitle )
+               .arg( mRightTitle ) );
 }
 
 void HTMLDiffAlgoDisplay::end()
@@ -76,22 +76,22 @@ void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title )
 void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value )
 {
   mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" )
-               .tqarg( id )
-               .tqarg( textToHTML( value ) ) );
+               .arg( id )
+               .arg( textToHTML( value ) ) );
 }
 
 void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value )
 {
   mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" )
-               .tqarg( id )
-               .tqarg( textToHTML( value ) ) );
+               .arg( id )
+               .arg( textToHTML( value ) ) );
 }
 
 void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue,
                                           const TQString &rightValue )
 {
   mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" )
-               .tqarg( id )
-               .tqarg( textToHTML( leftValue ) )
-               .tqarg( textToHTML( rightValue ) ) );
+               .arg( id )
+               .arg( textToHTML( leftValue ) )
+               .arg( textToHTML( rightValue ) ) );
 }
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 7854be1d..230f4ef4 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -74,7 +74,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
     //TODO: Enable the better message at the next string unfreeze
 #if 0
     TQString text = i18n("<qt>The email address <b>%1</b> cannot be "
-                        "found in your addressbook.</qt>").tqarg( email );
+                        "found in your addressbook.</qt>").arg( email );
 #else
     TQString text = email + " " + i18n( "is not in address book" );
 #endif
@@ -150,12 +150,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
     if ( KAddrBookExternal::addAddressee( a ) ) {
       TQString text = i18n("<qt>The email address <b>%1</b> was added to your "
                           "addressbook; you can add more information to this "
-                          "entry by opening the addressbook.</qt>").tqarg( addr );
+                          "entry by opening the addressbook.</qt>").arg( addr );
       KMessageBox::information( parent, text, TQString(), "addedtokabc" );
     }
   } else {
     TQString text = i18n("<qt>The email address <b>%1</b> is already in your "
-                        "addressbook.</qt>").tqarg( addr );
+                        "addressbook.</qt>").arg( addr );
     KMessageBox::information( parent, text, TQString(),
                               "alreadyInAddressBook" );
   }
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index 870d89ce..b0baf967 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -24,7 +24,7 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
@@ -176,7 +176,7 @@ void KCMDesignerFields::deleteFile()
   if ( item ) {
     PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item );
     if (KMessageBox::warningContinueCancel(this,
-	i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").tqarg( pageItem->text(0) ), "", KStdGuiItem::del() )
+	i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").arg( pageItem->text(0) ), "", KStdGuiItem::del() )
          == KMessageBox::Continue)
       KIO::NetAccess::del( pageItem->path(), 0 );
   }
@@ -261,7 +261,7 @@ void KCMDesignerFields::defaults()
 
 void KCMDesignerFields::initGUI()
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   bool noDesigner = KStandardDirs::findExe("designer").isEmpty();
@@ -272,10 +272,10 @@ void KCMDesignerFields::initGUI()
       i18n("<qt><b>Warning:</b> TQt Designer could not be found. It is probably not "
          "installed. You will only be able to import existing designer files.</qt>");
     TQLabel *lbl = new TQLabel( txt, this );
-    tqlayout->addWidget( lbl );
+    layout->addWidget( lbl );
   }
 
-  TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() );
+  TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() );
 
   mPageView = new KListView( this );
   mPageView->addColumn( i18n( "Available Pages" ) );
@@ -295,7 +295,7 @@ void KCMDesignerFields::initGUI()
 
   loadUiFiles();
 
-  hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() );
+  hbox = new TQHBoxLayout( layout, KDialog::spacingHint() );
 
   TQString cwHowto = i18n("<qt><p>This section allows you to add your own GUI"
                          "  Elements ('<i>Widgets</i>') to store your own values"
@@ -316,14 +316,14 @@ void KCMDesignerFields::initGUI()
                          "<p><b>Important:</b> The widget will edit custom fields with an"
                          " application name of %2.  To change the application name"
                          " to be edited, set the widget name in TQt Designer.</p></qt>" )
-                         .tqarg( applicationName(), applicationName() );
+                         .arg( applicationName(), applicationName() );
 
   KActiveLabel *activeLabel = new KActiveLabel(
-      i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg(cwHowto), this );
+      i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg(cwHowto), this );
   hbox->addWidget( activeLabel );
 
   // ### why is this needed? Looks like a KActiveLabel bug...
-  activeLabel->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+  activeLabel->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
 
   hbox->addStretch( 1 );
 
@@ -360,14 +360,14 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
                                  "<tr><td align=\"right\"><b>%5</b></td><td>%6</td></tr>"
                                  "<tr><td align=\"right\"><b>%7</b></td><td>%8</td></tr>"
                                  "</table></qt>" )
-                                .tqarg( i18n( "Key:" ) )
-                                .tqarg( item->text( 0 ).replace("X_","X-") )
-                                .tqarg( i18n( "Type:" ) )
-                                .tqarg( item->text( 1 ) )
-                                .tqarg( i18n( "Classname:" ) )
-                                .tqarg( item->text( 2 ) )
-                                .tqarg( i18n( "Description:" ) )
-                                .tqarg( item->text( 3 ) );
+                                .arg( i18n( "Key:" ) )
+                                .arg( item->text( 0 ).replace("X_","X-") )
+                                .arg( i18n( "Type:" ) )
+                                .arg( item->text( 1 ) )
+                                .arg( i18n( "Classname:" ) )
+                                .arg( item->text( 2 ) )
+                                .arg( i18n( "Description:" ) )
+                                .arg( item->text( 3 ) );
 
       mPageDetails->setText( details );
 
diff --git a/libtdepim/kconfigwizard.cpp b/libtdepim/kconfigwizard.cpp
index bceacd65..bf7088f9 100644
--- a/libtdepim/kconfigwizard.cpp
+++ b/libtdepim/kconfigwizard.cpp
@@ -28,7 +28,7 @@
 #include <kapplication.h>
 
 #include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 KConfigWizard::KConfigWizard( TQWidget *parent,
diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp
index 44c4e696..df2b98c9 100644
--- a/libtdepim/kdateedit.cpp
+++ b/libtdepim/kdateedit.cpp
@@ -72,13 +72,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name )
   // need at least one entry for popup to work
   setMaxCount( 1 );
 
-  mDate = TQDate::tqcurrentDate();
+  mDate = TQDate::currentDate();
   TQString today = KGlobal::locale()->formatDate( mDate, true );
 
   insertItem( today );
   setCurrentItem( 0 );
   changeItem( today, 0 );
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
 
   connect( lineEdit(), TQT_SIGNAL( returnPressed() ),
            this, TQT_SLOT( lineEnterPressed() ) );
@@ -138,13 +138,13 @@ void KDateEdit::popup()
 
   TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) );
 
-  int dateFrameHeight = mPopup->tqsizeHint().height();
+  int dateFrameHeight = mPopup->sizeHint().height();
   if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() )
     popupPoint.setY( popupPoint.y() - dateFrameHeight );
   else
     popupPoint.setY( popupPoint.y() + height() );
 
-  int dateFrameWidth = mPopup->tqsizeHint().width();
+  int dateFrameWidth = mPopup->sizeHint().width();
   if ( popupPoint.x() + dateFrameWidth > desk.right() )
     popupPoint.setX( desk.right() - dateFrameWidth );
 
@@ -157,7 +157,7 @@ void KDateEdit::popup()
   if ( mDate.isValid() )
     mPopup->setDate( mDate );
   else
-    mPopup->setDate( TQDate::tqcurrentDate() );
+    mPopup->setDate( TQDate::currentDate() );
 
   mPopup->popup( popupPoint );
 
@@ -215,7 +215,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const
   if ( text.isEmpty() )
     result = TQDate();
   else if ( mKeywordMap.contains( text.lower() ) ) {
-    TQDate today = TQDate::tqcurrentDate();
+    TQDate today = TQDate::currentDate();
     int i = mKeywordMap[ text.lower() ];
     if ( i >= 100 ) {
       /* A day name has been entered. Convert to offset from today.
diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp
index 998c44e4..f6e7031e 100644
--- a/libtdepim/kdatepickerpopup.cpp
+++ b/libtdepim/kdatepickerpopup.cpp
@@ -97,12 +97,12 @@ void KDatePickerPopup::slotDateChanged( TQDate date )
 
 void KDatePickerPopup::slotToday()
 {
-  emit dateChanged( TQDate::tqcurrentDate() );
+  emit dateChanged( TQDate::currentDate() );
 }
 
 void KDatePickerPopup::slotTomorrow()
 {
-  emit dateChanged( TQDate::tqcurrentDate().addDays( 1 ) );
+  emit dateChanged( TQDate::currentDate().addDays( 1 ) );
 }
 
 void KDatePickerPopup::slotNoDate()
@@ -112,12 +112,12 @@ void KDatePickerPopup::slotNoDate()
 
 void KDatePickerPopup::slotNextWeek()
 {
-  emit dateChanged( TQDate::tqcurrentDate().addDays( 7 ) );
+  emit dateChanged( TQDate::currentDate().addDays( 7 ) );
 }
 
 void KDatePickerPopup::slotNextMonth()
 {
-  emit dateChanged( TQDate::tqcurrentDate().addMonths( 1 ) );
+  emit dateChanged( TQDate::currentDate().addMonths( 1 ) );
 }
 
 #include "kdatepickerpopup.moc"
diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h
index 44dc7c66..7bcfea3e 100644
--- a/libtdepim/kdatepickerpopup.h
+++ b/libtdepim/kdatepickerpopup.h
@@ -57,7 +57,7 @@ class KDE_EXPORT KDatePickerPopup: public TQPopupMenu
        @param parent The object's parent.
        @param name The object's name.
     */
-    KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(),
+    KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::currentDate(),
                       TQWidget *parent = 0, const char *name = 0 );
 
     /**
diff --git a/libtdepim/kfileio.cpp b/libtdepim/kfileio.cpp
index e167662b..fa963e16 100644
--- a/libtdepim/kfileio.cpp
+++ b/libtdepim/kfileio.cpp
@@ -48,20 +48,20 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo
   if (!info.exists())
   {
     if (aVerbose)
-      msgDialog(i18n("The specified file does not exist:\n%1").tqarg(aFileName));
+      msgDialog(i18n("The specified file does not exist:\n%1").arg(aFileName));
     return TQCString();
   }
   if (info.isDir())
   {
     if (aVerbose)
-      msgDialog(i18n("This is a folder and not a file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("This is a folder and not a file:\n%1").arg(aFileName));
     return TQCString();
   }
   if (!info.isReadable())
   {
     if (aVerbose)
       msgDialog(i18n("You do not have read permissions "
-				   "to the file:\n%1").tqarg(aFileName));
+				   "to the file:\n%1").arg(aFileName));
     return TQCString();
   }
   if (len <= 0) return TQCString();
@@ -71,13 +71,13 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo
     if (aVerbose) switch(file.status())
     {
     case IO_ReadError:
-      msgDialog(i18n("Could not read file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Could not read file:\n%1").arg(aFileName));
       break;
     case IO_OpenError:
-      msgDialog(i18n("Could not open file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Could not open file:\n%1").arg(aFileName));
       break;
     default:
-      msgDialog(i18n("Error while reading file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Error while reading file:\n%1").arg(aFileName));
     }
     return TQCString();
   }
@@ -94,7 +94,7 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo
   if (readLen < len)
   {
     TQString msg = i18n("Could only read %1 bytes of %2.")
-		.tqarg(readLen).tqarg(len);
+		.arg(readLen).arg(len);
     msgDialog(msg);
     return TQCString();
   }
@@ -120,21 +120,21 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose)
   {
     if (aVerbose)
       msgDialog(i18n("The specified file does not exist:\n%1")
-		.tqarg(aFileName));
+		.arg(aFileName));
     return result;
   }
   if (info.isDir())
   {
     if (aVerbose)
       msgDialog(i18n("This is a folder and not a file:\n%1")
-		.tqarg(aFileName));
+		.arg(aFileName));
     return result;
   }
   if (!info.isReadable())
   {
     if (aVerbose)
       msgDialog(i18n("You do not have read permissions "
-				   "to the file:\n%1").tqarg(aFileName));
+				   "to the file:\n%1").arg(aFileName));
     return result;
   }
   if (len <= 0) return result;
@@ -144,26 +144,26 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose)
     if (aVerbose) switch(file.status())
     {
     case IO_ReadError:
-      msgDialog(i18n("Could not read file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Could not read file:\n%1").arg(aFileName));
       break;
     case IO_OpenError:
-      msgDialog(i18n("Could not open file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Could not open file:\n%1").arg(aFileName));
       break;
     default:
-      msgDialog(i18n("Error while reading file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Error while reading file:\n%1").arg(aFileName));
     }
     return result;
   }
 
   result.resize(len);
   readLen = file.readBlock(result.data(), len);
-  kdDebug(5300) << TQString( "len %1" ).tqarg(len) << endl;
+  kdDebug(5300) << TQString( "len %1" ).arg(len) << endl;
 
   if (readLen < len)
   {
     TQString msg;
     msg = i18n("Could only read %1 bytes of %2.")
-		.tqarg(readLen).tqarg(len);
+		.arg(readLen).arg(len);
     msgDialog(msg);
     return result;
   }
@@ -191,7 +191,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
     {
       TQString str;
       str = i18n("File %1 exists.\nDo you want to replace it?")
-		  .tqarg(aFileName);
+		  .arg(aFileName);
       rc = KMessageBox::warningContinueCancel(0,
 	   str, i18n("Save to File"), i18n("&Replace"));
       if (rc != KMessageBox::Continue) return FALSE;
@@ -209,7 +209,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
 	if (!aVerbose) return FALSE;
 	rc = KMessageBox::warningContinueCancel(0,
 	     i18n("Failed to make a backup copy of %1.\nContinue anyway?")
-	     .tqarg(aFileName),
+	     .arg(aFileName),
              i18n("Save to File"), KStdGuiItem::save() );
 	if (rc != KMessageBox::Continue) return FALSE;
       }
@@ -221,14 +221,14 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
     if (aVerbose) switch(file.status())
     {
     case IO_WriteError:
-      msgDialog(i18n("Could not write to file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Could not write to file:\n%1").arg(aFileName));
       break;
     case IO_OpenError:
       msgDialog(i18n("Could not open file for writing:\n%1")
-		.tqarg(aFileName));
+		.arg(aFileName));
       break;
     default:
-      msgDialog(i18n("Error while writing file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Error while writing file:\n%1").arg(aFileName));
     }
     return FALSE;
   }
@@ -238,13 +238,13 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
   if (writeLen < 0)
   {
     if (aVerbose)
-      msgDialog(i18n("Could not write to file:\n%1").tqarg(aFileName));
+      msgDialog(i18n("Could not write to file:\n%1").arg(aFileName));
     return FALSE;
   }
   else if (writeLen < len)
   {
     TQString msg = i18n("Could only write %1 bytes of %2.")
-		.tqarg(writeLen).tqarg(len);
+		.arg(writeLen).arg(len);
     if (aVerbose)
       msgDialog(msg);
     return FALSE;
@@ -283,7 +283,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
 
   if ( !fiToCheck.exists() ) {
     error.append( i18n("%1 does not exist")
-                  .tqarg(toCheck) + "\n");
+                  .arg(toCheck) + "\n");
   }
 
   // check the access bit of a folder.
@@ -295,7 +295,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
     if ( !g.isReadable() ) {
       if ( chmod( toCheckEnc, statbuffer.st_mode + S_IXUSR ) != 0 ) {
         error.append( i18n("%1 is not accessible and that is "
-                           "unchangeable.").tqarg(toCheck) + "\n");
+                           "unchangeable.").arg(toCheck) + "\n");
       } else {
         kdDebug() << "Changed access bit for " << toCheck << endl;
       }
@@ -316,7 +316,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
       // Lets try changing it.
       if ( chmod( toCheckEnc, statbuffer.st_mode + S_IRUSR ) != 0 ) {
         error.append( i18n("%1 is not readable and that is unchangeable.")
-                           .tqarg(toCheck) + "\n");
+                           .arg(toCheck) + "\n");
       } else {
         kdDebug() << "Changed the read bit for " << toCheck << endl;
       }
@@ -332,7 +332,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
       // Lets try changing it.
       if ( chmod (toCheckEnc, statbuffer.st_mode + S_IWUSR ) != 0 ) {
         error.append( i18n("%1 is not writable and that is unchangeable.")
-                           .tqarg(toCheck) + "\n");
+                           .arg(toCheck) + "\n");
       } else {
         kdDebug() << "Changed the write bit for " << toCheck << endl;
       }
@@ -346,7 +346,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
     // First check if the folder is readable for us. If not, we get
     // some ugly crashes.
     if ( !g.isReadable() ){
-      error.append(i18n("Folder %1 is inaccessible.").tqarg(toCheck) + "\n");
+      error.append(i18n("Folder %1 is inaccessible.").arg(toCheck) + "\n");
     } else {
       const TQFileInfoList *list = g.entryInfoList();
       TQFileInfoListIterator it( *list );
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index 64859199..79ad6aa9 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -198,7 +198,7 @@ void KFolderTreeItem::setFolderSize( TQ_INT64 aSize )
       TQ_INT64 recursiveSize = recursiveFolderSize();
       if ( recursiveSize != mSize ) {
             if ( mType != Root )
-                size += TQString::tqfromLatin1(" + %1").tqarg( KIO::convertSize( recursiveSize - mSize ) );
+                size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) );
             else 
                 size = KIO::convertSize( recursiveSize );
       }
@@ -351,7 +351,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v )
 {
   if ( mFolderIsCloseToQuota != v) {
     mFolderIsCloseToQuota = v;
-    tqrepaint();
+    repaint();
   }
 }
 
@@ -391,9 +391,9 @@ void KFolderTree::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( tqstyle().isA("KeramikStyle") )
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
@@ -535,7 +535,7 @@ void KFolderTree::setFullWidth( bool fullWidth )
 //-----------------------------------------------------------------------------
 void KFolderTree::slotSizeChanged( int section, int, int newSize )
 {
-  viewport()->tqrepaint(
+  viewport()->repaint(
       header()->sectionPos(section), 0, newSize, visibleHeight(), false );
 }
 
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index 5ee25573..89c0e677 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -61,7 +61,7 @@ struct KPaintInfo {
     showTodo(false),
     showSpamHam(false),
     showWatchedIgnored(false),
-    showtqStatus(false),
+    showStatus(false),
     showSigned(false),
     showCrypto(false),
     showReceiver(false),
@@ -108,7 +108,7 @@ struct KPaintInfo {
   bool showTodo;
   bool showSpamHam;
   bool showWatchedIgnored;
-  bool showtqStatus;
+  bool showStatus;
   bool showSigned;
   bool showCrypto;
   bool showReceiver;
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index da6c98fa..637d60e1 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -27,13 +27,13 @@
 #include <tqbuttongroup.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistview.h>
 #include <tqradiobutton.h>
 #include <tqregexp.h>
 #include <tqtable.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvbox.h>
 
 #include <kapplication.h>
@@ -337,7 +337,7 @@ void KImportDialog::readFile( int rows )
     if (x == mSeparator)
     {
       progress->setValue(progressValue++);
-      if (progressValue % 15 == 0) // try not to constantly tqrepaint
+      if (progressValue % 15 == 0) // try not to constantly repaint
         kapp->processEvents();
     }
     
diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp
index fee89bbb..57f46d58 100644
--- a/libtdepim/kincidencechooser.cpp
+++ b/libtdepim/kincidencechooser.cpp
@@ -22,16 +22,16 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqradiobutton.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollview.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqapplication.h>
 
 
@@ -265,9 +265,9 @@ void KIncidenceChooser::showDiff()
     }
     mDisplayDiff = new KPIM::HTMLDiffAlgoDisplay (this);
     if ( mInc1->summary().left( 20 ) != mInc2->summary().left( 20 ) )
-        mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").tqarg( mInc1->summary().left( 20 ) ).tqarg( mInc2->summary().left( 20 ) ) );
+        mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").arg( mInc1->summary().left( 20 ) ).arg( mInc2->summary().left( 20 ) ) );
     else
-        mDisplayDiff->setCaption( i18n( "Differences of %1").tqarg( mInc1->summary().left( 20 ) ) );
+        mDisplayDiff->setCaption( i18n( "Differences of %1").arg( mInc1->summary().left( 20 ) ) );
 
     diff = new KPIM::CalendarDiffAlgo( mInc1, mInc2);
     diff->setLeftSourceTitle(  i18n( "Local entry"));
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index dcfea6f4..2a55d734 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent )
                                                    this, TQT_SLOT( loadAllPlugins() ) );
 
   d->plugins = KPluginInfo::fromServices(
-    KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ),
-                            TQString::tqfromLatin1( "[X-Komposer-Version] == 1" ) ) );
+    KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
+                            TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) );
 }
 
 PluginManager::~PluginManager()
@@ -205,7 +205,7 @@ PluginManager::slotShutdownTimeout()
 
   kdWarning() << k_funcinfo << "Some plugins didn't shutdown in time!" << endl
               << "Remaining plugins: "
-              << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl
+              << remaining.join( TQString::fromLatin1( ", " ) ) << endl
               << "Forcing Komposer shutdown now." << endl;
 #endif
 
@@ -229,18 +229,18 @@ PluginManager::loadAllPlugins()
     d->config = KSharedConfig::openConfig( "komposerrc" );
 
   TQMap<TQString, TQString> entries = d->config->entryMap(
-    TQString::tqfromLatin1( "Plugins" ) );
+    TQString::fromLatin1( "Plugins" ) );
 
   TQMap<TQString, TQString>::Iterator it;
   for ( it = entries.begin(); it != entries.end(); ++it )
   {
     TQString key = it.key();
-    if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) )
+    if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) )
     {
       key.setLength( key.length() - 7 );
       //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl;
 
-      if ( it.data() == TQString::tqfromLatin1( "true" ) )
+      if ( it.data() == TQString::fromLatin1( "true" ) )
       {
         if ( !plugin( key ) )
           d->pluginsToLoad.push( key );
@@ -310,8 +310,8 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
 
   int error = 0;
   Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>(
-    TQString::tqfromLatin1( "Komposer/Plugin" ),
-    TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ),
+    TQString::fromLatin1( "Komposer/Plugin" ),
+    TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
     this, 0, TQStringList(), &error );
 
   if ( plugin ) {
@@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const
       return it.key()->name();
   }
 
-  return TQString::tqfromLatin1( "Unknown" );
+  return TQString::fromLatin1( "Unknown" );
 }
 
 TQString
@@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const
       return it.key()->pluginName();
   }
 
-  return TQString::tqfromLatin1( "unknown" );
+  return TQString::fromLatin1( "unknown" );
 }
 
 TQString
@@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const
       return it.key()->icon();
   }
 
-  return TQString::tqfromLatin1( "Unknown" );
+  return TQString::fromLatin1( "Unknown" );
 }
 
 KPluginInfo*
@@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru
   if ( !infoForPluginId( pluginId ) )
     return false;
 
-  d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled );
+  d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled );
   d->config->sync();
 
   return true;
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 77e1c264..1cd97e72 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <ktrader.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
@@ -75,8 +75,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference,
   : m_reference( reference )
 {
   m_box = new TQGroupBox( 0, TQt::Vertical, text, parent );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() );
-  boxLayout->tqsetAlignment( TQt::AlignTop );
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() );
+  boxLayout->setAlignment( TQt::AlignTop );
 
   m_editorsCombo = new KComboBox( m_box );
   boxLayout->addWidget( m_editorsCombo );
@@ -101,11 +101,11 @@ EditorSelection::readConfig()
   m_editorsCombo->clear();
 
   KTrader::OfferList editors = KTrader::self()->query(
-    TQString::tqfromLatin1( "Komposer/Editor" ) );
+    TQString::fromLatin1( "Komposer/Editor" ) );
   KTrader::OfferList::ConstIterator it;
   int i = 0;
   for ( it = editors.begin(); it != editors.end(); ++it, ++i ) {
-    if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) )
+    if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) )
       continue;
 
     TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString();
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 27018ce5..91dda85c 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -39,7 +39,7 @@
 #include <kreplacedialog.h>
 #include <kreplace.h>
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqwidget.h>
 
 typedef KGenericFactory<DefaultEditor> DefaultEditorFactory;
@@ -87,7 +87,7 @@ DefaultEditor::changeSignature( const TQString &sig )
   TQString text = m_textEdit->text();
 
   int sigStart = text.findRev( "-- " );
-  TQString sigText = TQString( "-- \n%1" ).tqarg( sig );
+  TQString sigText = TQString( "-- \n%1" ).arg( sig );
 
   text.replace( sigStart, text.length(), sigText );
 }
@@ -202,10 +202,10 @@ DefaultEditor::createActions( KActionCollection *ac )
   connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)),
            this, TQT_SLOT(setAlignJustify(bool)) );
 
-  m_actionAlignLeft->setExclusiveGroup( "tqalignment" );
-  m_actionAlignCenter->setExclusiveGroup( "tqalignment" );
-  m_actionAlignRight->setExclusiveGroup( "tqalignment" );
-  m_actionAlignJustify->setExclusiveGroup( "tqalignment" );
+  m_actionAlignLeft->setExclusiveGroup( "alignment" );
+  m_actionAlignCenter->setExclusiveGroup( "alignment" );
+  m_actionAlignRight->setExclusiveGroup( "alignment" );
+  m_actionAlignJustify->setExclusiveGroup( "alignment" );
 
   //
   // Tools
@@ -244,7 +244,7 @@ DefaultEditor::updateCharFmt()
 void
 DefaultEditor::updateAligment()
 {
-  int align = m_textEdit->tqalignment();
+  int align = m_textEdit->alignment();
 
   switch ( align ) {
   case AlignRight:
@@ -288,28 +288,28 @@ void
 DefaultEditor::setAlignLeft( bool yes )
 {
   if ( yes )
-    m_textEdit->tqsetAlignment( AlignLeft );
+    m_textEdit->setAlignment( AlignLeft );
 }
 
 void
 DefaultEditor::setAlignRight( bool yes )
 {
   if ( yes )
-    m_textEdit->tqsetAlignment( AlignRight );
+    m_textEdit->setAlignment( AlignRight );
 }
 
 void
 DefaultEditor::setAlignCenter( bool yes )
 {
   if ( yes )
-    m_textEdit->tqsetAlignment( AlignCenter );
+    m_textEdit->setAlignment( AlignCenter );
 }
 
 void
 DefaultEditor::setAlignJustify( bool yes )
 {
   if ( yes )
-    m_textEdit->tqsetAlignment( AlignJustify );
+    m_textEdit->setAlignment( AlignJustify );
 }
 
 //
diff --git a/libtdepim/komposer/plugins/default/defaulteditorui.rc b/libtdepim/komposer/plugins/default/defaulteditorui.rc
index de8c2e6d..479fa8b0 100644
--- a/libtdepim/komposer/plugins/default/defaulteditorui.rc
+++ b/libtdepim/komposer/plugins/default/defaulteditorui.rc
@@ -24,7 +24,7 @@
     <Action name="format_color"/>
     <DefineGroup name="format_chars_group" />
     <Separator/>
-    <Menu name="tqalignment"><text>&amp;Alignment</text>
+    <Menu name="alignment"><text>&amp;Alignment</text>
        <Action name="format_align_left"/>
        <Action name="format_align_center"/>
        <Action name="format_align_right"/>
diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
index a83a5a7a..35966fb7 100644
--- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
+++ b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
@@ -22,15 +22,15 @@
 #include <kparts/componentfactory.h>
 #include <kparts/part.h>
 #include <kmimetype.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 #include <tdepimmacros.h>
 
 KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name )
     : TQWidget( parentWidget, name ), m_part( 0 )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setAutoAdd( true );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setAutoAdd( true );
 }
 
 void KPartsGenericPart::load()
diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index 04ef9c8f..8db527fc 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -29,7 +29,7 @@
 #include <tqpainter.h>
 #include <tqcolor.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kimageeffect.h>
 #include <kdebug.h>
 #include <klocale.h>
@@ -216,7 +216,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
    if ( ev->type() == TQEvent::MouseButtonPress )
    {
       TQMouseEvent *mev= (TQMouseEvent *)(ev);
-      //kdDebug() << TQString("click at  %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl;
+      //kdDebug() << TQString("click at  %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
 
       if ( mev->button() == Qt::RightButton )
       {
@@ -249,7 +249,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
    {
       TQMouseEvent *mev= (TQMouseEvent *)(ev);
 
-      //kdDebug() << TQString("move to  %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl;
+      //kdDebug() << TQString("move to  %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
 
       if ( m_state == Resizing )
       {
@@ -421,7 +421,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height)
    if (m_selectedRegion == m_originalPixmap.rect()) m_selectedRegion=TQRect();
 
 //   kdDebug() << TQString(" original Pixmap :") << m_originalPixmap.rect() << endl;
-//   kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").tqarg(m_unzoomedPixmap.width()).tqarg(m_unzoomedPixmap.height()) << endl;
+//   kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").arg(m_unzoomedPixmap.width()).arg(m_unzoomedPixmap.height()) << endl;
 
    if ( !m_originalPixmap.isNull() &&
        ( m_originalPixmap.width() > m_maxWidth ||
diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index 46669108..9eadffeb 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -21,7 +21,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqlineedit.h>
@@ -376,7 +376,7 @@ KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item,
 
 void KPrefsWidDate::readConfig()
 {
-  mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::tqcurrentDate()  );
+  mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::currentDate()  );
 }
 
 void KPrefsWidDate::writeConfig()
@@ -766,18 +766,18 @@ void KPrefsDialog::autoCreate()
     kdDebug() << "ITEMS: " << (*it)->name() << endl;
 
     TQWidget *page;
-    TQGridLayout *tqlayout;
+    TQGridLayout *layout;
     int currentRow;
     if ( !mGroupPages.contains( group ) ) {
       page = addPage( group );
-      tqlayout = new TQGridLayout( page );
+      layout = new TQGridLayout( page );
       mGroupPages.insert( group, page );
-      mGroupLayouts.insert( group, tqlayout );
+      mGroupLayouts.insert( group, layout );
       currentRow = 0;
       mCurrentRows.insert( group, currentRow );
     } else {
       page = mGroupPages[ group ];
-      tqlayout = mGroupLayouts[ group ];
+      layout = mGroupLayouts[ group ];
       currentRow = mCurrentRows[ group ];
     }
 
@@ -786,11 +786,11 @@ void KPrefsDialog::autoCreate()
     if ( wid ) {
       TQValueList<TQWidget *> widgets = wid->widgets();
       if ( widgets.count() == 1 ) {
-        tqlayout->addMultiCellWidget( widgets[ 0 ],
+        layout->addMultiCellWidget( widgets[ 0 ],
                                     currentRow, currentRow, 0, 1 );
       } else if ( widgets.count() == 2 ) {
-        tqlayout->addWidget( widgets[ 0 ], currentRow, 0 );
-        tqlayout->addWidget( widgets[ 1 ], currentRow, 1 );
+        layout->addWidget( widgets[ 0 ], currentRow, 0 );
+        layout->addWidget( widgets[ 1 ], currentRow, 1 );
       } else {
         kdError() << "More widgets than expected: " << widgets.count() << endl;
       }
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index b1fffcdd..907989f8 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -87,7 +87,7 @@ class KDE_EXPORT KPrefsWid : public TQObject
   @short Widgets for bool settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring bool values. It is meant
-  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
+  to be used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KDE_EXPORT KPrefsWidBool : public KPrefsWid
 {
@@ -120,7 +120,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
   @short Widgets for int settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring integer values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
+  meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
 class KDE_EXPORT KPrefsWidInt : public KPrefsWid
@@ -161,7 +161,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
   @short Widgets for time settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring time values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
+  meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
 class KDE_EXPORT KPrefsWidTime : public KPrefsWid
@@ -198,7 +198,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
   @short Widgets for duration settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring duration values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
+  meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
 class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
@@ -236,7 +236,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
   @short Widgets for time settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring date values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
+  meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
 class KDE_EXPORT KPrefsWidDate : public KPrefsWid
@@ -273,7 +273,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
   @short Widgets for color settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring color values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
+  meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
 class KDE_EXPORT KPrefsWidColor : public KPrefsWid
@@ -317,7 +317,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
   @short Widgets for font settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring font values. It is meant
-  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
+  to be used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KDE_EXPORT KPrefsWidFont : public KPrefsWid
 {
@@ -371,7 +371,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
   @ref KPrefsDialog.
 
   This class provides a control element for configuring selections. It is meant
-  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
+  to be used by KPrefsDialog. The user is responsible for the layout management.
 
   The setting is interpreted as an int value, corresponding to the position of
   the radio button. The position of the button is defined by the sequence of
@@ -420,7 +420,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
   @ref KPrefsDialog.
 
   This class provides a control element for configuring selections. It is meant
-  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
+  to be used by KPrefsDialog. The user is responsible for the layout management.
 
   The setting is interpreted as an int value, corresponding to the index in 
   the combo box.
@@ -455,7 +455,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
   @short Widgets for string settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring string values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
+  meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
 class KDE_EXPORT KPrefsWidString : public KPrefsWid
@@ -502,7 +502,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
   @short Widgets for string settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring string values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
+  meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
 class KDE_EXPORT KPrefsWidPath : public KPrefsWid
@@ -711,7 +711,7 @@ class KDE_EXPORT KPrefsWidManager
 
   This class provides the framework for a preferences dialog. You have to
   subclass it and add the code to create the actual configuration widgets and
-  do the tqlayout management.
+  do the layout management.
 
   KPrefsDialog provides functions to add subclasses of @ref KPrefsWid via
   KPrefsWidManager. For these widgets the reading, writing and setting to
diff --git a/libtdepim/kregexp3.cpp b/libtdepim/kregexp3.cpp
index bffc491e..d60946c2 100644
--- a/libtdepim/kregexp3.cpp
+++ b/libtdepim/kregexp3.cpp
@@ -64,7 +64,7 @@ TQString KRegExp3::replace( const TQString & str,
     pos = rx.search( replacementStr, pos );
     
 #ifdef DEBUG_KREGEXP3
-    kdDebug() << TQString("  Found match at pos %1").tqarg(pos) << endl;
+    kdDebug() << TQString("  Found match at pos %1").arg(pos) << endl;
 #endif
 
     if ( pos < 0 ) {
@@ -88,13 +88,13 @@ TQString KRegExp3::replace( const TQString & str,
 	  backRefs << rx.cap(i).toInt();
 #ifdef DEBUG_KREGEXP3
 	  kdDebug() << TQString("      Found %1 at position %2 in the capturedTexts.")
-            .tqarg(backRefs.last()).tqarg(i) << endl;
+            .arg(backRefs.last()).arg(i) << endl;
 #endif
 	  break;
 	}
       pos += rx.matchedLength();
 #ifdef DEBUG_KREGEXP3
-      kdDebug() << TQString("  Setting new pos to %1.").tqarg(pos) << endl;
+      kdDebug() << TQString("  Setting new pos to %1.").arg(pos) << endl;
 #endif
       oldpos = pos;
     }
@@ -125,7 +125,7 @@ TQString KRegExp3::replace( const TQString & str,
     pos = search( str, pos );
 
 #ifdef DEBUG_KREGEXP3
-    kdDebug() << TQString("  Found match at pos %1").tqarg(pos) << endl;
+    kdDebug() << TQString("  Found match at pos %1").arg(pos) << endl;
 #endif
 
     if ( pos < 0 ) {
@@ -168,7 +168,7 @@ TQString KRegExp3::replace( const TQString & str,
 	}
     pos += matchedLength();
 #ifdef DEBUG_KREGEXP3
-    kdDebug() << TQString("  Setting new pos to %1.").tqarg(pos) << endl;
+    kdDebug() << TQString("  Setting new pos to %1.").arg(pos) << endl;
 #endif
     oldpos = pos;
 
diff --git a/libtdepim/krsqueezedtextlabel.cpp b/libtdepim/krsqueezedtextlabel.cpp
index 968b56d2..d024cd97 100644
--- a/libtdepim/krsqueezedtextlabel.cpp
+++ b/libtdepim/krsqueezedtextlabel.cpp
@@ -24,30 +24,30 @@
 
 KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   fullText = text;
   squeezeTextToLabel();
 }
 
 KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 }
 
 void KRSqueezedTextLabel::resizeEvent( TQResizeEvent * ) {
   squeezeTextToLabel();
 }
 
-TQSize KRSqueezedTextLabel::tqminimumSizeHint() const
+TQSize KRSqueezedTextLabel::minimumSizeHint() const
 {
-  TQSize sh = TQLabel::tqminimumSizeHint();
+  TQSize sh = TQLabel::minimumSizeHint();
   sh.setWidth(-1);
   return sh;
 }
 
-TQSize KRSqueezedTextLabel::tqsizeHint() const
+TQSize KRSqueezedTextLabel::sizeHint() const
 {
-  return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height());
+  return TQSize(contentsRect().width(), TQLabel::sizeHint().height());
 }
 
 void KRSqueezedTextLabel::setText( const TQString &text ) {
@@ -75,11 +75,11 @@ void KRSqueezedTextLabel::squeezeTextToLabel() {
   }
 }
 
-void KRSqueezedTextLabel::tqsetAlignment( int tqalignment )
+void KRSqueezedTextLabel::setAlignment( int alignment )
 {
   // save fullText and restore it
   TQString tmpFull(fullText);
-  TQLabel::tqsetAlignment(tqalignment);
+  TQLabel::setAlignment(alignment);
   fullText = tmpFull;
 }
 
diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h
index 3e216e72..e48f565d 100644
--- a/libtdepim/krsqueezedtextlabel.h
+++ b/libtdepim/krsqueezedtextlabel.h
@@ -49,12 +49,12 @@ public:
   KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 );
   KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
 
-  virtual TQSize tqminimumSizeHint() const;
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize minimumSizeHint() const;
+  virtual TQSize sizeHint() const;
   /**
    * Overridden for internal reasons; the API remains unaffected.
    */
-  virtual void tqsetAlignment( int );
+  virtual void setAlignment( int );
 
 public slots:
   void setText( const TQString & );
diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp
index cf02d88f..bc8c4a08 100644
--- a/libtdepim/kscoring.cpp
+++ b/libtdepim/kscoring.cpp
@@ -24,10 +24,10 @@
 
 #include <tqfile.h>
 #include <tqdom.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <tqtextview.h>
+#include <textview.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -773,7 +773,7 @@ TQString KScoringRule::getExpireDateString() const
 
 bool KScoringRule::isExpired() const
 {
-  return (expires.isValid() && (expires < TQDate::tqcurrentDate()));
+  return (expires.isValid() && (expires < TQDate::currentDate()));
 }
 
 
@@ -925,7 +925,7 @@ KScoringRule* KScoringManager::addRule(const ScorableArticle& a, TQString group,
     new KScoringExpression("From","CONTAINS",
                             a.from(),"0"));
   if (score) rule->addAction(new ActionSetScore(score));
-  rule->setExpireDate(TQDate::tqcurrentDate().addDays(30));
+  rule->setExpireDate(TQDate::currentDate().addDays(30));
   addRule(rule);
   KScoringEditor *edit = KScoringEditor::createEditor(this);
   edit->setRule(rule);
@@ -1137,7 +1137,7 @@ TQString KScoringManager::findUniqueName() const
 
   while (nr < 99999999) {
     nr++;
-    ret = i18n("rule %1").tqarg(nr);
+    ret = i18n("rule %1").arg(nr);
 
     duplicated=false;
     TQPtrListIterator<KScoringRule> it(allRules);
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index 6e520e98..3f3f5111 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -32,7 +32,7 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
@@ -91,7 +91,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con
   connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) );
 
   // occupy at much width as possible
-  tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed));
+  setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed));
   setFrameStyle(Box | Sunken);
   setLineWidth(1);
 }
@@ -421,7 +421,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)
   groupsBox = new KComboBox( false, groupB, "groupsBox" );
   groupsBox->setDuplicatesEnabled(false);
   groupsBox->insertStringList(manager->getGroups());
-  groupsBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+  groupsBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
   groupL->addWidget( groupsBox, 3, 1 );
 
   // expires
@@ -508,7 +508,7 @@ void RuleEditWidget::slotEditRule(const TQString& ruleName)
   expireEdit->setEnabled(b);
   expireLabel->setEnabled(b);
   if (b)
-    expireEdit->setValue(TQDate::tqcurrentDate().daysTo(rule->getExpireDate()));
+    expireEdit->setValue(TQDate::currentDate().daysTo(rule->getExpireDate()));
   else
     expireEdit->setValue(30);
   if (rule->getLinkMode() == KScoringRule::AND) {
@@ -546,7 +546,7 @@ void RuleEditWidget::updateRule(KScoringRule *rule)
     rule->setGroups(TQStringList::split(";",groups));
   bool b = expireCheck->isChecked();
   if (b)
-    rule->setExpireDate(TQDate::tqcurrentDate().addDays(expireEdit->value()));
+    rule->setExpireDate(TQDate::currentDate().addDays(expireEdit->value()));
   else
     rule->setExpireDate(TQDate());
   actionEditor->updateRule(rule);
@@ -655,7 +655,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
   TQStringList l = m->getGroups();
   filterBox->insertItem(i18n("<all groups>"));
   filterBox->insertStringList(l);
-  filterBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+  filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
   connect(filterBox,TQT_SIGNAL(activated(const TQString&)),
           this,TQT_SLOT(slotGroupFilter(const TQString&)));
   slotGroupFilter(i18n("<all groups>"));
@@ -881,7 +881,7 @@ KScoringEditor::KScoringEditor(KScoringManager* m,
   connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink()));
   connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished()));
   ruleLister->slotRuleSelected(0);
-  resize(550, tqsizeHint().height());
+  resize(550, sizeHint().height());
 }
 
 void KScoringEditor::setDirty()
@@ -918,7 +918,7 @@ void KScoringEditor::slotDoShrink()
 {
   updateGeometry();
   TQApplication::sendPostedEvents();
-  resize(width(),tqsizeHint().height());
+  resize(width(),sizeHint().height());
 }
 
 void KScoringEditor::slotApply()
@@ -996,7 +996,7 @@ void KScoringEditorWidgetDialog::slotDoShrink()
 {
   updateGeometry();
   TQApplication::sendPostedEvents();
-  resize(width(),tqsizeHint().height());
+  resize(width(),sizeHint().height());
 }
 
 //============================================================================
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index b611e126..3113548b 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -13,7 +13,7 @@
 #include "ksubscription.h"
 #include "kaccount.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -32,7 +32,7 @@
 
 KGroupInfo::KGroupInfo(const TQString &name, const TQString &description,
     bool newGroup, bool subscribed,
-    tqStatus status, TQString path)
+    Status status, TQString path)
   : name(name), description(description),
     newGroup(newGroup), subscribed(subscribed),
     status(status), path(path)
@@ -133,7 +133,7 @@ void GroupItem::setVisible( bool b )
         TQListViewItem::setVisible(b);
       else
       {
-        // leave it visible so that tqchildren remain visible
+        // leave it visible so that children remain visible
         setOpen(true);
         setEnabled(false);
       }
@@ -271,7 +271,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
   else
     groupView->header()->setStretchEnabled(true, 0);
 
-  // tqlayout
+  // layout
   TQGridLayout *topL = new TQGridLayout(page,4,1,0, KDialog::spacingHint());
   TQHBoxLayout *filterL = new TQHBoxLayout(KDialog::spacingHint());
   TQVBoxLayout *arrL = new TQVBoxLayout(KDialog::spacingHint());
@@ -775,7 +775,7 @@ void KSubscription::slotUpdateStatusLabel()
                 activeItemCount());
   else
     text = i18n("%1: (1 matching)", "%1: (%n matching)", activeItemCount())
-           .tqarg(account()->name());
+           .arg(account()->name());
 
   leftLabel->setText(text);
 }
diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h
index c819701d..af8fd37f 100644
--- a/libtdepim/ksubscription.h
+++ b/libtdepim/ksubscription.h
@@ -45,7 +45,7 @@ class KAccount;
 class KDE_EXPORT KGroupInfo
 {
   public:
-    enum tqStatus {
+    enum Status {
       unknown,
       readOnly,
       postingAllowed,
@@ -54,11 +54,11 @@ class KDE_EXPORT KGroupInfo
 
     KGroupInfo( const TQString &name, const TQString &description = TQString(),
         bool newGroup = false, bool subscribed = false,
-        tqStatus status = unknown, TQString path = TQString() );
+        Status status = unknown, TQString path = TQString() );
 
     TQString name, description;
     bool newGroup, subscribed;
-    tqStatus status;
+    Status status;
     TQString path;
 
     bool operator== (const KGroupInfo &gi2);
diff --git a/libtdepim/kvcarddrag.cpp b/libtdepim/kvcarddrag.cpp
index 054a424e..d8e83d89 100644
--- a/libtdepim/kvcarddrag.cpp
+++ b/libtdepim/kvcarddrag.cpp
@@ -68,7 +68,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQByteArray &content )
   if ( !canDecode( e ) ) {
     return false;
   }
-  content = e->tqencodedData( vcard_mime_string );
+  content = e->encodedData( vcard_mime_string );
   return true;
 }
 #else
@@ -77,7 +77,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQString &content )
   if ( !canDecode( e ) ) {
     return false;
   }
-  content = TQString::fromUtf8( e->tqencodedData( vcard_mime_string ) );
+  content = TQString::fromUtf8( e->encodedData( vcard_mime_string ) );
   return true;
 }
 #endif
@@ -88,9 +88,9 @@ bool KVCardDrag::decode( TQMimeSource *e, KABC::Addressee::List& addressees )
     return false;
   }
 #if defined(KABC_VCARD_ENCODING_FIX)
-  addressees = KABC::VCardConverter().parseVCardsRaw( e->tqencodedData( vcard_mime_string ).data() );
+  addressees = KABC::VCardConverter().parseVCardsRaw( e->encodedData( vcard_mime_string ).data() );
 #else
-  addressees = KABC::VCardConverter().parseVCards( e->tqencodedData( vcard_mime_string ) );
+  addressees = KABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) );
 #endif
   return true;
 }
diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp
index 458292bc..ff4dbb1c 100644
--- a/libtdepim/kwidgetlister.cpp
+++ b/libtdepim/kwidgetlister.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 
 #include <assert.h>
@@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w)
 
 void KWidgetLister::removeLastWidget()
 {
-  // The tqlayout will take care that the
+  // The layout will take care that the
   // widget is removed from screen, too.
   mWidgetList.removeLast();
   enableControls();
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index 6bfeec15..ebe9c141 100644
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@@ -74,19 +74,19 @@ protected slots:
   /** Called whenever the user clicks on the 'more' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with adding the widgets
-      to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling
+      to the layout (through @ref addWidgetAtEnd) and enabling/disabling
       the control buttons. */
   virtual void slotMore();
   /** Called whenever the user clicks on the 'fewer' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with removing the widgets
-      from the tqlayout (through @ref removeLastWidget) and
+      from the layout (through @ref removeLastWidget) and
       enabling/disabling the control buttons. */
   virtual void slotFewer();
   /** Called whenever the user clicks on the 'clear' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with removing all but
-      @ref mMinWidgets widgets from the tqlayout and enabling/disabling
+      @ref mMinWidgets widgets from the layout and enabling/disabling
       the control buttons. */
   virtual void slotClear();
 
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index f8497f08..0a1b44b8 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -26,7 +26,7 @@
 #include <tqimage.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqurl.h>
 
 #include <kabc/ldapurl.h>
@@ -49,7 +49,7 @@ static KStaticDeleter<KConfig> configDeleter;
 
 TQString LdapObject::toString() const
 {
-  TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).tqarg( dn );
+  TQString result = TQString::fromLatin1( "\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 ) {
@@ -278,53 +278,53 @@ void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool ac
 {
   TQString prefix;
   if ( active ) prefix = "Selected";
-  TQString host =  config->readEntry( prefix + TQString( "Host%1" ).tqarg( j ), "" ).stripWhiteSpace();
+  TQString host =  config->readEntry( prefix + TQString( "Host%1" ).arg( j ), "" ).stripWhiteSpace();
   if ( !host.isEmpty() )
     server.setHost( host );
 
-  int port = config->readNumEntry( prefix + TQString( "Port%1" ).tqarg( j ), 389 );
+  int port = config->readNumEntry( prefix + TQString( "Port%1" ).arg( j ), 389 );
   server.setPort( port );
 
-  TQString base = config->readEntry( prefix + TQString( "Base%1" ).tqarg( j ), "" ).stripWhiteSpace();
+  TQString base = config->readEntry( prefix + TQString( "Base%1" ).arg( j ), "" ).stripWhiteSpace();
   if ( !base.isEmpty() )
     server.setBaseDN( base );
 
-  TQString user = config->readEntry( prefix + TQString( "User%1" ).tqarg( j ) ).stripWhiteSpace();
+  TQString user = config->readEntry( prefix + TQString( "User%1" ).arg( j ) ).stripWhiteSpace();
   if ( !user.isEmpty() )
     server.setUser( user );
 
-  TQString bindDN = config->readEntry( prefix + TQString( "Bind%1" ).tqarg( j ) ).stripWhiteSpace();
+  TQString bindDN = config->readEntry( prefix + TQString( "Bind%1" ).arg( j ) ).stripWhiteSpace();
   if ( !bindDN.isEmpty() )
     server.setBindDN( bindDN );
 
-  TQString pwdBindDN = config->readEntry( prefix + TQString( "PwdBind%1" ).tqarg( j ) );
+  TQString pwdBindDN = config->readEntry( prefix + TQString( "PwdBind%1" ).arg( j ) );
   if ( !pwdBindDN.isEmpty() )
     server.setPwdBindDN( pwdBindDN );
 
-  server.setTimeLimit( config->readNumEntry( prefix + TQString( "TimeLimit%1" ).tqarg( j ) ) );
-  server.setSizeLimit( config->readNumEntry( prefix + TQString( "SizeLimit%1" ).tqarg( j ) ) );
-  server.setVersion( config->readNumEntry( prefix + TQString( "Version%1" ).tqarg( j ), 3 ) );
-  server.setSecurity( config->readNumEntry( prefix + TQString( "Security%1" ).tqarg( j ) ) );
-  server.setAuth( config->readNumEntry( prefix + TQString( "Auth%1" ).tqarg( j ) ) );
-  server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).tqarg( j ) ) );
+  server.setTimeLimit( config->readNumEntry( prefix + TQString( "TimeLimit%1" ).arg( j ) ) );
+  server.setSizeLimit( config->readNumEntry( prefix + TQString( "SizeLimit%1" ).arg( j ) ) );
+  server.setVersion( config->readNumEntry( prefix + TQString( "Version%1" ).arg( j ), 3 ) );
+  server.setSecurity( config->readNumEntry( prefix + TQString( "Security%1" ).arg( j ) ) );
+  server.setAuth( config->readNumEntry( prefix + TQString( "Auth%1" ).arg( j ) ) );
+  server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).arg( j ) ) );
 }
 
 void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j, bool active )
 {
   TQString prefix;
   if ( active ) prefix = "Selected";
-  config->writeEntry( prefix + TQString( "Host%1" ).tqarg( j ), server.host() );
-  config->writeEntry( prefix + TQString( "Port%1" ).tqarg( j ), server.port() );
-  config->writeEntry( prefix + TQString( "Base%1" ).tqarg( j ), server.baseDN() );
-  config->writeEntry( prefix + TQString( "User%1" ).tqarg( j ), server.user() );
-  config->writeEntry( prefix + TQString( "Bind%1" ).tqarg( j ), server.bindDN() );
-  config->writeEntry( prefix + TQString( "PwdBind%1" ).tqarg( j ), server.pwdBindDN() );
-  config->writeEntry( prefix + TQString( "TimeLimit%1" ).tqarg( j ), server.timeLimit() );
-  config->writeEntry( prefix + TQString( "SizeLimit%1" ).tqarg( j ), server.sizeLimit() );
-  config->writeEntry( prefix + TQString( "Version%1" ).tqarg( j ), server.version() );
-  config->writeEntry( prefix + TQString( "Security%1" ).tqarg( j ), server.security() );
-  config->writeEntry( prefix + TQString( "Auth%1" ).tqarg( j ), server.auth() );
-  config->writeEntry( prefix + TQString( "Mech%1" ).tqarg( j ), server.mech() );
+  config->writeEntry( prefix + TQString( "Host%1" ).arg( j ), server.host() );
+  config->writeEntry( prefix + TQString( "Port%1" ).arg( j ), server.port() );
+  config->writeEntry( prefix + TQString( "Base%1" ).arg( j ), server.baseDN() );
+  config->writeEntry( prefix + TQString( "User%1" ).arg( j ), server.user() );
+  config->writeEntry( prefix + TQString( "Bind%1" ).arg( j ), server.bindDN() );
+  config->writeEntry( prefix + TQString( "PwdBind%1" ).arg( j ), server.pwdBindDN() );
+  config->writeEntry( prefix + TQString( "TimeLimit%1" ).arg( j ), server.timeLimit() );
+  config->writeEntry( prefix + TQString( "SizeLimit%1" ).arg( j ), server.sizeLimit() );
+  config->writeEntry( prefix + TQString( "Version%1" ).arg( j ), server.version() );
+  config->writeEntry( prefix + TQString( "Security%1" ).arg( j ), server.security() );
+  config->writeEntry( prefix + TQString( "Auth%1" ).arg( j ), server.auth() );
+  config->writeEntry( prefix + TQString( "Mech%1" ).arg( j ), server.mech() );
 }
 
 KConfig* LdapSearch::config()
@@ -351,7 +351,7 @@ LdapSearch::LdapSearch()
 
 void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int clientNumber )
 {
-  const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).tqarg( clientNumber ), -1 );
+  const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).arg( clientNumber ), -1 );
   if ( completionWeight != -1 )
     client->setCompletionWeight( completionWeight );
 }
@@ -442,7 +442,7 @@ void LdapSearch::startSearch( const TQString& txt )
    * person entries without an email address to show up, while still not showing things
    * like structural entries in the ldap tree. */
   TQString filter = TQString( "&(|(objectclass=person)(objectclass=groupOfNames)(mail=*))(|(cn=%1*)(mail=%2*)(mail=*@%3*)(givenName=%4*)(sn=%5*))" )
-      .tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText );
+      .arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText );
 
   TQValueList< LdapClient* >::Iterator it;
   for ( it = mClients.begin(); it != mClients.end(); ++it ) {
@@ -590,7 +590,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
       ret.append( mail );
     } else {
       //kdDebug(5300) << "LdapSearch::makeSearchData() name: \"" << name << "\"  mail: \"" << mail << "\"" << endl;
-      ret.append( TQString( "%1 <%2>" ).tqarg( name ).tqarg( mail ) );
+      ret.append( TQString( "%1 <%2>" ).arg( name ).arg( mail ) );
     }
 
     LdapResult sr;
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index ed1aa293..a56057a5 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -27,7 +27,7 @@
 #include <tqgroupbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 
@@ -137,7 +137,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
   groupBox->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -160,10 +160,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
 
   TQSize buttonSize;
   mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox );
-  buttonSize = mSearchButton->tqsizeHint();
+  buttonSize = mSearchButton->sizeHint();
   mSearchButton->setText( i18n( "Search" ) );
-  if ( buttonSize.width() < mSearchButton->tqsizeHint().width() )
-    buttonSize = mSearchButton->tqsizeHint();
+  if ( buttonSize.width() < mSearchButton->sizeHint().width() )
+    buttonSize = mSearchButton->sizeHint();
   mSearchButton->setFixedWidth( buttonSize.width() );
 
   mSearchButton->setDefault( true );
@@ -186,7 +186,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
   mResultListView->setShowSortIndicator( true );
   topLayout->addWidget( mResultListView );
 
-  resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) );
+  resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) );
 
   setButtonText( User1, i18n( "Unselect All" ) );
   setButtonText( User2, i18n( "Select All" ) );
@@ -238,23 +238,23 @@ void LDAPSearchDialog::restoreSettings()
     for ( int j = 0; j < mNumHosts; ++j ) {
         KPIM::LdapServer ldapServer;
 
-      TQString host = config->readEntry( TQString( "SelectedHost%1" ).tqarg( j ), "" );
+      TQString host = config->readEntry( TQString( "SelectedHost%1" ).arg( j ), "" );
       if ( !host.isEmpty() )
           ldapServer.setHost( host );
 
-      int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).tqarg( j ) );
+      int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).arg( j ) );
       if ( port )
         ldapServer.setPort( port );
 
-      TQString base = config->readEntry( TQString( "SelectedBase%1" ).tqarg( j ), "" );
+      TQString base = config->readEntry( TQString( "SelectedBase%1" ).arg( j ), "" );
       if ( !base.isEmpty() )
         ldapServer.setBaseDN( base );
 
-      TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).tqarg( j ), "" );
+      TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).arg( j ), "" );
       if ( !bindDN.isEmpty() )
         ldapServer.setBindDN( bindDN );
 
-      TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).tqarg( j ), "" );
+      TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).arg( j ), "" );
       if ( !pwdBindDN.isEmpty() )
         ldapServer.setPwdBindDN( pwdBindDN );
 
@@ -352,15 +352,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
 
   if ( attr == i18n( "Name" ) ) {
     result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)";
-    result = result.tqarg( query ).tqarg( query );
+    result = result.arg( query ).arg( query );
   } else {
     result += (startsWith ? "%1=%2*" : "%1=*%2*");
     if ( attr == i18n( "Email" ) ) {
-      result = result.tqarg( "mail" ).tqarg( query );
+      result = result.arg( "mail" ).arg( query );
     } else if ( attr == i18n( "Home Number" ) ) {
-      result = result.tqarg( "homePhone" ).tqarg( query );
+      result = result.arg( "homePhone" ).arg( query );
     } else if ( attr == i18n( "Work Number" ) ) {
-      result = result.tqarg( "telephoneNumber" ).tqarg( query );
+      result = result.arg( "telephoneNumber" ).arg( query );
     } else {
       // Error?
       result = TQString();
diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp
index 399c5d3b..be2bd1af 100644
--- a/libtdepim/linklocator.cpp
+++ b/libtdepim/linklocator.cpp
@@ -28,7 +28,7 @@
 #include <kmdcodec.h>
 #include <kdebug.h>
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 
@@ -176,7 +176,7 @@ TQString LinkLocator::getEmailAddress()
 
     // determine the local part of the email address
     int start = mPos - 1;
-    while ( start >= 0 && mText[start].tqunicode() < 128 &&
+    while ( start >= 0 && mText[start].unicode() < 128 &&
             ( mText[start].isLetterOrNumber() ||
               mText[start] == '@' || // allow @ to find invalid email addresses
               allowedSpecialChars.find( mText[start] ) != -1 ) ) {
@@ -361,8 +361,8 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath )
 
   TQByteArray ba = pngFile.readAll();
   pngFile.close();
-  return TQString::tqfromLatin1("data:image/png;base64,%1")
-         .tqarg( KCodecs::base64Encode( ba ).data() );
+  return TQString::fromLatin1("data:image/png;base64,%1")
+         .arg( KCodecs::base64Encode( ba ).data() );
 }
 
 
@@ -403,14 +403,14 @@ TQString LinkLocator::getEmoticon()
 #if KDE_IS_VERSION( 3, 3, 91 )
     const TQString iconPath = locate( "emoticons",
                                      EmotIcons::theme() +
-                                     TQString::tqfromLatin1( "/" ) +
-                                     imageName + TQString::tqfromLatin1(".png") );
+                                     TQString::fromLatin1( "/" ) +
+                                     imageName + TQString::fromLatin1(".png") );
 #else
     const TQString iconPath = locate( "data",
-                                     TQString::tqfromLatin1( "kopete/pics/emoticons/" )+
+                                     TQString::fromLatin1( "kopete/pics/emoticons/" )+
                                      EmotIcons::theme() +
-                                     TQString::tqfromLatin1( "/" ) +
-                                     imageName + TQString::tqfromLatin1(".png") );
+                                     TQString::fromLatin1( "/" ) +
+                                     imageName + TQString::fromLatin1(".png") );
 #endif
 
     const TQString dataUrl = pngToDataUrl( iconPath );
@@ -422,7 +422,7 @@ TQString LinkLocator::getEmoticon()
       // for copy & paste) representing the smiley
       htmlRep = TQString("<img class=\"pimsmileyimg\" src=\"%1\" "
                         "alt=\"%2\" title=\"%3\" width=\"16\" height=\"16\"/>")
-                .tqarg( dataUrl,
+                .arg( dataUrl,
                       TQStyleSheet::escape( smiley ),
                       TQStyleSheet::escape( smiley ) );
     }
@@ -445,7 +445,7 @@ TQString LinkLocator::highlightedText()
   if ( ch != '/' && ch != '*' && ch != '_' )
     return TQString();
 
-  TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").tqarg( ch ).tqarg( ch ) );
+  TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").arg( ch ).arg( ch ) );
   if ( re.search( mText, mPos ) == mPos ) {
     uint length = re.matchedLength();
     // there must be a whitespace after the closing formating symbol
diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp
index a9e2e9fa..91cd1dca 100644
--- a/libtdepim/maillistdrag.cpp
+++ b/libtdepim/maillistdrag.cpp
@@ -150,7 +150,7 @@ TQDataStream& operator>> ( TQDataStream &s, MailList &mailList )
 
 bool MailListDrag::decode( TQDropEvent* e, MailList& mailList )
 {
-    TQByteArray payload = e->tqencodedData( MailListDrag::format() );
+    TQByteArray payload = e->encodedData( MailListDrag::format() );
     TQDataStream buffer( payload, IO_ReadOnly );
     if ( payload.size() ) {
 	e->accept();
@@ -221,16 +221,16 @@ bool MailListDrag::provides(const char *mimeType) const
     return TQStoredDrag::provides(mimeType);
 }
 
-TQByteArray MailListDrag::tqencodedData(const char *mimeType) const
+TQByteArray MailListDrag::encodedData(const char *mimeType) const
 {
     if (TQCString(mimeType) != "message/rfc822") {
-        return TQStoredDrag::tqencodedData(mimeType);
+        return TQStoredDrag::encodedData(mimeType);
     }
 
     TQByteArray rc; 
     if (_src) {
         MailList ml;
-        TQByteArray enc = TQStoredDrag::tqencodedData(format());
+        TQByteArray enc = TQStoredDrag::encodedData(format());
         decode(enc, ml);
 
         KProgressDialog *dlg = new KProgressDialog(0, 0, TQString(), i18n("Retrieving and storing messages..."), true);
diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h
index 9ec1cba2..130ec29f 100644
--- a/libtdepim/maillistdrag.h
+++ b/libtdepim/maillistdrag.h
@@ -103,7 +103,7 @@ public:
 
     bool provides(const char *mimeType) const;
 
-    TQByteArray tqencodedData(const char *) const;
+    TQByteArray encodedData(const char *) const;
 
     /* Reset the list of mail summaries */
     void setMailList( MailList );
diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp
index ac05d84f..338a6c42 100644
--- a/libtdepim/overlaywidget.cpp
+++ b/libtdepim/overlaywidget.cpp
@@ -51,9 +51,9 @@ void OverlayWidget::reposition()
   p.setX( mAlignWidget->width() - width() );
   p.setY( -height() );
   // Position in the toplevelwidget's coordinates
-  TQPoint pTopLevel = mAlignWidget->mapTo( tqtopLevelWidget(), p );
+  TQPoint pTopLevel = mAlignWidget->mapTo( topLevelWidget(), p );
   // Position in the widget's parentWidget coordinates
-  TQPoint pParent = parentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel );
+  TQPoint pParent = parentWidget()->mapFrom( topLevelWidget(), pTopLevel );
   // Move 'this' to that position.
   move( pParent );
 }
diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h
index 9e611fb9..bb4a89de 100644
--- a/libtdepim/overlaywidget.h
+++ b/libtdepim/overlaywidget.h
@@ -35,11 +35,11 @@
 namespace KPIM {
 
 /**
- * This is a widget that can align itself with another one, without using a tqlayout,
+ * This is a widget that can align itself with another one, without using a layout,
  * so that it can actually be on top of other widgets.
- * Currently the only supported type of tqalignment is "right aligned, on top of the other widget".
+ * Currently the only supported type of alignment is "right aligned, on top of the other widget".
  *
- * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame)
+ * OverlayWidget inherits TQHBox for convenience purposes (layout, and frame)
  */
 class OverlayWidget : public TQHBox
 {
diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp
index bd5b594c..81baa373 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqprogressbar.h>
 #include <tqtimer.h>
 #include <tqheader.h>
@@ -84,14 +84,14 @@ void TransactionItemView::resizeContents( int w, int h )
   // (handling of TQEvent::LayoutHint in TQScrollView calls this method)
   //kdDebug(5300) << k_funcinfo << w << "," << h << endl;
   TQScrollView::resizeContents( w, h );
-  // Tell the tqlayout in the parent (progressdialog) that our size changed
+  // Tell the layout in the parent (progressdialog) that our size changed
   updateGeometry();
   // Resize the parent (progressdialog) - this works but resize horizontally too often
   //parentWidget()->adjustSize();
 
   TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted );
   TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
-  TQSize sz = parentWidget()->tqsizeHint();
+  TQSize sz = parentWidget()->sizeHint();
   int currentWidth = parentWidget()->width();
   // Don't resize to sz.width() every time when it only reduces a little bit
   if ( currentWidth < sz.width() || currentWidth > sz.width() + 100 )
@@ -99,19 +99,19 @@ void TransactionItemView::resizeContents( int w, int h )
   parentWidget()->resize( currentWidth, sz.height() );
 }
 
-TQSize TransactionItemView::tqsizeHint() const
+TQSize TransactionItemView::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
-TQSize TransactionItemView::tqminimumSizeHint() const
+TQSize TransactionItemView::minimumSizeHint() const
 {
   int f = 2 * frameWidth();
   // Make room for a vertical scrollbar in all cases, to avoid a horizontal one
-  int vsbExt = verticalScrollBar()->tqsizeHint().width();
-  int minw = tqtopLevelWidget()->width() / 3;
-  int maxh = tqtopLevelWidget()->height() / 2;
-  TQSize sz( mBigBox->tqminimumSizeHint() );
+  int vsbExt = verticalScrollBar()->sizeHint().width();
+  int minw = topLevelWidget()->width() / 3;
+  int maxh = topLevelWidget()->height() / 2;
+  TQSize sz( mBigBox->minimumSizeHint() );
   sz.setWidth( TQMAX( sz.width(), minw ) + f + vsbExt );
   sz.setHeight( TQMIN( sz.height(), maxh ) + f );
   return sz;
@@ -146,7 +146,7 @@ TransactionItem::TransactionItem( TQWidget* parent,
 {
   setSpacing( 2 );
   setMargin( 2 );
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 
   mFrame = new TQFrame( this );
   mFrame->setFrameShape( TQFrame::HLine );
@@ -160,8 +160,8 @@ TransactionItem::TransactionItem( TQWidget* parent,
   mItemLabel = new TQLabel( item->label(), h );
   // always interpret the label text as RichText, but disable word wrapping
   mItemLabel->setTextFormat( TQt::RichText );
-  mItemLabel->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
-  h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mItemLabel->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
+  h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 
   mProgress = new TQProgressBar( 100, h );
   mProgress->setProgress( item->progress() );
@@ -175,17 +175,17 @@ TransactionItem::TransactionItem( TQWidget* parent,
 
   h = new TQHBox( this );
   h->setSpacing( 5 );
-  h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   mSSLLabel = new SSLLabel( h );
-  mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  mItemtqStatus = new TQLabel( item->status(), h );
+  mSSLLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mItemStatus = new TQLabel( item->status(), h );
   // always interpret the status text as RichText, but disable word wrapping
-  mItemtqStatus->setTextFormat( TQt::RichText );
-  mItemtqStatus->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
-  // richtext leads to tqsizeHint acting as if wrapping was enabled though,
+  mItemStatus->setTextFormat( TQt::RichText );
+  mItemStatus->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine );
+  // richtext leads to sizeHint acting as if wrapping was enabled though,
   // so make sure we only ever have the height of one line.
-  mItemtqStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
-  mItemtqStatus->setFixedHeight( mItemLabel->tqsizeHint().height() );
+  mItemStatus->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  mItemStatus->setFixedHeight( mItemLabel->sizeHint().height() );
   setCrypto( item->usesCrypto() );
   if( first ) hideHLine();
 }
@@ -209,9 +209,9 @@ void TransactionItem::setLabel( const TQString& label )
   mItemLabel->setText( label );
 }
 
-void TransactionItem::setqStatus( const TQString& status )
+void TransactionItem::seStatus( const TQString& status )
 {
-  mItemtqStatus->setText( status );
+  mItemStatus->setText( status );
 }
 
 void TransactionItem::setCrypto( bool on )
@@ -258,7 +258,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
     TQVBox* rightBox = new TQVBox( this );
     TQToolButton* pbClose = new TQToolButton( rightBox );
     pbClose->setAutoRaise(true);
-    pbClose->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     pbClose->setFixedSize( 16, 16 );
     pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) );
     TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) );
@@ -278,8 +278,8 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
               this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) );
     connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ),
               this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) );
-    connect ( pm, TQT_SIGNAL( progressItemtqStatus( KPIM::ProgressItem*, const TQString& ) ),
-              this, TQT_SLOT( slotTransactiontqStatus( KPIM::ProgressItem*, const TQString& ) ) );
+    connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ),
+              this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) );
     connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ),
               this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) );
     connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
@@ -353,12 +353,12 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item,
    }
 }
 
-void ProgressDialog::slotTransactiontqStatus( ProgressItem *item,
+void ProgressDialog::slotTransactionStatus( ProgressItem *item,
                                             const TQString& status )
 {
    if ( mTransactionsToListviewItems.contains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
-     ti->setqStatus( status );
+     ti->seStatus( status );
    }
 }
 
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index b2511624..e144e34e 100644
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@@ -63,8 +63,8 @@ public:
   TransactionItem* addTransactionItem( ProgressItem *item, bool first );
 
 
-  TQSize tqsizeHint() const;
-  TQSize tqminimumSizeHint() const;
+  TQSize sizeHint() const;
+  TQSize minimumSizeHint() const;
 public slots:
   void slotLayoutFirstItem();
 
@@ -90,7 +90,7 @@ public:
 
   void setProgress( int progress );
   void setLabel( const TQString& );
-  void setqStatus( const TQString& );
+  void seStatus( const TQString& );
   void setCrypto( bool );
   void setTotalSteps( int totalSteps );
 
@@ -109,7 +109,7 @@ protected:
   TQProgressBar* mProgress;
   TQPushButton*  mCancelButton;
   TQLabel*       mItemLabel;
-  TQLabel*       mItemtqStatus;
+  TQLabel*       mItemStatus;
   TQFrame*       mFrame;
   SSLLabel*     mSSLLabel;
   ProgressItem* mItem;
@@ -133,7 +133,7 @@ void slotTransactionAdded( KPIM::ProgressItem *item );
   void slotTransactionCompleted( KPIM::ProgressItem *item );
   void slotTransactionCanceled( KPIM::ProgressItem *item );
   void slotTransactionProgress( KPIM::ProgressItem *item, unsigned int progress );
-  void slotTransactiontqStatus( KPIM::ProgressItem *item, const TQString& );
+  void slotTransactionStatus( KPIM::ProgressItem *item, const TQString& );
   void slotTransactionLabel( KPIM::ProgressItem *item, const TQString& );
   void slotTransactionUsesCrypto( KPIM::ProgressItem *item, bool );
   void slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool );
diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp
index 544b62ce..0c2c485b 100644
--- a/libtdepim/progressmanager.cpp
+++ b/libtdepim/progressmanager.cpp
@@ -38,7 +38,7 @@ ProgressItem::ProgressItem(
        ProgressItem* parent, const TQString& id,
        const TQString& label, const TQString& status, bool canBeCanceled,
        bool usesCrypto )
-       :mId( id ), mLabel( label ), mtqStatus( status ), mParent( parent ),
+       :mId( id ), mLabel( label ), mStatus( status ), mParent( parent ),
         mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ),
         mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ),
         mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false )
@@ -84,7 +84,7 @@ void ProgressItem::cancel()
    if ( mCanceled || !mCanBeCanceled ) return;
    kdDebug(5300) << "ProgressItem::cancel() - " << label() << endl;
    mCanceled = true;
-   // Cancel all tqchildren.
+   // Cancel all children.
    TQValueList<ProgressItem*> kids = mChildren.keys();
    TQValueList<ProgressItem*>::Iterator it( kids.begin() );
    TQValueList<ProgressItem*>::Iterator end( kids.end() );
@@ -93,7 +93,7 @@ void ProgressItem::cancel()
      if ( kid->canBeCanceled() )
        kid->cancel();
    }
-   setqStatus( i18n( "Aborting..." ) );
+   seStatus( i18n( "Aborting..." ) );
    emit progressItemCanceled( this );
 }
 
@@ -111,10 +111,10 @@ void ProgressItem::setLabel( const TQString& v )
   emit progressItemLabel( this, mLabel );
 }
 
-void ProgressItem::setqStatus( const TQString& v )
+void ProgressItem::seStatus( const TQString& v )
 {
-  mtqStatus = v;
-  emit progressItemtqStatus( this, mtqStatus );
+  mStatus = v;
+  emit progressItemStatus( this, mStatus );
 }
 
 void ProgressItem::setUsesCrypto( bool v )
@@ -170,8 +170,8 @@ ProgressItem* ProgressManager::createProgressItemImpl(
                this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) );
      connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ),
                this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) );
-     connect ( t, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ),
-               this, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ) );
+     connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ),
+               this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) );
      connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ),
                this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) );
      connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index 2e4f4ee2..ced5449c 100644
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@@ -70,13 +70,13 @@ class KDE_EXPORT ProgressItem : public TQObject
     /**
      * @return The string to be used for showing this item's current status.
      */
-    const TQString& status() const { return mtqStatus; }
+    const TQString& status() const { return mStatus; }
     /**
      * Set the string to be used for showing this item's current status.
      * @p v will be interpreted as rich text, so it might have to be escaped.
      * @param v The status string.
      */
-    void setqStatus( const TQString& v );
+    void seStatus( const TQString& v );
 
     /**
      * @return Whether this item can be cancelled.
@@ -132,7 +132,7 @@ class KDE_EXPORT ProgressItem : public TQObject
      * Reset the progress value of this item to 0 and the status string to
      * the empty string.
      */
-    void reset() { setProgress( 0 ); setqStatus( TQString() ); mCompleted = 0; }
+    void reset() { setProgress( 0 ); seStatus( TQString() ); mCompleted = 0; }
 
     void cancel();
 
@@ -189,7 +189,7 @@ signals:
      * @param  The updated item.
      * @param  The new message.
      */
-    void progressItemtqStatus( KPIM::ProgressItem*, const TQString& );
+    void progressItemStatus( KPIM::ProgressItem*, const TQString& );
     /**
      * Emitted when the label of an item changed. Should be used by
      * progress dialogs to update the label of an item.
@@ -229,7 +229,7 @@ signals:
   private:
     TQString mId;
     TQString mLabel;
-    TQString mtqStatus;
+    TQString mStatus;
     ProgressItem* mParent;
     bool mCanBeCanceled;
     unsigned int mProgress;
@@ -310,8 +310,8 @@ class KDE_EXPORT ProgressManager : public TQObject
      *               interpreted as rich text, so it might have to be escaped.
      * @param canBeCanceled can the user cancel this operation?
      * @param usesCrypto does the operation use secure transports (SSL)
-     * Cancelling the parent will cancel the tqchildren as well (if they can be
-     * cancelled) and ongoing tqchildren prevent parents from finishing.
+     * Cancelling the parent will cancel the children as well (if they can be
+     * cancelled) and ongoing children prevent parents from finishing.
      * @return The ProgressItem representing the operation.
      */
      static ProgressItem * createProgressItem( ProgressItem* parent,
@@ -360,7 +360,7 @@ class KDE_EXPORT ProgressManager : public TQObject
      * @return the only top level progressitem when there's only one.
      * Returns 0 if there is no item, or more than one top level item.
      * Since this is used to calculate the overall progress, it will also return
-     * 0 if there is an item which uses a busy indicator, since that will tqinvalidate
+     * 0 if there is an item which uses a busy indicator, since that will invalidate
      * the overall progress.
      */
     ProgressItem* singleItem() const;
@@ -382,8 +382,8 @@ class KDE_EXPORT ProgressManager : public TQObject
     void progressItemCompleted( KPIM::ProgressItem* );
     /** @see ProgressItem::progressItemCanceled() */
     void progressItemCanceled( KPIM::ProgressItem* );
-    /** @see ProgressItem::progressItemtqStatus() */
-    void progressItemtqStatus( KPIM::ProgressItem*, const TQString& );
+    /** @see ProgressItem::progressItemStatus() */
+    void progressItemStatus( KPIM::ProgressItem*, const TQString& );
     /** @see ProgressItem::progressItemLabel() */
     void progressItemLabel( KPIM::ProgressItem*, const TQString& );
     /** @see ProgressItem::progressItemUsesCrypto() */
diff --git a/libtdepim/qutf7codec.cpp b/libtdepim/qutf7codec.cpp
index dc8ef2a2..d390e649 100644
--- a/libtdepim/qutf7codec.cpp
+++ b/libtdepim/qutf7codec.cpp
@@ -18,7 +18,7 @@
   with any version of TQt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
-  This exception does not however tqinvalidate any other reasons why the
+  This exception does not however invalidate any other reasons why the
   executable file might be covered by the GNU General Public License.
 */
 
@@ -137,10 +137,10 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const
 }
 
 class TQUtf7Decoder : public TQTextDecoder {
-  // the storage for our tqunicode char until it's finished
+  // the storage for our unicode char until it's finished
   ushort uc;
   // the state of the base64 decoding
-  // can be 0 (just finished three tqunicode chars)
+  // can be 0 (just finished three unicode chars)
   //        1 (have the upper  6 bits of uc already)
   //        2 (have the upper 12 bits of uc already)
   //        3 (have the upper  2 bits of uc already)
@@ -148,7 +148,7 @@ class TQUtf7Decoder : public TQTextDecoder {
   //        7 (have the upper 10 bits of uc already)
   //   =>   n (have the upper (n * 6) % 16 bits of uc already)
   // "stepNo" cycles through all it's values every three
-  // tqunicode chars.
+  // unicode chars.
   char stepNo;
   // remembers if we are in shifted-sequence mode
   bool shifted;
@@ -462,7 +462,7 @@ public:
 #endif
 
     // source and destination cursor
-    const TQChar * s = uc.tqunicode();
+    const TQChar * s = uc.unicode();
     TQCString::Iterator t = result.data();
 
     if ( uc.isNull() ) {
@@ -473,7 +473,7 @@ public:
       // normal operation:
       for (int i = 0 ; i < len_in_out ;
 	   i++/*, checkOutBuf(result,maxreslen,t,i,len_in_out,5)*/ ) {
-	ushort ch = s[i].tqunicode();
+	ushort ch = s[i].unicode();
 	
 	//
 	// first, we check whether we might get around encoding:
diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h
index 4057d276..a95acea6 100644
--- a/libtdepim/qutf7codec.h
+++ b/libtdepim/qutf7codec.h
@@ -18,14 +18,14 @@
   with any version of TQt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
-  This exception does not however tqinvalidate any other reasons why the
+  This exception does not however invalidate any other reasons why the
   executable file might be covered by the GNU General Public License.
 */
 
 #ifndef TQUTF7CODEC_H
 #define TQUTF7CODEC_H
 
-#include "tqtextcodec.h"
+#include "textcodec.h"
 
 #include <tdepimmacros.h>
 
diff --git a/libtdepim/qutf7codecplugin.cpp b/libtdepim/qutf7codecplugin.cpp
index 49eb92c8..2099d931 100644
--- a/libtdepim/qutf7codecplugin.cpp
+++ b/libtdepim/qutf7codecplugin.cpp
@@ -18,13 +18,13 @@
   with any version of TQt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
-  This exception does not however tqinvalidate any other reasons why the
+  This exception does not however invalidate any other reasons why the
   executable file might be covered by the GNU General Public License.
 */
 
 #include "qutf7codec.h"
 
-#include <tqtextcodecplugin.h>
+#include <textcodecplugin.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index ac790693..c2faab38 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -39,7 +39,7 @@
 #include <keditlistbox.h>
 
 
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KRecentAddress;
 
@@ -162,11 +162,11 @@ RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name )
                  parent, name, true )
 {
   TQWidget *page = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() );
 
   mEditor = new KEditListBox( i18n( "Recent Addresses" ), page, "", false,
                               KEditListBox::Add | KEditListBox::Remove );
-  tqlayout->addWidget( mEditor );
+  layout->addWidget( mEditor );
 }
 
 void RecentAddressDialog::setAddresses( const TQStringList &addrs )
diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp
index 218f9617..1d62e8f5 100644
--- a/libtdepim/sendsmsdialog.cpp
+++ b/libtdepim/sendsmsdialog.cpp
@@ -20,8 +20,8 @@
    Boston, MA 02110-1301, USA.
  */
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 
 #include <klocale.h>
 
@@ -32,19 +32,19 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c
 {
   TQWidget *page = plainPage();
 
-  TQGridLayout *tqlayout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 );
+  layout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 );
 
   mMessageLength = new TQLabel( "0/160", page );
-  mMessageLength->tqsetAlignment( TQt::AlignRight );
-  tqlayout->addWidget( mMessageLength, 0, 2 );
+  mMessageLength->setAlignment( TQt::AlignRight );
+  layout->addWidget( mMessageLength, 0, 2 );
 
   mText = new TQTextEdit( page );
-  tqlayout->addMultiCellWidget( mText, 1, 1, 0, 2 );
+  layout->addMultiCellWidget( mText, 1, 1, 0, 2 );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 );
-  tqlayout->addWidget( new TQLabel( recipientName, page ), 2, 2 );
+  layout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 );
+  layout->addWidget( new TQLabel( recipientName, page ), 2, 2 );
 
   setButtonText( Ok, i18n( "Send" ) );
 
@@ -68,13 +68,13 @@ void SendSMSDialog::updateMessageLength()
   int length = mText->length();
 
   if( length > 480 )
-    mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 500 ).tqarg( 4 ) );
+    mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 500 ).arg( 4 ) );
   else if( length > 320 )
-    mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 480 ).tqarg( 3 ) );
+    mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 480 ).arg( 3 ) );
   else if( length > 160 )
-    mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 320 ).tqarg( 2 ) );
+    mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 320 ).arg( 2 ) );
   else
-    mMessageLength->setText( TQString( "%1/%2" ).tqarg( length ).tqarg( 160 ) );
+    mMessageLength->setText( TQString( "%1/%2" ).arg( length ).arg( 160 ) );
 }
 
 void SendSMSDialog::updateButtons()
diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp
index c417905a..7471f588 100644
--- a/libtdepim/statusbarprogresswidget.cpp
+++ b/libtdepim/statusbarprogresswidget.cpp
@@ -48,7 +48,7 @@ using KPIM::ProgressManager;
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 #include <tqframe.h>
 
@@ -67,7 +67,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog
   box = new TQHBoxLayout( this, 0, 0 );
 
   m_pButton = new TQPushButton( this );
-  m_pButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  m_pButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
                                          TQSizePolicy::Minimum ) );
   m_pButton->setPixmap( SmallIcon( "up" ) );
   box->addWidget( m_pButton  );
@@ -88,12 +88,12 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog
   stack->addWidget( m_pProgressBar, 1 );
 
   m_pLabel = new TQLabel( TQString(), this );
-  m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+  m_pLabel->setAlignment( AlignHCenter | AlignVCenter );
   m_pLabel->installEventFilter( this );
   m_pLabel->setMinimumWidth( w );
   stack->addWidget( m_pLabel, 2 );
   m_pButton->setMaximumHeight( fontMetrics().height() );
-  setMinimumWidth( tqminimumSizeHint().width() );
+  setMinimumWidth( minimumSizeHint().width() );
 
   mode = None;
   setMode();
diff --git a/libtdepim/tests/test_kregexp.cpp b/libtdepim/tests/test_kregexp.cpp
index 511687d0..a44e3be0 100644
--- a/libtdepim/tests/test_kregexp.cpp
+++ b/libtdepim/tests/test_kregexp.cpp
@@ -9,8 +9,8 @@ main()
 
   // test for http://bugs.kde.org/show_bug.cgi?id=54886
   KRegExp3 reg("^");
-  TQString res = reg.replace(TQString::tqfromLatin1("Fun stuff"),
-			    TQString::tqfromLatin1("[fun] "));
+  TQString res = reg.replace(TQString::fromLatin1("Fun stuff"),
+			    TQString::fromLatin1("[fun] "));
   kdDebug() << res << endl;
 
 }
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 46fabcfe..a5f1ce7b 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kaboutdata.h>
 #include <kapplication.h>
@@ -34,10 +34,10 @@
 DateEdit::DateEdit( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
   
   KDateEdit *edit = new KDateEdit( this );
-  tqlayout->addWidget( edit );
+  layout->addWidget( edit );
 
   connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ),
            this, TQT_SLOT( dateChanged( const TQDate& ) ) );
diff --git a/libtdepim/tests/testutf7decoder.cpp b/libtdepim/tests/testutf7decoder.cpp
index b13fb30c..9428c8f0 100644
--- a/libtdepim/tests/testutf7decoder.cpp
+++ b/libtdepim/tests/testutf7decoder.cpp
@@ -1,6 +1,6 @@
 #include "qutf7codec.h"
 #include "qutf7codec.cpp"
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/libtdepim/tests/testutf7encoder.cpp b/libtdepim/tests/testutf7encoder.cpp
index 2938cd66..a28a6bf3 100644
--- a/libtdepim/tests/testutf7encoder.cpp
+++ b/libtdepim/tests/testutf7encoder.cpp
@@ -9,7 +9,7 @@ void main( int argc, char * argv[] ) {
 
     TQTextEncoder * enc;
 
-    TQString arg = TQString::tqfromLatin1( argv[1] );
+    TQString arg = TQString::fromLatin1( argv[1] );
     int len;
 
     cout << "Original string:\n"
diff --git a/libtdepim/tests/testutf7encoder2.cpp b/libtdepim/tests/testutf7encoder2.cpp
index 65cf8b46..20fc52a0 100644
--- a/libtdepim/tests/testutf7encoder2.cpp
+++ b/libtdepim/tests/testutf7encoder2.cpp
@@ -1,6 +1,6 @@
 #include "qutf7codec.h"
 #include "qutf7codec.cpp"
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <string.h>
 #include <assert.h>
 #include <iostream>
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index d9c9d806..066f7440 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 class TestConfigWizard : public KConfigWizard