Rename obsolete tq methods to standard names

25 files changed, 78 insertions, 78 deletions

diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 1e827d80e..d076fd3d4 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -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;
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index b3fbae4ca..c763545a1 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -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;
 
@@ -304,7 +304,7 @@ void AddresseeSelector::initGUI()
 
     TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
     buttonLayout->setAlignment( TQt::AlignBottom );
-    tqlayout->addLayout( buttonLayout, row, 1 );
+    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/addresspicker.ui b/libtdepim/addresspicker.ui
index a11680ff8..8469730a4 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">
@@ -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/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp
index 72e1de8ae..a6ab6e77c 100644
--- a/libtdepim/categoryeditdialog.cpp
+++ b/libtdepim/categoryeditdialog.cpp
@@ -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 39d69dc7d..9064bce3d 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">
diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp
index a95daad6f..d773c7d66 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
@@ -216,7 +216,7 @@ namespace KPIM {
                                         "  font-size: %2pt ! important;\n" )
                            .arg( mPrintFont.family() )
                            .arg( mPrintFont.pointSize() );
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
+    const TQColorGroup & cg = TQApplication::palette().active();
 
     const TQFont printFont = bodyFont( fixed, true /* print */ );
     TQString quoteCSS;
@@ -308,7 +308,7 @@ namespace KPIM {
                          : TQString( "  background-color: %1 ! important;\n" )
                            .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() )
diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp
index 50c05593e..c30d19866 100644
--- a/libtdepim/designerfields.cpp
+++ b/libtdepim/designerfields.cpp
@@ -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 );
diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp
index 3c32f8324..7a459530c 100644
--- a/libtdepim/embeddedurlpage.cpp
+++ b/libtdepim/embeddedurlpage.cpp
@@ -41,8 +41,8 @@ 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 );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  layout->setAutoAdd( true );
   new TQLabel( i18n("Showing URL %1").arg( url ), this );
 }
 
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index 168f7f50b..d40d3f4ba 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -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"
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index 79ad6aa9c..e1e887be2 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -390,10 +390,10 @@ 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().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+  if( style().isA("KeramikStyle") )
+    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 4f9a081a8..8d3a87f48 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -75,7 +75,7 @@ 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() );
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() );
   boxLayout->setAlignment( TQt::AlignTop );
 
   m_editorsCombo = new KComboBox( m_box );
diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
index a83a5a7a2..f25ec3cd3 100644
--- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
+++ b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
@@ -29,8 +29,8 @@
 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/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index 816028726..047f16d22 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -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 b1fffcdd7..907989f8c 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/ksubscription.cpp b/libtdepim/ksubscription.cpp
index f1c5b657a..f61b633ca 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -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());
diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp
index 458292bc0..546bbb322 100644
--- a/libtdepim/kwidgetlister.cpp
+++ b/libtdepim/kwidgetlister.cpp
@@ -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 6bfeec157..ebe9c1416 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/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 941253a45..53bfba32b 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -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 );
 
diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp
index 8738788f4..d71bc875e 100644
--- a/libtdepim/linklocator.cpp
+++ b/libtdepim/linklocator.cpp
@@ -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 ) ) {
diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h
index 1ad9dfa36..bb4a89de8 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 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 b9e196143..b058194b9 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -84,7 +84,7 @@ 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();
diff --git a/libtdepim/qutf7codec.cpp b/libtdepim/qutf7codec.cpp
index b0076172c..d390e6490 100644
--- a/libtdepim/qutf7codec.cpp
+++ b/libtdepim/qutf7codec.cpp
@@ -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/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index ac790693d..df7a45493 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -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 0232a7823..2fb4efe41 100644
--- a/libtdepim/sendsmsdialog.cpp
+++ b/libtdepim/sendsmsdialog.cpp
@@ -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->setAlignment( TQt::AlignRight );
-  tqlayout->addWidget( mMessageLength, 0, 2 );
+  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" ) );
 
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 46fabcfe1..4a7f981e5 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -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& ) ) );