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

154 files changed, 1125 insertions, 1125 deletions

diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
index 58d389a..e470a72 100644
--- a/kcron/ctcron.cpp
+++ b/kcron/ctcron.cpp
@@ -60,7 +60,7 @@ CTCron::CTCron(bool _syscron, string _login) :
       writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName);
       if (!initFromPasswd(getpwnam(_login.c_str())))
       {
-         error = i18n("No password entry found for user '%1'").tqarg(_login.c_str());
+         error = i18n("No password entry found for user '%1'").arg(_login.c_str());
       }
     }
   }
@@ -71,7 +71,7 @@ CTCron::CTCron(bool _syscron, string _login) :
     writeCommand = "crontab "      + KProcess::quote(tmpFileName);
     if (!initFromPasswd(getpwuid(uid)))
     {
-      error = i18n("No password entry found for uid '%1'").tqarg(uid);
+      error = i18n("No password entry found for uid '%1'").arg(uid);
     }
   }
 
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index dfbe15e..8efbb05 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -70,7 +70,7 @@ bool KTApp::init()
   if (cthost->isError())
   {
     KMessageBox::error(this, i18n("The following error occurred while initializing KCron:"
-                                  "\n\n%1\n\nKCron will now exit.\n").tqarg(cthost->errorMessage()));
+                                  "\n\n%1\n\nKCron will now exit.\n").arg(cthost->errorMessage()));
     return false;
   }
 
diff --git a/kcron/ktapp.h b/kcron/ktapp.h
index 6b28354..a60c7ca 100644
--- a/kcron/ktapp.h
+++ b/kcron/ktapp.h
@@ -238,13 +238,13 @@ private:
 
 /**
   * Read general options again and initialize all variables like the
-  * tqgeometry.
+  * geometry.
   */
   void readOptions();
 
 /**
   * Save general options like all bar positions and status as well as the
-  * tqgeometry to the configuration file.
+  * geometry to the configuration file.
   */ 	
   void saveOptions();
 
diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp
index db153e6..e35f053 100644
--- a/kcron/ktlisttasks.cpp
+++ b/kcron/ktlisttasks.cpp
@@ -77,7 +77,7 @@ void KTListTasks::print (KTPrint& printer) const
 
   printer.setFont(stnd);
 
-  //firstChild() does not return null if there are no tqchildren, therefore
+  //firstChild() does not return null if there are no children, therefore
   //we need to check the validation of the pointer without terminating
   //the application. This maybe a bug in QT 1.44
 
diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp
index 567d3d1..cf4a6d1 100644
--- a/kcron/ktlistvars.cpp
+++ b/kcron/ktlistvars.cpp
@@ -73,7 +73,7 @@ void KTListVars::print(KTPrint& printer) const
 
   printer.setFont(stnd);
 
-  //firstChild() does not return null if there are no tqchildren, therefore
+  //firstChild() does not return null if there are no children, therefore
   //we need to check the validation of the pointer without terminating
   //the application. This maybe a bug in QT 1.44
 
diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp
index ceb1482..b1de5c6 100644
--- a/kcron/ktprint.cpp
+++ b/kcron/ktprint.cpp
@@ -104,7 +104,7 @@ TQFont KTPrint :: getFont () const
   return paint->font();	
 }
 
-void KTPrint :: print (const TQString &str, int col, int tqalignment, bool wordWrap)
+void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWrap)
 {
 //Prints the string str into the column col using
 //the remaining arguments as format flags
@@ -115,8 +115,8 @@ void KTPrint :: print (const TQString &str, int col, int tqalignment, bool wordW
     return;
   
 	
-   //Setup the tqalignment
-  switch (tqalignment) {
+   //Setup the alignment
+  switch (alignment) {
     case alignTextLeft : format = AlignLeft | AlignTop | DontClip | ExpandTabs; break;
     case alignTextCenter : format = AlignHCenter | AlignTop | DontClip | ExpandTabs; break;
     case alignTextRight : format = AlignRight | AlignTop | DontClip | ExpandTabs; break;
diff --git a/kcron/ktprint.h b/kcron/ktprint.h
index 34b0254..16c13b1 100644
--- a/kcron/ktprint.h
+++ b/kcron/ktprint.h
@@ -87,7 +87,7 @@ public:
 /**
   * Print text
   */
-  void print (const TQString &str, int col =1, int tqalignment=KTPrint::defaultLeftMargin, bool wordWrap = true);
+  void print (const TQString &str, int col =1, int alignment=KTPrint::defaultLeftMargin, bool wordWrap = true);
 
 /**
   * Constructs the columns
@@ -178,7 +178,7 @@ private:
   KPrinter *prnt;
 
 /**
-  *Nest a column class to make text tqlayout nicer
+  *Nest a column class to make text layout nicer
   */
 
   class Column {
diff --git a/kcron/ktprintopt.cpp b/kcron/ktprintopt.cpp
index f609869..34b0770 100644
--- a/kcron/ktprintopt.cpp
+++ b/kcron/ktprintopt.cpp
@@ -12,7 +12,7 @@
  ***************************************************************************/
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdialog.h>
 #include <kaccel.h>
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 0568de5..ffe3d7d 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -14,12 +14,12 @@
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <kapplication.h>
 #include <kaccel.h>
@@ -269,7 +269,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
   v4->addSpacing( 2 * KDialogBase::spacingHint() );
 
   labAM = new TQLabel( i18n("AM"), bgHour, "labAM");
-  labAM->tqsetAlignment(AlignRight | AlignVCenter);
+  labAM->setAlignment(AlignRight | AlignVCenter);
   v4->addWidget( labAM );
 
 
@@ -292,7 +292,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
   }
 
   labPM = new TQLabel( i18n("PM"), bgHour, "labPM");
-  labPM->tqsetAlignment(AlignRight | AlignVCenter);
+  labPM->setAlignment(AlignRight | AlignVCenter);
   v4->addWidget( labPM );
 
   hhours = new TQHBoxLayout( v4, KDialogBase::spacingHint() );
@@ -403,7 +403,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
   key_accel->insert(KStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()));
   key_accel->readSettings();
 
-  setFixedSize( tqminimumSize() );
+  setFixedSize( minimumSize() );
   slotDailyChanged();
   slotMonthChanged();
   slotDayOfMonthChanged();
diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp
index 474d22c..6e7ff60 100644
--- a/kcron/ktvariable.cpp
+++ b/kcron/ktvariable.cpp
@@ -11,7 +11,7 @@
 
 #include "ktvariable.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kapplication.h>     // kapp
 #include <klocale.h>  // i18n()
@@ -27,18 +27,18 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
   ctvar( _ctvar)
 {
   TQFrame *page = makeMainWidget();
-  TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
-  tqlayout->setRowStretch(3, 1);
-  tqlayout->setColStretch(1, 1);
+  TQGridLayout *layout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
+  layout->setRowStretch(3, 1);
+  layout->setColStretch(1, 1);
 
   setIcon(KTIcon::application(true));
 
   // variable
   labVariable = new TQLabel(i18n("&Variable:"), page, "labVariable");
-  tqlayout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop);
+  layout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop);
 
   cmbVariable = new TQComboBox(true, page, "cmbVariable");
-  tqlayout->addWidget(cmbVariable, 1, 1);
+  layout->addWidget(cmbVariable, 1, 1);
 
   cmbVariable->insertItem("HOME");
   cmbVariable->insertItem("MAILTO");
@@ -49,30 +49,30 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
 
   // icon
   labIcon = new TQLabel(page, "labIcon");
-  tqlayout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
+  layout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
 
   // value
   labValue = new TQLabel(i18n("Va&lue:"), page, "labValue");
-  tqlayout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop);
+  layout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop);
 
   leValue = new TQLineEdit(page, "leValue");
-  tqlayout->addMultiCellWidget(leValue, 2, 2, 1, 2);
+  layout->addMultiCellWidget(leValue, 2, 2, 1, 2);
   leValue->setMaxLength(255);
   labValue->setBuddy(leValue);
 
   // comment
   labComment = new TQLabel(i18n("Co&mment:"), page, "labComment");
-  tqlayout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop);
+  layout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop);
 
   teComment = new KTextEdit(page, "teComment");
   teComment->setTextFormat(TQt::PlainText);
-  tqlayout->addMultiCellWidget(teComment, 3, 3, 1, 2);
+  layout->addMultiCellWidget(teComment, 3, 3, 1, 2);
 
   labComment->setBuddy(teComment);
 
   // enabled
   chkEnabled = new TQCheckBox(i18n("&Enabled"), page, "chkEnabled");
-  tqlayout->addWidget(chkEnabled, 4, 0);
+  layout->addWidget(chkEnabled, 4, 0);
 
   // set starting field values
   cmbVariable->setEditText(TQString::fromLocal8Bit(ctvar->variable.c_str()));
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index 7422aa5..27341de 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -266,16 +266,16 @@ void KTView :: pageHeading (KTListItem* user, KTPrint &printer) const
 {
   TQFont stnd;
   TQString logonInfo;
-  TQDateTime now (TQDateTime::tqcurrentDateTime());
+  TQDateTime now (TQDateTime::currentDateTime());
   char hostName[20];
 
   gethostname(hostName, 20);
   // SSA : Fix Me user name, logon name and host name musst be
   // SSA : not only in us-ascii ??
   logonInfo = i18n("user on host", "%1 <%2> on %3")
-    .tqarg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str()))
-    .tqarg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str()))
-    .tqarg(TQString::fromLocal8Bit(hostName));
+    .arg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str()))
+    .arg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str()))
+    .arg(TQString::fromLocal8Bit(hostName));
 
   stnd = printer.getFont();
   printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold ));
@@ -315,7 +315,7 @@ void KTView::resizeEvent (TQResizeEvent*)
 {
   listView->setFixedWidth(width());
   listView->setFixedHeight(height());
-  tqrepaint();
+  repaint();
 }
 
 void KTView::copy()
diff --git a/kdat/Archive.cpp b/kdat/Archive.cpp
index ad66dbd..5e8ef65 100644
--- a/kdat/Archive.cpp
+++ b/kdat/Archive.cpp
@@ -94,7 +94,7 @@ void Archive::read( int version )
         }
     }
 
-    // Number of immediate tqchildren (4 bytes).
+    // Number of immediate children (4 bytes).
     fread( &ival, sizeof( ival ), 1, _fptr );
 
     //===== Read files =====
@@ -148,7 +148,7 @@ void Archive::write( FILE* fptr )
         fwrite( &ival, sizeof( ival ), 1, _fptr );
     }
 
-    // Number of immediate tqchildren (4 bytes).
+    // Number of immediate children (4 bytes).
     ival = getChildren().count();
     fwrite( &ival, sizeof( ival ), 1, _fptr );
 
@@ -202,7 +202,7 @@ const TQPtrList<File>& Archive::getChildren()
 {
     read();
 
-    return _tqchildren;
+    return _children;
 }
 
 const TQPtrList<Range>& Archive::getRanges()
@@ -255,7 +255,7 @@ void Archive::addChild( File* file )
 {
     read();
 
-    _tqchildren.append( file );
+    _children.append( file );
 }
 
 File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, const TQString & filename )
diff --git a/kdat/Archive.h b/kdat/Archive.h
index 7527073..9f42684 100644
--- a/kdat/Archive.h
+++ b/kdat/Archive.h
@@ -39,7 +39,7 @@ class Archive {
     FILE*       _fptr;
     int         _offset;
     TQString     _name;
-    TQPtrList<File> _tqchildren;
+    TQPtrList<File> _children;
     RangeList   _ranges;
     Tape*       _tape;
 public:
@@ -67,7 +67,7 @@ public:
     Archive( Tape* tape, FILE* fptr, int offset );
 
     /**
-     * Destroy the archive entry and all of its tqchildren.
+     * Destroy the archive entry and all of its children.
      */
     ~Archive();
 
@@ -82,7 +82,7 @@ public:
 
     /**
      * Recursively read the instance data for this archive entry and all of its
-     * tqchildren.  This method is used when converting from an older index format.
+     * children.  This method is used when converting from an older index format.
      *
      * @param version The version of the old tape index.
      */
@@ -90,7 +90,7 @@ public:
 
     /**
      * Write out the archive entry to the open file.  Entries for each of its
-     * tqchildren will also be written.
+     * children will also be written.
      */
     void write( FILE* fptr );
 
@@ -125,12 +125,12 @@ public:
     /**
      * Get the list of top-level files in this archive.
      *
-     * @return A list of the immediate tqchildren of this archive.
+     * @return A list of the immediate children of this archive.
      */
     const TQPtrList<File>& getChildren();
 
     /**
-     * Get the list of ranges of this file and all of its tqchildren.
+     * Get the list of ranges of this file and all of its children.
      *
      * @return A list of ranges.
      */
@@ -176,7 +176,7 @@ public:
     File* addFile( int size, int mtime, int startRecord, int endRecord, const TQString & filename );
 
     /**
-     * Recursively calculate the list of ranges for all of the archive's tqchildren.
+     * Recursively calculate the list of ranges for all of the archive's children.
      */
     void calcRanges();
 };
diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp
index 875c21d..acf1c16 100644
--- a/kdat/ArchiveInfoWidget.cpp
+++ b/kdat/ArchiveInfoWidget.cpp
@@ -19,7 +19,7 @@
 #include <time.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 #include <kapplication.h>
@@ -43,25 +43,25 @@ ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name )
     TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this );
     TQLabel* lbl3 = new TQLabel( i18n( "Size:" ), this );
 
-    int max = lbl1->tqsizeHint().width();
-    if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
-    if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
+    int max = lbl1->sizeHint().width();
+    if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+    if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
 
-    lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
-    lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
-    lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
+    lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+    lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+    lbl3->setFixedSize( max, lbl3->sizeHint().height() );
 
     _archiveName = new TQLineEdit( this );
-    _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() );
+    _archiveName->setFixedHeight( _archiveName->sizeHint().height() );
 
     _ctime = new TQLabel( "???", this );
-    _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
+    _ctime->setFixedHeight( _ctime->sizeHint().height() );
 
     _size = new TQLabel( "???", this );
-    _size->setFixedHeight( _size->tqsizeHint().height() );
+    _size->setFixedHeight( _size->sizeHint().height() );
 
     _apply = new KPushButton( KStdGuiItem::apply(), this );
-    _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
+    _apply->setFixedSize( 80, _apply->sizeHint().height() );
     _apply->setEnabled( FALSE );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index 93bf65d..45b864c 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -27,7 +27,7 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
@@ -93,55 +93,55 @@ BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir,
     f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 
     TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
-    lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
+    lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
 
     _elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
-    _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
+    _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
 
     TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 );
-    lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
+    lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
 
     _timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 );
-    _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() );
+    _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
 
     TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 );
-    lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
+    lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
 
     TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( archiveSize ), f1 );
-    totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() );
+    totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
 
     TQLabel* lbl4 = new TQLabel( i18n( "KB written:" ), f2 );
-    lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
+    lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
 
     _kbytesWritten = new TQLabel( i18n( "0KB" ), f2 );
-    _kbytesWritten->setFixedHeight( _kbytesWritten->tqsizeHint().height() );
+    _kbytesWritten->setFixedHeight( _kbytesWritten->sizeHint().height() );
 
     TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
-    lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
+    lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
 
     _transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
-    _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
+    _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
 
     TQLabel* lbl6 = new TQLabel( i18n( "Files:" ), f2 );
-    lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+    lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
 
     _fileCount = new TQLabel( i18n( "0" ), f2 );
-    _fileCount->setFixedHeight( _fileCount->tqsizeHint().height() );
+    _fileCount->setFixedHeight( _fileCount->sizeHint().height() );
 
     _log = new LoggerWidget( i18n( "Backup log:" ), this );
 
     _ok = new KPushButton( KStdGuiItem::ok(), this );
-    _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
+    _ok->setFixedSize( 80, _ok->sizeHint().height() );
     connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
     _ok->setEnabled( FALSE );
 
     _save = new TQPushButton( i18n( "Save Log..." ), this );
-    _save->setFixedSize( 80, _save->tqsizeHint().height() );
+    _save->setFixedSize( 80, _save->sizeHint().height() );
     connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
     _save->setEnabled( FALSE );
 
     _abort = new KPushButton( KStdGuiItem::cancel(), this );
-    _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
+    _abort->setFixedSize( 80, _abort->sizeHint().height() );
     connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
@@ -426,7 +426,7 @@ void BackupDlg::updateStats()
     _kbytesWritten->setText( str );
 
     if ( elapsed > 0 ) {
-        str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
+        str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
         _transferRate->setText( str );
     }
 }
diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h
index d98d91c..092f7c0 100644
--- a/kdat/BackupDlg.h
+++ b/kdat/BackupDlg.h
@@ -33,7 +33,7 @@ class Tape;
 class TarParser;
 
 /**
- * @short tqStatus dialog for backing up files.
+ * @short Status dialog for backing up files.
  */
 class BackupDlg : public TQDialog {
     Q_OBJECT
diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp
index 58ae673..09ca8d8 100644
--- a/kdat/BackupOptDlg.cpp
+++ b/kdat/BackupOptDlg.cpp
@@ -18,7 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
@@ -42,10 +42,10 @@ BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, cons
     _profile->setBackupProfile( backupProfile );
 
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
-    ok->setFixedSize( 80, ok->tqsizeHint().height() );
+    ok->setFixedSize( 80, ok->sizeHint().height() );
     connect( ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
-    cancel->setFixedSize( 80, ok->tqsizeHint().height() );
+    cancel->setFixedSize( 80, ok->sizeHint().height() );
     connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp
index a40b94c..62aff8b 100644
--- a/kdat/BackupProfileInfoWidget.cpp
+++ b/kdat/BackupProfileInfoWidget.cpp
@@ -20,7 +20,7 @@
 #include <time.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 #include <kapplication.h>
@@ -42,23 +42,23 @@ BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char*
 {
     TQLabel* lbl1 = new TQLabel( i18n( "Backup profile name:" ), this );
 
-    int max = lbl1->tqsizeHint().width();
+    int max = lbl1->sizeHint().width();
 
-    lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
+    lbl1->setFixedSize( max, lbl1->sizeHint().height() );
 
     _name = new TQLineEdit( this );
-    _name->setFixedHeight( _name->tqsizeHint().height() );
+    _name->setFixedHeight( _name->sizeHint().height() );
 
     _profile = new BackupProfileWidget( this );
 
     TQPushButton* getSelection = new TQPushButton( i18n( "Files >>" ), this );
-    getSelection->setFixedSize( 80, getSelection->tqsizeHint().height() );
+    getSelection->setFixedSize( 80, getSelection->sizeHint().height() );
 
     TQPushButton* setSelection = new TQPushButton( i18n( "<< Files" ), this );
-    setSelection->setFixedSize( 80, setSelection->tqsizeHint().height() );
+    setSelection->setFixedSize( 80, setSelection->sizeHint().height() );
 
     _apply = new KPushButton( KStdGuiItem::apply(), this );
-    _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
+    _apply->setFixedSize( 80, _apply->sizeHint().height() );
     _apply->setEnabled( FALSE );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp
index 773a8bd..c088cbe 100644
--- a/kdat/BackupProfileWidget.cpp
+++ b/kdat/BackupProfileWidget.cpp
@@ -19,7 +19,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
@@ -40,19 +40,19 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
     addTab( one, i18n( "Backup" ) );
 
     TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), one );
-    lbl1->setFixedSize( lbl1->tqsizeHint() );
+    lbl1->setFixedSize( lbl1->sizeHint() );
 
     _archiveName = new TQLineEdit( one );
-    _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() );
+    _archiveName->setFixedHeight( _archiveName->sizeHint().height() );
 
     TQLabel* lbl2 = new TQLabel( i18n( "Working folder:" ), one );
-    lbl2->setFixedSize( lbl2->tqsizeHint() );
+    lbl2->setFixedSize( lbl2->sizeHint() );
 
     _workingDir = new TQComboBox( FALSE, one );
-    _workingDir->setFixedHeight( _workingDir->tqsizeHint().height() );
+    _workingDir->setFixedHeight( _workingDir->sizeHint().height() );
 
     TQLabel* lbl3 = new TQLabel( i18n( "Backup files:" ), one );
-    lbl3->setFixedHeight( lbl3->tqsizeHint().height() );
+    lbl3->setFixedHeight( lbl3->sizeHint().height() );
 
     _files = new TQListBox( one );
 
@@ -60,20 +60,20 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
     addTab( two, i18n( "Tar Options" ) );
 
     _oneFilesystem = new TQCheckBox( i18n( "Stay on one filesystem" ), two );
-    _oneFilesystem->setFixedHeight( _oneFilesystem->tqsizeHint().height() );
+    _oneFilesystem->setFixedHeight( _oneFilesystem->sizeHint().height() );
 
     _incremental = new TQCheckBox( i18n( "GNU listed incremental" ), two );
-    _incremental->setFixedHeight( _incremental->tqsizeHint().height() );
+    _incremental->setFixedHeight( _incremental->sizeHint().height() );
     connect( _incremental, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIncrementalToggled( bool ) ) );
 
     _snapshotLabel = new TQLabel( i18n( "Snapshot file:" ), two );
-    _snapshotLabel->setFixedSize( _snapshotLabel->tqsizeHint() );
+    _snapshotLabel->setFixedSize( _snapshotLabel->sizeHint() );
 
     _snapshotFile = new TQLineEdit( two );
-    _snapshotFile->setFixedHeight( _snapshotFile->tqsizeHint().height() );
+    _snapshotFile->setFixedHeight( _snapshotFile->sizeHint().height() );
 
     _removeSnapshot = new TQCheckBox( i18n( "Remove snapshot file before backup" ), two );
-    _removeSnapshot->setFixedHeight( _removeSnapshot->tqsizeHint().height() );
+    _removeSnapshot->setFixedHeight( _removeSnapshot->sizeHint().height() );
 
     slotIncrementalToggled( FALSE );
 
diff --git a/kdat/File.cpp b/kdat/File.cpp
index ce05aeb..fd766b3 100644
--- a/kdat/File.cpp
+++ b/kdat/File.cpp
@@ -44,9 +44,9 @@ File::File( File* parent, FILE* fptr, int offset )
 
 File::~File()
 {
-    while ( _tqchildren.first() ) {
-        delete _tqchildren.first();
-        _tqchildren.removeFirst();
+    while ( _children.first() ) {
+        delete _children.first();
+        _children.removeFirst();
     }
 }
 
@@ -164,7 +164,7 @@ void File::write( FILE* fptr )
         fwrite( &ival, sizeof( ival ), 1, fptr );
     }
 
-    // Number of immediate tqchildren (4 bytes).
+    // Number of immediate children (4 bytes).
     ival = getChildren().count();
     fwrite( &ival, sizeof( ival ), 1, fptr );
 
@@ -175,10 +175,10 @@ void File::write( FILE* fptr )
     }
 
     //===== Write files =====
-    ival = _tqchildren.count();
+    ival = _children.count();
     fwrite( &ival, sizeof( ival ), 1, fptr );
 
-    TQPtrListIterator<File> i( _tqchildren );
+    TQPtrListIterator<File> i( _children );
     int count = 0;
     for ( ; i.current(); ++i, count++ ) {
         // Fill in the file offset.
@@ -252,7 +252,7 @@ const TQPtrList<File>& File::getChildren()
 {
     read();
 
-    return _tqchildren;
+    return _children;
 }
 
 const TQPtrList<Range>& File::getRanges()
@@ -266,7 +266,7 @@ void File::addChild( File* file )
 {
     read();
 
-    _tqchildren.append( file );
+    _children.append( file );
 }
 
 void File::calcRanges()
diff --git a/kdat/File.h b/kdat/File.h
index 71167f2..75b1d87 100644
--- a/kdat/File.h
+++ b/kdat/File.h
@@ -46,7 +46,7 @@ class File {
     } _union;
     TQString     _name;
     File*       _parent;
-    TQPtrList<File> _tqchildren;
+    TQPtrList<File> _children;
     RangeList   _ranges;
 public:
     /**
@@ -80,7 +80,7 @@ public:
     File( File* parent, FILE* fptr, int offset );
 
     /**
-     * Destroy the file entry and all of its tqchildren.
+     * Destroy the file entry and all of its children.
      */
     ~File();
     
@@ -95,7 +95,7 @@ public:
 
     /**
      * Recursively read the instance for this file entry and all of it's
-     * tqchildren.  This method is used when converting from an older index format.
+     * children.  This method is used when converting from an older index format.
      *
      * @param version The version of the old tape index.
      */
@@ -103,7 +103,7 @@ public:
     
     /**
      * Write out the file entry to the open file.  Entries for each of its
-     * tqchildren will also be written.
+     * children will also be written.
      */
     void write( FILE* fptr );
 
@@ -171,15 +171,15 @@ public:
     File* getParent();
 
     /**
-     * Get the tqchildren of this file entry.  A normal file will never have any
-     * tqchildren.  A directory may or may not have tqchildren.
+     * Get the children of this file entry.  A normal file will never have any
+     * children.  A directory may or may not have children.
      *
-     * @return A list of the immediate tqchildren of this file entry.
+     * @return A list of the immediate children of this file entry.
      */
     const TQPtrList<File>& getChildren();
 
     /**
-     * Get the list of ranges of this file and all of its tqchildren.
+     * Get the list of ranges of this file and all of its children.
      *
      * @return A list of ranges.
      */
@@ -193,7 +193,7 @@ public:
     void addChild( File* file );
 
     /**
-     * Recursively calculate the list of ranges for all of the file's tqchildren.
+     * Recursively calculate the list of ranges for all of the file's children.
      */
     void calcRanges();
 };
diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp
index e8991a8..bc42d7e 100644
--- a/kdat/FileInfoWidget.cpp
+++ b/kdat/FileInfoWidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tqdatetime.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfile.h>
 
 #include <kapplication.h>
@@ -47,42 +47,42 @@ FileInfoWidget::FileInfoWidget( TQWidget* parent, const char* name )
     TQLabel* lbl6 = new TQLabel( i18n( "Owner:" ), this );
     TQLabel* lbl7 = new TQLabel( i18n( "Group:" ), this );
 
-    int max = lbl1->tqsizeHint().width();
-    if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
-    if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
-    if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
-    if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
-    if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width();
-    if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width();
-
-    lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
-    lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
-    lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
-    lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
-    lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
-    lbl6->setFixedSize( max, lbl6->tqsizeHint().height() );
-    lbl7->setFixedSize( max, lbl7->tqsizeHint().height() );
+    int max = lbl1->sizeHint().width();
+    if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+    if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
+    if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
+    if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
+    if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width();
+    if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width();
+
+    lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+    lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+    lbl3->setFixedSize( max, lbl3->sizeHint().height() );
+    lbl4->setFixedSize( max, lbl4->sizeHint().height() );
+    lbl5->setFixedSize( max, lbl5->sizeHint().height() );
+    lbl6->setFixedSize( max, lbl6->sizeHint().height() );
+    lbl7->setFixedSize( max, lbl7->sizeHint().height() );
 
     _fileName = new TQLabel( "???", this );
-    _fileName->setFixedHeight( _fileName->tqsizeHint().height() );
+    _fileName->setFixedHeight( _fileName->sizeHint().height() );
     
     _ctime = new TQLabel( "???", this );
-    _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
+    _ctime->setFixedHeight( _ctime->sizeHint().height() );
 
     _mtime = new TQLabel( "???", this );
-    _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
+    _mtime->setFixedHeight( _mtime->sizeHint().height() );
     
     _atime = new TQLabel( "???", this );
-    _atime->setFixedHeight( _atime->tqsizeHint().height() );
+    _atime->setFixedHeight( _atime->sizeHint().height() );
 
     _size = new TQLabel( "???", this );
-    _size->setFixedHeight( _size->tqsizeHint().height() );
+    _size->setFixedHeight( _size->sizeHint().height() );
 
     _owner = new TQLabel( "???", this );
-    _owner->setFixedHeight( _owner->tqsizeHint().height() );
+    _owner->setFixedHeight( _owner->sizeHint().height() );
 
     _group = new TQLabel( "???", this );
-    _group->setFixedHeight( _group->tqsizeHint().height() );
+    _group->setFixedHeight( _group->sizeHint().height() );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
 
diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp
index f6084de..a79ff21 100644
--- a/kdat/FormatOptDlg.cpp
+++ b/kdat/FormatOptDlg.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
@@ -43,28 +43,28 @@ FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char*
     TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this );
     TQLabel* lbl2 = new TQLabel( i18n( "Tape size:" ), this );
 
-    int max = lbl1->tqsizeHint().width();
-    if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
+    int max = lbl1->sizeHint().width();
+    if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
 
-    lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
-    lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
+    lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+    lbl2->setFixedSize( max, lbl2->sizeHint().height() );
 
     _entry = new TQLineEdit( this );
     _entry->setText( def );
-    _entry->setFixedHeight( _entry->tqsizeHint().height() );
+    _entry->setFixedHeight( _entry->sizeHint().height() );
 
     _tapeSize = new TQLineEdit( this );
-    _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() );
+    _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() );
 
     _tapeSizeUnits = new TQComboBox( this );
-    _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() );
+    _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() );
     _tapeSizeUnits->insertItem( "MB" );
     _tapeSizeUnits->insertItem( "GB" );
 
     KPushButton* ok     = new KPushButton( KStdGuiItem::ok(), this );
-    ok->setFixedSize( 80, ok->tqsizeHint().height() );
+    ok->setFixedSize( 80, ok->sizeHint().height() );
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
-    cancel->setFixedSize( 80, cancel->tqsizeHint().height() );
+    cancel->setFixedSize( 80, cancel->sizeHint().height() );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
     TQHBoxLayout* l2 = new TQHBoxLayout();
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index bd1f62c..7d75c58 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -22,7 +22,7 @@
 #include <time.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
@@ -70,55 +70,55 @@ IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name )
     f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 
     TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
-    lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
+    lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
 
     _elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
-    _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
+    _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
 
     TQLabel* lbl2 = new TQLabel( i18n( "Archives:" ), f2 );
-    lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
+    lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
 
     _archives = new TQLabel( i18n( "0" ), f2 );
-    _archives->setFixedHeight( _archives->tqsizeHint().height() );
+    _archives->setFixedHeight( _archives->sizeHint().height() );
 
     TQLabel* lbl3 = new TQLabel( i18n( "KB read:" ), f1 );
-    lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
+    lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
 
     _kbytesRead = new TQLabel( i18n( "0KB" ), f1 );
-    _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() );
+    _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
 
     TQLabel* lbl4 = new TQLabel( i18n( "Files:" ), f2 );
-    lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
+    lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
 
     _files = new TQLabel( i18n( "0" ), f2 );
-    _files->setFixedHeight( _kbytesRead->tqsizeHint().height() );
+    _files->setFixedHeight( _kbytesRead->sizeHint().height() );
 
     TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
-    lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
+    lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
 
     _transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
-    _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
+    _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
 
     TQLabel* lbl6 = new TQLabel( i18n( "Total files:" ), f2 );
-    lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+    lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
 
     _totalFiles = new TQLabel( i18n( "0" ), f2 );
-    _totalFiles->setFixedHeight( _totalFiles->tqsizeHint().height() );
+    _totalFiles->setFixedHeight( _totalFiles->sizeHint().height() );
 
     _log = new LoggerWidget( i18n( "Index log:" ), this );
 
     _ok = new KPushButton( KStdGuiItem::ok(), this );
-    _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
+    _ok->setFixedSize( 80, _ok->sizeHint().height() );
     connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
     _ok->setEnabled( FALSE );
 
     _save = new TQPushButton( i18n( "Save Log..." ), this );
-    _save->setFixedSize( 80, _save->tqsizeHint().height() );
+    _save->setFixedSize( 80, _save->sizeHint().height() );
     connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
     _save->setEnabled( FALSE );
 
     _abort = new TQPushButton( i18n( "Abort" ), this );
-    _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
+    _abort->setFixedSize( 80, _abort->sizeHint().height() );
     connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
@@ -275,10 +275,10 @@ void IndexDlg::timerEvent( TQTimerEvent* )
                 _archiveCount++;
                 msg.setNum( _archiveCount );
                 _archives->setText( msg );
-                msg = i18n( "Indexing archive %1." ).tqarg( _archiveCount );
+                msg = i18n( "Indexing archive %1." ).arg( _archiveCount );
                 _log->append( msg );
 
-                msg = i18n( "Archive %1" ).tqarg( _archiveCount );
+                msg = i18n( "Archive %1" ).arg( _archiveCount );
                 _archive = new Archive( _tape, 0, msg );
                 _fileName = TQString();
                 _fileSize = -1;
@@ -349,7 +349,7 @@ void IndexDlg::updateStats()
     _kbytesRead->setText( str );
 
     if ( elapsed > 0 ) {
-        str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
+        str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
         _transferRate->setText( str );
     }
 }
diff --git a/kdat/IndexDlg.h b/kdat/IndexDlg.h
index ffbc505..41a4070 100644
--- a/kdat/IndexDlg.h
+++ b/kdat/IndexDlg.h
@@ -34,7 +34,7 @@ class Tape;
 class TarParser;
 
 /**
- * @short tqStatus dialog for recreating a tape index.
+ * @short Status dialog for recreating a tape index.
  */
 class IndexDlg : public TQDialog {
     Q_OBJECT
diff --git a/kdat/InfoShellWidget.h b/kdat/InfoShellWidget.h
index 0f87585..62f2c5f 100644
--- a/kdat/InfoShellWidget.h
+++ b/kdat/InfoShellWidget.h
@@ -42,7 +42,7 @@ public:
     ~InfoShellWidget();
 protected:
     /**
-     * Resize all tqchildren to fill all of the available space within the shell.
+     * Resize all children to fill all of the available space within the shell.
      */
     virtual void resizeEvent( TQResizeEvent* e );
 };
diff --git a/kdat/KDat.kdoc b/kdat/KDat.kdoc
index 21b5a50..7297e64 100644
--- a/kdat/KDat.kdoc
+++ b/kdat/KDat.kdoc
@@ -12,7 +12,7 @@ Archive::startBlock=Archive.html#startBlock
 Archive::endBlock=Archive.html#endBlock
 Archive::name=Archive.html#name
 Archive::files=Archive.html#files
-Archive::tqchildren=Archive.html#tqchildren
+Archive::children=Archive.html#children
 Archive::setEndBlock=Archive.html#setEndBlock
 Archive::setName=Archive.html#setName
 Archive::addFile=Archive.html#addFile
@@ -94,7 +94,7 @@ File::size=File.html#size
 File::mtime=File.html#mtime
 File::record=File.html#record
 File::name=File.html#name
-File::tqchildren=File.html#tqchildren
+File::children=File.html#children
 IndexDlg=IndexDlg.html
 IndexDlg=IndexDlg.html
 IndexDlg::_tarParser=IndexDlg.html#_tarParser
@@ -387,7 +387,7 @@ TapeDrive::seek=TapeDrive.html#seek
 TapeDrive::unlock=TapeDrive.html#unlock
 TapeDrive::write=TapeDrive.html#write
 TapeDrive::slotTapeBlockSize=TapeDrive.html#slotTapeBlockSize
-TapeDrive::slottqStatus=TapeDrive.html#slottqStatus
+TapeDrive::slotStatus=TapeDrive.html#slotStatus
 TapeDrive::status=TapeDrive.html#status
 TapeInfoDlg=TapeInfoDlg.html
 TapeInfoDlg=TapeInfoDlg.html
@@ -475,7 +475,7 @@ KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem
 KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem
 KTreeViewItem::~KTreeViewItem=KTreeViewItem.html#~KTreeViewItem
 KTreeViewItem::appendChild=KTreeViewItem.html#appendChild
-KTreeViewItem::tqchildAt=KTreeViewItem.html#tqchildAt
+KTreeViewItem::childAt=KTreeViewItem.html#childAt
 KTreeViewItem::childCount=KTreeViewItem.html#childCount
 KTreeViewItem::childIndex=KTreeViewItem.html#childIndex
 KTreeViewItem::expandButtonClicked=KTreeViewItem.html#expandButtonClicked
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 3bc2b6d..5f6427c 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -26,8 +26,8 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqkeycode.h>
-#include <tqlayout.h>
-#include <tqtextstream.h>
+#include <layout.h>
+#include <textstream.h>
 
 #include <kapplication.h>
 #include <kiconloader.h>
@@ -152,7 +152,7 @@ KDatMainWindow::KDatMainWindow()
     _menu->insertItem( i18n( "&File" ), _fileMenu );
     _menu->insertItem( i18n( "&Settings" ), _editMenu );
     _menu->insertSeparator();
-    TQString about = i18n( "KDat Version %1\n\nKDat is a tar-based tape archiver.\n\nCopyright (c) 1998-2000 Sean Vyain\nCopyright (c) 2001-2002 Lawrence Widman\nkdat@cardiothink.com" ).tqarg( KDAT_VERSION );
+    TQString about = i18n( "KDat Version %1\n\nKDat is a tar-based tape archiver.\n\nCopyright (c) 1998-2000 Sean Vyain\nCopyright (c) 2001-2002 Lawrence Widman\nkdat@cardiothink.com" ).arg( KDAT_VERSION );
     _menu->insertItem( i18n( "&Help" ), helpMenu( about ) );
 
     _toolbar = new KToolBar( this );
@@ -211,7 +211,7 @@ KDatMainWindow::KDatMainWindow()
     _tree->insertItem( _backupProfileRootNode = new BackupProfileRootNode() );
     _tree->insertItem( new TapeIndexRootNode() );
 
-    connect( TapeDrive::instance(), TQT_SIGNAL( sigtqStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) );
+    connect( TapeDrive::instance(), TQT_SIGNAL( sigStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) );
 
     setTapePresent( FALSE );
 
@@ -387,7 +387,7 @@ void KDatMainWindow::localSelected( int index )
       _tree->expandItem( index );
       _tree->collapseItem( index ); // 2002-01-30 LEW
     }
-    // tqrepaint();  // this doesn't work   2002-01-30 LEW
+    // repaint();  // this doesn't work   2002-01-30 LEW
     /* 2002-01-30 LEW: RG and I don't like this behavior */
 }
 
@@ -419,7 +419,7 @@ void KDatMainWindow::fileBackup()
     TQString msg = i18n("KDat will dump your files properly to tape, but may not be able\n"
                        "to restore them. To restore your files by hand, you need to know\n"
                        "the name of the *non-rewinding* version of your tape device %1.\n"
-			).tqarg(Options::instance()->getTapeDevice());
+			).arg(Options::instance()->getTapeDevice());
     TQString msg2 = i18n("For example, if your device is /dev/st0, the non-rewinding version\n"
                        "is /dev/nst0. If your device name doesn't look like that, type\n"
                        "\"ls -l %2\" in a terminal window to see the real name of your\n"
@@ -430,7 +430,7 @@ void KDatMainWindow::fileBackup()
                        "The third call to \"tar\" will retrieve your data into your\n"
                        "current directory. Please let us know if this happens to you!\n"
                        " - KDat Maintenance Team\n"
-			).tqarg(Options::instance()->getTapeDevice());
+			).arg(Options::instance()->getTapeDevice());
     msg = msg.append(msg2);
     KMessageBox::sorry( this, msg);
     /* 2002-01-28 LEW */
@@ -446,7 +446,7 @@ void KDatMainWindow::fileBackup()
         backupProfile.setRemoveSnapshot( bp->getRemoveSnapshot() );
     } else {
         TQString name;
-        name = i18n( "Archive created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) );
+        name = i18n( "Archive created on %1" ).arg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
         name = name.stripWhiteSpace();
 
         TQStringList files;
@@ -486,8 +486,8 @@ void KDatMainWindow::fileBackup()
             msg = i18n( "WARNING: The estimated archive size is %1 KB but "
                         "the tape has only %2 KB of space!\n"
                         "Back up anyway?" )
-              .tqarg(KGlobal::locale()->formatNumber(size, 0))
-              .tqarg(KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 ));
+              .arg(KGlobal::locale()->formatNumber(size, 0))
+              .arg(KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 ));
             int result = KMessageBox::warningContinueCancel( this,
                                msg, i18n("Backup"), i18n("Backup") );
             if ( result != KMessageBox::Continue) {
@@ -556,15 +556,15 @@ void KDatMainWindow::doVerify( bool restore )
     Archive* archive = 0;
     // Check for marked files first.
     for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) {
-        if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) ||
-             ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) {
-            archiveNode = (MountedArchiveNode*)_tapeDriveNode->tqchildAt( i );
+        if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) ||
+             ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) {
+            archiveNode = (MountedArchiveNode*)_tapeDriveNode->childAt( i );
             archive = archiveNode->getArchive();
 	    /* 2002-01-30 LEW */
 #ifdef DEBUG
 	    printf("KDatMainWindow::doVerify: %d node of %s: ", i,
 		   (SelectableNode*)_tapeDriveNode->getText().latin1() );
-            if( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ){
+            if( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ){
 	      printf("is completely selected\n");
             } else {
 	      printf("is partially selected\n");
@@ -600,7 +600,7 @@ void KDatMainWindow::doVerify( bool restore )
             ranges.addRange( it.current()->getStart(), it.current()->getEnd() );
         }
         if ( rangeableNode->isType( Node::MountedArchiveNodeType ) ) {
-            // Make sure the mounted archive node has populated its tqchildren.
+            // Make sure the mounted archive node has populated its children.
             archiveNode = (MountedArchiveNode*)rangeableNode;
             if ( archiveNode->childCount() == 0 ) {
                 bool dummy = TRUE;
@@ -608,10 +608,10 @@ void KDatMainWindow::doVerify( bool restore )
             }
 
             for ( int i = rangeableNode->childCount() - 1; i >= 0; i-- ) {
-                if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) {
-                    files.append( ((MountedTapeDirectoryNode*)rangeableNode->tqchildAt( i ))->getFullPath() );
-                } else if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeFileNodeType ) ) {
-                    files.append( ((MountedTapeFileNode*)rangeableNode->tqchildAt( i ))->getFullPath() );
+                if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) {
+                    files.append( ((MountedTapeDirectoryNode*)rangeableNode->childAt( i ))->getFullPath() );
+                } else if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeFileNodeType ) ) {
+                    files.append( ((MountedTapeFileNode*)rangeableNode->childAt( i ))->getFullPath() );
                 } else {
                     assert( FALSE );
                 }
@@ -627,14 +627,14 @@ void KDatMainWindow::doVerify( bool restore )
         // Compile a list of files to verify/restore.
         TQPtrStack<RangeableNode> stack;
 
-        // Make sure the mounted archive node has populated its tqchildren.
+        // Make sure the mounted archive node has populated its children.
         if ( archiveNode->childCount() == 0 ) {
             bool dummy = TRUE;
             archiveNode->expanding( dummy );
         }
 
         for ( int i = archiveNode->childCount() - 1; i >= 0; i-- ) {
-            stack.push( (RangeableNode*)archiveNode->tqchildAt( i ) );
+            stack.push( (RangeableNode*)archiveNode->childAt( i ) );
         }
         RangeableNode* sel = 0;
         while ( stack.count() > 0 ) {
@@ -654,7 +654,7 @@ void KDatMainWindow::doVerify( bool restore )
                 }
             } else if ( sel->hasSelectedChildren() ) {
                 for ( int i = sel->childCount() - 1; i >= 0; i-- ) {
-                    stack.push( (RangeableNode*)sel->tqchildAt( i ) );
+                    stack.push( (RangeableNode*)sel->childAt( i ) );
                 }
             }
         }
@@ -697,7 +697,7 @@ void KDatMainWindow::fileMountTape()
                "correct device is selected as the tape drive (e.g.\n"
                "/dev/st0). If you hear the tape drive moving, wait\n"
                "until it stops and then try mounting it again.")
-                 .tqarg(Options::instance()->getTapeDevice());
+                 .arg(Options::instance()->getTapeDevice());
 
     if ( !TapeManager::instance()->getMountedTape() ) {
         if ( Options::instance()->getLoadOnMount() ) {
@@ -727,7 +727,7 @@ void KDatMainWindow::fileIndexTape()
         IndexDlg dlg( TapeManager::instance()->getMountedTape(), this );
         if ( dlg.exec() == TQDialog::Accepted ) {
             TQString title;
-            title = i18n( "KDat: %1" ).tqarg( TapeManager::instance()->getMountedTape()->getName() );
+            title = i18n( "KDat: %1" ).arg( TapeManager::instance()->getMountedTape()->getName() );
             setCaption( title );
             setIconText( title );
 
@@ -776,7 +776,7 @@ void KDatMainWindow::fileDeleteArchive()
         }
 
         TQString msg =
-             i18n( "An archive cannot be removed from the middle of the tape. If\nthe archive '%1' is deleted then\nthe following archives will also be deleted:\n%2\n\nDelete all listed archives?" ).tqarg(archive->getName()).tqarg(list);
+             i18n( "An archive cannot be removed from the middle of the tape. If\nthe archive '%1' is deleted then\nthe following archives will also be deleted:\n%2\n\nDelete all listed archives?" ).arg(archive->getName()).arg(list);
         int result = KMessageBox::warningContinueCancel( this,
              msg, i18n("Delete Archive"), i18n("Delete All"));
         if (result == KMessageBox::Continue) {
@@ -790,7 +790,7 @@ void KDatMainWindow::fileDeleteArchive()
     } else {
         // This is the last (known) archive on the tape.
         TQString msg =
-             i18n( "Really delete the archive '%1'?" ).tqarg(archive->getName());
+             i18n( "Really delete the archive '%1'?" ).arg(archive->getName());
         int result = KMessageBox::warningContinueCancel( this,
                               msg, i18n("Delete Archive"), i18n("Delete"));
         if (result == KMessageBox::Continue) {
@@ -824,7 +824,7 @@ void KDatMainWindow::fileDeleteIndex()
     }
 
     TQString msg =
-         i18n( "Really delete the index for '%1'?" ).tqarg(tape->getName());
+         i18n( "Really delete the index for '%1'?" ).arg(tape->getName());
     int result = KMessageBox::warningContinueCancel( this,
                     msg, i18n("Delete Tape Index"), i18n("Delete"));
     if (result == KMessageBox::Continue) {
@@ -847,7 +847,7 @@ void KDatMainWindow::fileFormatTape()
                "correct device is selected as the tape drive (e.g.\n"
                "/dev/st0). If you hear the tape drive moving, wait\n"
                "until it stops and then try mounting it again.")
-                 .tqarg(Options::instance()->getTapeDevice());
+                 .arg(Options::instance()->getTapeDevice());
 
     if ( !TapeDrive::instance()->isTapePresent() ) {
         KMessageBox::sorry( this, msg );
@@ -865,7 +865,7 @@ void KDatMainWindow::fileFormatTape()
                      i18n("Format Tape"), i18n("Format"));
     if (result == KMessageBox::Continue ) {
         TQString name;
-        name = i18n( "Tape created on %1" ).tqarg(  KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) );
+        name = i18n( "Tape created on %1" ).arg(  KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
         FormatOptDlg dlg( name.stripWhiteSpace(), this );
         if ( dlg.exec() != TQDialog::Accepted ) {
             return;
@@ -898,7 +898,7 @@ void KDatMainWindow::fileNewBackupProfile()
     // Pick a unique name.
     TQString name;
     for ( int i = 1; ; i++ ) {
-        name = i18n( "Backup Profile %1").tqarg( i );
+        name = i18n( "Backup Profile %1").arg( i );
         TQStringList list = BackupProfileManager::instance()->getBackupProfileNames();
         TQStringList::Iterator it = list.begin();
         for ( ; it != list.end(); ++it ) {
@@ -946,7 +946,7 @@ void KDatMainWindow::fileDeleteBackupProfile()
     assert( backupProfile );
 
     TQString msg =
-         i18n("Really delete backup profile '%1'?").tqarg(backupProfile->getName());
+         i18n("Really delete backup profile '%1'?").arg(backupProfile->getName());
     int result = KMessageBox::warningContinueCancel( this,
                         msg, i18n("Delete Backup Profile"), i18n("Delete"));
     if (result == KMessageBox::Continue) {
@@ -1103,8 +1103,8 @@ int KDatMainWindow::calcBackupSize( const TQString& workingDir, bool local, cons
 	    if( stop_flag == TRUE ) break;
             TQString* path = dirStack.pop();
             msg = i18n("Estimating backup size: %1, %2" )
-             .tqarg(Util::kbytesToString( size / 2 ))
-             .tqarg(KStringHandler::csqueeze(*path, 60));
+             .arg(Util::kbytesToString( size / 2 ))
+             .arg(KStringHandler::csqueeze(*path, 60));
             status( msg );
             KApplication::kApplication()->processEvents();
             dir.setPath( *path );
@@ -1165,7 +1165,7 @@ void KDatMainWindow::getBackupFiles( TQStringList& files )
                 files.append( sel->getFullPath() );
             } else if ( sel->hasSelectedChildren() ) {
                 for ( int i = sel->childCount() - 1; i >= 0; i-- ) {
-                    stack.push( (ArchiveableNode*)sel->tqchildAt( i ) );
+                    stack.push( (ArchiveableNode*)sel->childAt( i ) );
                 }
             }
         }
@@ -1192,9 +1192,9 @@ void KDatMainWindow::setBackupFiles( const TQStringList& files )
                 }
                 int i;
                 for ( i = n->childCount() - 1; i >=0; i-- ) {
-                    tmp = ((ArchiveableNode*)n->tqchildAt( i ))->getFullPath();
+                    tmp = ((ArchiveableNode*)n->childAt( i ))->getFullPath();
                     if ( tmp == (*it).left( tmp.length() ) ) {
-                        n = (ArchiveableNode*)n->tqchildAt( i );
+                        n = (ArchiveableNode*)n->childAt( i );
                         break;
                     }
                 }
@@ -1232,7 +1232,7 @@ void KDatMainWindow::configureUI( Tape* tape )
     // Title bar
     if ( tape ) {
         TQString title;
-        title = i18n( "KDat: %1" ).tqarg(tape->getName());
+        title = i18n( "KDat: %1" ).arg(tape->getName());
         setCaption( title );
         setIconText( title );
     } else {
@@ -1251,8 +1251,8 @@ void KDatMainWindow::configureUI( Tape* tape )
     bool canRestore = ( tape ) && ( sel ) && sel->isType( Node::RangeableNodeType );
     if ( !canRestore ) {
         for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) {
-            if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) ||
-                 ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) {
+            if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) ||
+                 ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) {
                 canRestore = TRUE;
                 break;
             }
@@ -1348,7 +1348,7 @@ void KDatMainWindow::create_backup_dialog()
   _lbl->setGeometry( TQRect( 30, 20, 350, 200 ) );
 
   _cancel = new KPushButton( KStdGuiItem::cancel(), _backupdialog );
-  _cancel->setFixedSize( 80, _cancel->tqsizeHint().height() );
+  _cancel->setFixedSize( 80, _cancel->sizeHint().height() );
   _cancel->setEnabled( TRUE );
   /* 2002-01-24 LEW: looks like we can't increase the button width
      to accomodate a wider message :( */
@@ -1357,7 +1357,7 @@ void KDatMainWindow::create_backup_dialog()
   connect( _cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupCancel() ) );
 
   _continue = new KPushButton( KStdGuiItem::cont(), _backupdialog );
-  _continue->setFixedSize( 80, _continue->tqsizeHint().height() );
+  _continue->setFixedSize( 80, _continue->sizeHint().height() );
   _continue->setEnabled( TRUE );
   _continue->setDefault( TRUE );
   //  _continue->setGeometry( TQRect( 200, 170, 0, 0 ) );   /* 2002-01-28 LEW */
diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp
index 3505dfb..a5c097a 100644
--- a/kdat/LoggerWidget.cpp
+++ b/kdat/LoggerWidget.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 
 #include <kapplication.h>
@@ -33,7 +33,7 @@ LoggerWidget::LoggerWidget( const TQString & title, TQWidget* parent, const char
         : TQWidget( parent, name )
 {
     TQLabel* lbl1 = new TQLabel( title, this );
-    lbl1->setFixedHeight( lbl1->tqsizeHint().height() );
+    lbl1->setFixedHeight( lbl1->sizeHint().height() );
 
     _mle = new TQMultiLineEdit( this );
     _mle->setReadOnly( TRUE );
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index 006e978..cfc0610 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -58,7 +58,7 @@ void Node::insertNode( Node* child )
     if ( lastParent != this ) {
         // Recompute lastDirIndex.
         for ( lastDirIndex = 0;
-              ( lastDirIndex < childCount() ) && ( ((Node*)tqchildAt( lastDirIndex ))->getType() == TapeDirectoryNodeType );
+              ( lastDirIndex < childCount() ) && ( ((Node*)childAt( lastDirIndex ))->getType() == TapeDirectoryNodeType );
               lastDirIndex++ );
         lastParent = this;
     }
@@ -83,7 +83,7 @@ void Node::insertNode( Node* child )
     while ( min < max ) {
         mid = ( max - min ) / 2 + min;
         //mid = ( min + max ) / 2;
-        if ( child->getText().compare( tqchildAt( mid )->getText() ) < 0 ) {
+        if ( child->getText().compare( childAt( mid )->getText() ) < 0 ) {
             max = mid - 1;
         } else {
             min = mid + 1;
@@ -94,8 +94,8 @@ void Node::insertNode( Node* child )
         // KLUDGE!
         mid -= 5;
         if ( mid < smin ) mid = smin;
-        if ( ((Node*)tqchildAt( mid ))->getType() != child->getType() ) mid++;
-        for ( ; ( mid <= smax ) && ( child->getText().compare( tqchildAt( mid )->getText() ) > 0 ); mid++ );
+        if ( ((Node*)childAt( mid ))->getType() != child->getType() ) mid++;
+        for ( ; ( mid <= smax ) && ( child->getText().compare( childAt( mid )->getText() ) > 0 ); mid++ );
         //printf( "index = %d, text = '%s'\n", mid, child->getText().data() );
         insertChild( mid, child );
     } else {
@@ -181,14 +181,14 @@ bool TapeNode::validate()
     // Remove deleted archives.
     Archive* a;
     for ( uint j = 0; j < childCount(); ) {
-        a = ((ArchiveNode*)tqchildAt( j ))->getArchive();
+        a = ((ArchiveNode*)childAt( j ))->getArchive();
         for ( i.toFirst(); i.current(); ++i ) {
             if ( i.current() == a ) {
                 break;
             }
         }
         if ( !i.current() ) {
-            removeChild( tqchildAt( j ) );
+            removeChild( childAt( j ) );
         } else {
             j++;
         }
@@ -211,7 +211,7 @@ void TapeNode::expanding( bool expand )
     expand = TRUE;
 
     if ( childCount() > 0 ) {
-        // We already have the tqchildren added
+        // We already have the children added
         return;
     }
 
@@ -235,8 +235,8 @@ ArchiveNode* TapeNode::findArchiveNode( Archive* archive )
 {
     ArchiveNode* n = 0;
     for ( uint i = 0; i < childCount(); i++ ) {
-        if ( ((ArchiveNode*)tqchildAt( i ))->getArchive() == archive ) {
-            n = (ArchiveNode*)tqchildAt( i );
+        if ( ((ArchiveNode*)childAt( i ))->getArchive() == archive ) {
+            n = (ArchiveNode*)childAt( i );
             break;
         }
     }
@@ -280,7 +280,7 @@ void ArchiveNode::expanding( bool expand )
     expand = TRUE;
 
     if ( childCount() > 0 ) {
-        // We already have the tqchildren added.
+        // We already have the children added.
         return;
     }
 
@@ -338,7 +338,7 @@ void TapeDirectoryNode::expanding( bool expand )
     expand = TRUE;
 
     if ( childCount() > 0 ) {
-        // We already have the tqchildren added.
+        // We already have the children added.
         return;
     }
 
@@ -411,7 +411,7 @@ void SelectableNode::doUpdateState()
     bool hasSelected = FALSE;
     bool allSelected = TRUE;
     for ( uint i = 0; i < childCount(); i++ ) {
-        switch ( ((SelectableNode*)tqchildAt( i ))->_state ) {
+        switch ( ((SelectableNode*)childAt( i ))->_state ) {
             case SelAll:
                 oneSelected = TRUE;
                 hasSelected = TRUE;
@@ -443,15 +443,15 @@ void SelectableNode::doUpdateState()
 
 void SelectableNode::doSetSelected( bool select )
 {
-    // All my tqchildren get the same selection state.
+    // All my children get the same selection state.
     for ( uint i = 0; i < childCount(); i++ ) {
         if ( select ) {
-            if ( !((SelectableNode*)tqchildAt( i ))->isSelected() ) {
-                ((SelectableNode*)tqchildAt( i ))->doSetSelected( TRUE );
+            if ( !((SelectableNode*)childAt( i ))->isSelected() ) {
+                ((SelectableNode*)childAt( i ))->doSetSelected( TRUE );
             }
         } else {
-            if ( ((SelectableNode*)tqchildAt( i ))->isSelected() || ((SelectableNode*)tqchildAt( i ))->hasSelectedChildren() ) {
-                ((SelectableNode*)tqchildAt( i ))->doSetSelected( FALSE );
+            if ( ((SelectableNode*)childAt( i ))->isSelected() || ((SelectableNode*)childAt( i ))->hasSelectedChildren() ) {
+                ((SelectableNode*)childAt( i ))->doSetSelected( FALSE );
             }
         }
     }
@@ -549,7 +549,7 @@ void SelectableNode::paintText( TQPainter* p, int indent, int cellHeight,
 			       p->fontMetrics().leading()) / 2);
     if (highlighted) {
 	paintHighlight(p, indent, cg, owner->hasFocus(),
-                (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
+                (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
 	p->setPen(cg.base());
 	p->setBackgroundColor(cg.text());
     }
@@ -605,7 +605,7 @@ void SelectableNode::setSelected( bool select )
         ((SelectableNode*)getParent())->doUpdateState();
     }
 
-    owner->tqrepaint();
+    owner->repaint();
 
     KDatMainWindow::getInstance()->configureUI( TapeManager::instance()->getMountedTape() );
 }
@@ -657,8 +657,8 @@ void MountedArchiveNode::setSelected( bool select )
         // Deselect all other archives.
         Node* parent = (Node*)getParent();
         for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
-            if ( parent->tqchildAt( i ) != this ) {
-                ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
+            if ( parent->childAt( i ) != this ) {
+                ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
             }
         }
     }
@@ -680,7 +680,7 @@ void MountedArchiveNode::expanding( bool expand )
     expand = TRUE;
 
     if ( childCount() > 0 ) {
-        // We already have the tqchildren added.
+        // We already have the children added.
         return;
     }
 
@@ -757,8 +757,8 @@ void MountedTapeDirectoryNode::setSelected( bool select )
             parent = (Node*)parent->getParent();
         }
         for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
-            if ( parent->tqchildAt( i ) != arcNode ) {
-                ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
+            if ( parent->childAt( i ) != arcNode ) {
+                ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
             }
         }
     }
@@ -780,7 +780,7 @@ void MountedTapeDirectoryNode::expanding( bool expand )
     expand = TRUE;
 
     if ( childCount() > 0 ) {
-        // We already have the tqchildren added.
+        // We already have the children added.
         return;
     }
 
@@ -863,8 +863,8 @@ void MountedTapeFileNode::setSelected( bool select )
             parent = (Node*)parent->getParent();
         }
         for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
-            if ( parent->tqchildAt( i ) != arcNode ) {
-                ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE );
+            if ( parent->childAt( i ) != arcNode ) {
+                ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
             }
         }
     }
@@ -934,7 +934,7 @@ void RootNode::expanding( bool expand )
 {
     expand = TRUE;
 
-    // If we already have some tqchildren, check to see if the directory has been modified.
+    // If we already have some children, check to see if the directory has been modified.
     if ( childCount() > 0 ) {
         struct stat statinfo;
         if ( stat( "/", &statinfo ) < 0 ) {
@@ -950,7 +950,7 @@ void RootNode::expanding( bool expand )
 
         _mtime = statinfo.st_mtime;
 
-        // Remove all the tqchildren.
+        // Remove all the children.
         Node* n;
         while ( ( n = (Node*)getChild() ) ) {
             removeChild( n );
@@ -975,7 +975,7 @@ void RootNode::expanding( bool expand )
             return;
         }
 
-        // Fill in the child's tqchildren.
+        // Fill in the child's children.
         const TQFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
         if ( list ) {
             TQFileInfoListIterator it( *list );
@@ -1050,7 +1050,7 @@ void DirectoryNode::expanding( bool expand )
     }
     path.prepend( "/" );
 
-    // If we already have some tqchildren, check to see if the directory has been modified.
+    // If we already have some children, check to see if the directory has been modified.
     if ( childCount() > 0 ) {
         struct stat statinfo;
         if ( stat( TQFile::encodeName(path), &statinfo ) < 0 ) {
@@ -1066,7 +1066,7 @@ void DirectoryNode::expanding( bool expand )
 
         _mtime = statinfo.st_mtime;
 
-        // Remove all the tqchildren.
+        // Remove all the children.
         Node* n;
         while ( ( n = (Node*)getChild() ) ) {
             removeChild( n );
@@ -1091,7 +1091,7 @@ void DirectoryNode::expanding( bool expand )
             return;
         }
 
-        // Fill in the child's tqchildren.
+        // Fill in the child's children.
         const TQFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
         if ( list ) {
             TQFileInfoListIterator it( *list );
@@ -1210,7 +1210,7 @@ void TapeDriveNode::expanding( bool expand )
     expand = TRUE;
 
     if ( childCount() > 0 ) {
-        // We already have the tqchildren added
+        // We already have the children added
         return;
     }
 
@@ -1254,7 +1254,7 @@ void TapeDriveNode::slotTapeUnmounted()
     setPixmap( *ImageCache::instance()->getTapeUnmounted() );
     setText( i18n( "<no tape>" ) );
 
-    // Remove all the tqchildren.
+    // Remove all the children.
     Node* n;
     while ( ( n = (Node*)getChild() ) ) {
         Node::removeChild( n );
@@ -1304,14 +1304,14 @@ void TapeDriveNode::slotTapeModified( Tape* tape )
     // Remove deleted archives.
     Archive* a;
     for ( uint j = 0; j < childCount(); ) {
-        a = ((MountedArchiveNode*)tqchildAt( j ))->getArchive();
+        a = ((MountedArchiveNode*)childAt( j ))->getArchive();
         for ( i.toFirst(); i.current(); ++i ) {
             if ( i.current() == a ) {
                 break;
             }
         }
         if ( !i.current() ) {
-            Node::removeChild( tqchildAt( j ) );
+            Node::removeChild( childAt( j ) );
         } else {
             j++;
         }
@@ -1322,8 +1322,8 @@ MountedArchiveNode* TapeDriveNode::findArchiveNode( Archive* archive )
 {
     MountedArchiveNode* n = 0;
     for ( uint i = 0; i < childCount(); i++ ) {
-        if ( ((MountedArchiveNode*)tqchildAt( i ))->getArchive() == archive ) {
-            n = (MountedArchiveNode*)tqchildAt( i );
+        if ( ((MountedArchiveNode*)childAt( i ))->getArchive() == archive ) {
+            n = (MountedArchiveNode*)childAt( i );
             break;
         }
     }
@@ -1417,7 +1417,7 @@ TapeNode* TapeIndexRootNode::findTapeNode( Tape* tape )
 {
     TapeNode* n = 0;
     for ( uint i = 0; i < childCount(); i++ ) {
-        n = (TapeNode*)tqchildAt( i );
+        n = (TapeNode*)childAt( i );
         if ( n->getTape() == tape ) {
             return n;
         }
@@ -1575,7 +1575,7 @@ BackupProfileNode* BackupProfileRootNode::findBackupProfileNode( BackupProfile*
 {
     BackupProfileNode* n = 0;
     for ( uint i = 0; i < childCount(); i++ ) {
-        n = (BackupProfileNode*)tqchildAt( i );
+        n = (BackupProfileNode*)childAt( i );
         if ( n->getBackupProfile() == backupProfile ) {
             return n;
         }
diff --git a/kdat/Node.h b/kdat/Node.h
index d2d0c26..2caa24b 100644
--- a/kdat/Node.h
+++ b/kdat/Node.h
@@ -90,7 +90,7 @@ public:
 
     /**
      * This method is called immediately before the node is to be expanded.
-     * This method can be used to fill in the tqchildren of this node, or
+     * This method can be used to fill in the children of this node, or
      * prevent the node from expanding.  The default implementation does
      * nothing.
      *
@@ -359,7 +359,7 @@ public:
     virtual bool isType( int type );
 
     /**
-     * Determine whether the node and all of its tqchildren are selected.
+     * Determine whether the node and all of its children are selected.
      *
      * @return TRUE if the node is selected, otherwise FALSE.
      */
@@ -373,7 +373,7 @@ public:
     bool hasSelectedChildren();
 
     /**
-     * Select/deselect this node and all of its tqchildren.
+     * Select/deselect this node and all of its children.
      *
      * @param selected TRUE means the node will be selected, FALSE means the
      *                 node will be deselected.
@@ -445,7 +445,7 @@ public:
     virtual const TQPtrList<Range>& getRanges();
 
     /**
-     * Select/deselect this node and all of its tqchildren.
+     * Select/deselect this node and all of its children.
      *
      * @param selected TRUE means the node will be selected, FALSE means the
      *                 node will be deselected.
@@ -516,7 +516,7 @@ public:
     virtual const TQPtrList<Range>& getRanges();
 
     /**
-     * Select/deselect this node and all of its tqchildren.
+     * Select/deselect this node and all of its children.
      *
      * @param selected TRUE means the node will be selected, FALSE means the
      *                 node will be deselected.
@@ -596,7 +596,7 @@ public:
     virtual const TQPtrList<Range>& getRanges();
 
     /**
-     * Select/deselect this node and all of its tqchildren.
+     * Select/deselect this node and all of its children.
      *
      * @param selected TRUE means the node will be selected, FALSE means the
      *                 node will be deselected.
@@ -863,7 +863,7 @@ public slots:
 
     /**
      * Locate the child associated with the modified tape index, and make sure
-     * that the displayed information (including all tqchildren) is updated.
+     * that the displayed information (including all children) is updated.
      *
      * @param tape A pointer to the tape index that was modified.
      */
@@ -924,7 +924,7 @@ public slots:
 
     /**
      * Locate the child associated with the modified tape index, and make sure
-     * that the displayed information (including all tqchildren) is updated.
+     * that the displayed information (including all children) is updated.
      *
      * @param tape A pointer to the tape index that was modified.
      */
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index aaa9348..c5c9583 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -22,7 +22,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -33,7 +33,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -43,7 +43,7 @@
                             <property name="name">
                                 <cstring>_defaultTapeSize</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>96</width>
                                     <height>0</height>
@@ -60,7 +60,7 @@
                             <property name="name">
                                 <cstring>_tapeBlockSize</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>96</width>
                                     <height>0</height>
@@ -128,7 +128,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -283,7 +283,7 @@ You must still specify the block size.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/kdat/Tape.cpp b/kdat/Tape.cpp
index 1f762c3..ff35d1a 100644
--- a/kdat/Tape.cpp
+++ b/kdat/Tape.cpp
@@ -216,7 +216,7 @@ void Tape::read()
         default:
         {
             KMessageBox::sorry( KDatMainWindow::getInstance(), 
-                i18n( "The tape index file format is version %d. The index cannot be read by this version of KDat. Perhaps the tape index file was created by a newer version of KDat?" ).tqarg(version ),
+                i18n( "The tape index file format is version %d. The index cannot be read by this version of KDat. Perhaps the tape index file was created by a newer version of KDat?" ).arg(version ),
                 i18n("Tape Index") );
         }
     }
@@ -226,7 +226,7 @@ void Tape::readAll( int version )
 {
     read();
 
-    TQPtrListIterator<Archive> i( _tqchildren );
+    TQPtrListIterator<Archive> i( _children );
     for ( ; i.current(); ++i ) {
         i.current()->readAll( version );
     }
@@ -282,7 +282,7 @@ void Tape::write()
     memset( buf, 0, 4096 );
     memcpy( buf, _name.ascii(), _name.length() > 4095 ? 4095 : _name.length() );
     fwrite( buf, sizeof( char ), 4096, _fptr );
-    int ival = _tqchildren.count();
+    int ival = _children.count();
     fwrite( &ival, sizeof( ival ), 1, _fptr );
 
     // Fill in the archive offsets later...
@@ -292,7 +292,7 @@ void Tape::write()
     }
 
     //===== Write archives =====
-    TQPtrListIterator<Archive> i( _tqchildren );
+    TQPtrListIterator<Archive> i( _children );
     int count = 0;
     for ( ; i.current(); ++i, count++ ) {
         // Fill in the file offset.
@@ -346,7 +346,7 @@ const TQPtrList<Archive>& Tape::getChildren()
 {
     read();
 
-    return _tqchildren;
+    return _children;
 }
 
 void Tape::setName( const TQString & name )
@@ -528,7 +528,7 @@ void Tape::addChild( Archive* archive )
 
     archive->calcRanges();
 
-    _tqchildren.append( archive );
+    _children.append( archive );
 
     char buf[4096];
     fseek( _fptr, 0, SEEK_END );
@@ -537,9 +537,9 @@ void Tape::addChild( Archive* archive )
     fgets( buf, 4096, _fptr );
     fgets( buf, 4096, _fptr );
     fseek( _fptr, 12 + 4096, SEEK_CUR );
-    int ival = _tqchildren.count();
+    int ival = _children.count();
     fwrite( &ival, sizeof( ival ), 1, _fptr );
-    fseek( _fptr, ( _tqchildren.count() - 1 ) * 4, SEEK_CUR );
+    fseek( _fptr, ( _children.count() - 1 ) * 4, SEEK_CUR );
     fwrite( &here, sizeof( here ), 1, _fptr );
     fseek( _fptr, here, SEEK_SET );
     archive->write( _fptr );
@@ -559,21 +559,21 @@ void Tape::removeChild( Archive* archive )
 {
     read();
 
-    while ( _tqchildren.last() != archive ) {
-        _tqchildren.removeLast();
+    while ( _children.last() != archive ) {
+        _children.removeLast();
     }
-    _tqchildren.removeLast();
+    _children.removeLast();
 
     char buf[4096];
     fseek( _fptr, 0, SEEK_SET );
     fgets( buf, 4096, _fptr );
     fgets( buf, 4096, _fptr );
     fseek( _fptr, 12 + 4096, SEEK_CUR );
-    int ival = _tqchildren.count();
+    int ival = _children.count();
     fwrite( &ival, sizeof( ival ), 1, _fptr );
     int here;
     if ( ival > 0 ) {
-        fseek( _fptr, _tqchildren.count() * 4, SEEK_CUR );
+        fseek( _fptr, _children.count() * 4, SEEK_CUR );
         fread( &here, sizeof( here ), 1, _fptr );
     } else {
         fseek( _fptr, MAX_NUM_ARCHIVES * 4, SEEK_CUR );
@@ -593,13 +593,13 @@ void Tape::removeChild( Archive* archive )
 
 void Tape::clear()
 {
-    if ( _tqchildren.count() < 1 ) {
+    if ( _children.count() < 1 ) {
         return;
     }
 
-    while ( _tqchildren.first() ) {
-        delete _tqchildren.first();
-        _tqchildren.removeFirst();
+    while ( _children.first() ) {
+        delete _children.first();
+        _children.removeFirst();
     }
 
     char buf[4096];
@@ -607,7 +607,7 @@ void Tape::clear()
     fgets( buf, 4096, _fptr );
     fgets( buf, 4096, _fptr );
     fseek( _fptr, 12 + 4096, SEEK_CUR );
-    int ival = _tqchildren.count();
+    int ival = _children.count();
     fwrite( &ival, sizeof( ival ), 1, _fptr );
     fseek( _fptr, MAX_NUM_ARCHIVES * 4, SEEK_CUR );
     int here = ftell( _fptr );
@@ -711,7 +711,7 @@ void Tape::readVersion1Index( FILE* fptr )
         Archive* archive = new Archive( this, archiveTimeStamp, archiveName );
         archive->setEndBlock( archiveEndBlock - archiveStartBlock );
 
-        _tqchildren.append( archive );
+        _children.append( archive );
 
         // Read the number of files.
         if ( !fgets( buf, 4096, fptr ) ) {
@@ -827,7 +827,7 @@ void Tape::readVersion2Index( FILE* fptr )
     int ival;
     for ( ; numArchives; numArchives-- ) {
         fread( &ival, sizeof( ival ), 1, fptr );
-        _tqchildren.append( new Archive( this, fptr, ival ) );
+        _children.append( new Archive( this, fptr, ival ) );
     }
 }
 
@@ -870,7 +870,7 @@ void Tape::readVersion3Index( FILE* fptr )
     int ival;
     for ( ; numArchives; numArchives-- ) {
         fread( &ival, sizeof( ival ), 1, fptr );
-        _tqchildren.append( new Archive( this, fptr, ival ) );
+        _children.append( new Archive( this, fptr, ival ) );
     }
 }
 
@@ -913,7 +913,7 @@ void Tape::readVersion4Index( FILE* fptr )
     int ival;
     for ( ; numArchives; numArchives-- ) {
         fread( &ival, sizeof( ival ), 1, fptr );
-        _tqchildren.append( new Archive( this, fptr, ival ) );
+        _children.append( new Archive( this, fptr, ival ) );
     }
 
     /* 2002-01-31 LEW */
diff --git a/kdat/Tape.h b/kdat/Tape.h
index 153561e..335619c 100644
--- a/kdat/Tape.h
+++ b/kdat/Tape.h
@@ -34,7 +34,7 @@ class Tape {
     int            _mtime;
     TQString        _name;
     int            _size;
-    TQPtrList<Archive> _tqchildren;
+    TQPtrList<Archive> _children;
 
     FILE* _fptr;
 
@@ -148,7 +148,7 @@ public:
     void removeChild( Archive* archive );
 
     /**
-     * Recursively destroy all tqchildren of the tape index.
+     * Recursively destroy all children of the tape index.
      */
     void clear();
 };
diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp
index 4fbcb25..2e4c59b 100644
--- a/kdat/TapeDrive.cpp
+++ b/kdat/TapeDrive.cpp
@@ -170,15 +170,15 @@ bool TapeDrive::isTapePresent()
     }
 
     // Get tape status.
-    struct mtget tapetqStatus;
-    int ret = ioctl( _fd, MTIOCGET, &tapetqStatus );
+    struct mtget tapeStatus;
+    int ret = ioctl( _fd, MTIOCGET, &tapeStatus );
     if ( ret < 0 ) {
         return FALSE;
     }
 
     // Check for the presence of a tape.
-//    if ( !GMT_DR_OPEN( tapetqStatus.mt_gstat ) ) {
-    if ( GMT_ONLINE( tapetqStatus.mt_gstat ) ) {
+//    if ( !GMT_DR_OPEN( tapeStatus.mt_gstat ) ) {
+    if ( GMT_ONLINE( tapeStatus.mt_gstat ) ) {
         // Lock the tape drive door.
         //struct mtop tapeOp;
         //tapeOp.mt_op    = MTLOCK;
@@ -189,9 +189,9 @@ bool TapeDrive::isTapePresent()
         //}
 
         if ( _readOnly ) {
-            emit sigtqStatus( i18n( "Tape mounted readonly." ) );
+            emit sigStatus( i18n( "Tape mounted readonly." ) );
         } else {
-            emit sigtqStatus( i18n( "Tape mounted read/write." ) );
+            emit sigStatus( i18n( "Tape mounted read/write." ) );
         }
         return TRUE;
     } else {
@@ -221,14 +221,14 @@ Tape* TapeDrive::readHeader()
     _tape = NULL;
     
     // Rewind tape.
-    emit sigtqStatus( "Rewinding tape..." );
+    emit sigStatus( "Rewinding tape..." );
     if ( !rewind() ) {
         KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Rewinding tape failed." ));
         return NULL;
     }
 
     // KDat magic string.
-    emit sigtqStatus( i18n( "Reading magic string..." ) );
+    emit sigStatus( i18n( "Reading magic string..." ) );
     char magic[9];
     if ( read( magic, 9 ) < 9 ) {
         KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading magic string failed." ));
@@ -240,7 +240,7 @@ Tape* TapeDrive::readHeader()
     }
 
     // Read version number.
-    emit sigtqStatus( i18n( "Reading version number..." ) );
+    emit sigStatus( i18n( "Reading version number..." ) );
     int version;
     if ( read( (char*)&version, 4 ) < 4 ) {
         KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading version number failed." ));
@@ -252,7 +252,7 @@ Tape* TapeDrive::readHeader()
     }
 
     // Read tape ID.
-    emit sigtqStatus( i18n( "Reading tape ID..." ) );
+    emit sigStatus( i18n( "Reading tape ID..." ) );
     int len;
     if ( read( (char*)&len, 4 ) < 4 ) {
         KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading tape ID length failed." ));
@@ -517,12 +517,12 @@ bool TapeDrive::seek( int file, int tarBlock )
     flush();
 
     // Go to the desired archive.
-    emit sigtqStatus( i18n( "Skipping to archive..." ) );
+    emit sigStatus( i18n( "Skipping to archive..." ) );
 
     int curFile = getFile();
 //    printf( "TapeDrive::seek() -- curFile = %d\n", curFile );
     if ( curFile < 0 ) {
-        emit sigtqStatus( i18n( "Rewinding tape..." ) );
+        emit sigStatus( i18n( "Rewinding tape..." ) );
         rewind();
         curFile = 0;
     }
@@ -539,11 +539,11 @@ bool TapeDrive::seek( int file, int tarBlock )
 //    printf( "TapeDrive::seek() -- desired tapeBlock = %d\n", tapeBlock );
 
     // Go to the desired record within the archive.
-    emit sigtqStatus( i18n( "Skipping to block..." ) );
+    emit sigStatus( i18n( "Skipping to block..." ) );
     int curBlock = getBlock();
 //    printf( "TapeDrive::seek() -- curBlock = %d\n", curBlock );
     if ( curBlock < 0 ) {
-        emit sigtqStatus( i18n( "Rewinding tape..." ) );
+        emit sigStatus( i18n( "Rewinding tape..." ) );
         rewind();
         nextFile( file );
         if ( ( curBlock = getBlock() ) < 0 ) {
@@ -597,13 +597,13 @@ bool TapeDrive::pastEOF()
         return FALSE;
     }
 
-    struct mtget tapetqStatus;
-    if ( ioctl( _fd, MTIOCGET, &tapetqStatus ) < 0 ) {
+    struct mtget tapeStatus;
+    if ( ioctl( _fd, MTIOCGET, &tapeStatus ) < 0 ) {
         printf( "TapeDrive::pastEOF() -- ioctl( MTIOCGET ) failed!\n" );
         return FALSE;
     }
 
-    return GMT_EOF( tapetqStatus.mt_gstat );
+    return GMT_EOF( tapeStatus.mt_gstat );
 }
 
 bool TapeDrive::setBlockSize( int blockSize )
diff --git a/kdat/TapeDrive.h b/kdat/TapeDrive.h
index 06a0b82..7e49aa2 100644
--- a/kdat/TapeDrive.h
+++ b/kdat/TapeDrive.h
@@ -242,7 +242,7 @@ signals:
      *
      * @param msg The informational message.
      */
-    void sigtqStatus( const TQString & msg );
+    void sigStatus( const TQString & msg );
 };
 
 #endif
diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp
index 2a87862..96e7023 100644
--- a/kdat/TapeFileInfoWidget.cpp
+++ b/kdat/TapeFileInfoWidget.cpp
@@ -19,7 +19,7 @@
 #include <time.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kapplication.h>
 
@@ -39,32 +39,32 @@ TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* parent, const char* name )
     TQLabel* lbl4 = new TQLabel( i18n( "Start record:" ), this );
     TQLabel* lbl5 = new TQLabel( i18n( "End record:" ), this );
 
-    int max = lbl1->tqsizeHint().width();
-    if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
-    if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
-    if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
-    if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
+    int max = lbl1->sizeHint().width();
+    if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+    if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
+    if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
+    if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
 
-    lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
-    lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
-    lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
-    lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
-    lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
+    lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+    lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+    lbl3->setFixedSize( max, lbl3->sizeHint().height() );
+    lbl4->setFixedSize( max, lbl4->sizeHint().height() );
+    lbl5->setFixedSize( max, lbl5->sizeHint().height() );
 
     _fileName = new TQLabel( "???", this );
-    _fileName->setFixedHeight( _fileName->tqsizeHint().height() );
+    _fileName->setFixedHeight( _fileName->sizeHint().height() );
 
     _mtime = new TQLabel( "???", this );
-    _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
+    _mtime->setFixedHeight( _mtime->sizeHint().height() );
 
     _size = new TQLabel( "???", this );
-    _size->setFixedHeight( _size->tqsizeHint().height() );
+    _size->setFixedHeight( _size->sizeHint().height() );
 
     _startRecord = new TQLabel( "???", this );
-    _startRecord->setFixedHeight( _startRecord->tqsizeHint().height() );
+    _startRecord->setFixedHeight( _startRecord->sizeHint().height() );
 
     _endRecord = new TQLabel( "???", this );
-    _endRecord->setFixedHeight( _endRecord->tqsizeHint().height() );
+    _endRecord->setFixedHeight( _endRecord->sizeHint().height() );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
 
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index 3e94ae8..4d0801e 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 #include <kapplication.h>
@@ -49,50 +49,50 @@ TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name )
     TQLabel* lbl6 = new TQLabel( i18n( "Archive count:" ), this );
     TQLabel* lbl7 = new TQLabel( i18n( "Space used:" ), this );
 
-    int max = lbl1->tqsizeHint().width();
-    if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
-    if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
-    if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
-    if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
-    if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width();
-    if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width();
-
-    lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
-    lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
-    lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
-    lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
-    lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
-    lbl6->setFixedSize( max, lbl6->tqsizeHint().height() );
-    lbl7->setFixedSize( max, lbl7->tqsizeHint().height() );
+    int max = lbl1->sizeHint().width();
+    if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+    if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
+    if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
+    if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
+    if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width();
+    if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width();
+
+    lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+    lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+    lbl3->setFixedSize( max, lbl3->sizeHint().height() );
+    lbl4->setFixedSize( max, lbl4->sizeHint().height() );
+    lbl5->setFixedSize( max, lbl5->sizeHint().height() );
+    lbl6->setFixedSize( max, lbl6->sizeHint().height() );
+    lbl7->setFixedSize( max, lbl7->sizeHint().height() );
 
     _tapeName = new TQLineEdit( this );
-    _tapeName->setFixedHeight( _tapeName->tqsizeHint().height() );
+    _tapeName->setFixedHeight( _tapeName->sizeHint().height() );
 
     _tapeSize = new TQLineEdit( this );
-    _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() );
+    _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() );
 
     _tapeSizeUnits = new TQComboBox( this );
-    _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() );
+    _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() );
     _tapeSizeUnits->insertItem( "MB" );
     _tapeSizeUnits->insertItem( "GB" );
 
     _tapeID = new TQLabel( "???", this );
-    _tapeID->setFixedHeight( _tapeID->tqsizeHint().height() );
+    _tapeID->setFixedHeight( _tapeID->sizeHint().height() );
 
     _ctime = new TQLabel( "???", this );
-    _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
+    _ctime->setFixedHeight( _ctime->sizeHint().height() );
 
     _mtime = new TQLabel( "???", this );
-    _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
+    _mtime->setFixedHeight( _mtime->sizeHint().height() );
 
     _archiveCount = new TQLabel( "???", this );
-    _archiveCount->setFixedHeight( _archiveCount->tqsizeHint().height() );
+    _archiveCount->setFixedHeight( _archiveCount->sizeHint().height() );
 
     _spaceUsed = new TQLabel( "???", this );
-    _spaceUsed->setFixedHeight( _spaceUsed->tqsizeHint().height() );
+    _spaceUsed->setFixedHeight( _spaceUsed->sizeHint().height() );
 
     _apply = new KPushButton( KStdGuiItem::apply(), this );
-    _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
+    _apply->setFixedSize( 80, _apply->sizeHint().height() );
     _apply->setEnabled( FALSE );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
@@ -202,10 +202,10 @@ void TapeInfoWidget::setTape( Tape* tape )
         used *= blockSize / 1024;
     }
     if ( _tape->getSize() > 0 ) {
-        tmp = TQString::tqfromLatin1( "%1 / %2 (%3%)")
-          .tqarg(Util::kbytesToString( used ))
-          .tqarg(Util::kbytesToString( _tape->getSize() ))
-          .tqarg(used * 100 / _tape->getSize() );
+        tmp = TQString::fromLatin1( "%1 / %2 (%3%)")
+          .arg(Util::kbytesToString( used ))
+          .arg(Util::kbytesToString( _tape->getSize() ))
+          .arg(used * 100 / _tape->getSize() );
     } else {
         tmp = Util::kbytesToString( used );
     }
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index 209c177..45b727c 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -25,7 +25,7 @@
 #include <stdio.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfile.h>
 
 #include <kapplication.h>
@@ -89,46 +89,46 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList&
     f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 
     TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
-    lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
+    lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
 
     _elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
-    _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
+    _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
 
     TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 );
-    lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
+    lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
 
     _timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 );
-    _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() );
+    _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
 
     TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 );
-    lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
+    lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
 
     TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( _archiveSize ), f1 );
-    totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() );
+    totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
 
     TQLabel* lbl4 = new TQLabel( i18n( "KB read:" ), f2 );
-    lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
+    lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
 
     _kbytesRead = new TQLabel( i18n( "0KB" ), f2 );
-    _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() );
+    _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
 
     TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
-    lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
+    lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
 
     _transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
-    _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
+    _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
 
     TQLabel* lbl6;
     if ( _restore ) {
         lbl6 = new TQLabel( i18n( "Files:" ), f2 );
-        lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+        lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
     } else {
         lbl6 = new TQLabel( i18n( "Differences:" ), f2 );
-        lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
+        lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
     }
 
     _files = new TQLabel( "0", f2 );
-    _files->setFixedHeight( _files->tqsizeHint().height() );
+    _files->setFixedHeight( _files->sizeHint().height() );
 
     if ( _restore ) {
         _log = new LoggerWidget( i18n( "Restore log:" ), this );
@@ -137,17 +137,17 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList&
     }
 
     _ok = new KPushButton( KStdGuiItem::ok(), this );
-    _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
+    _ok->setFixedSize( 80, _ok->sizeHint().height() );
     connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
     _ok->setEnabled( FALSE );
 
     _save = new TQPushButton( i18n( "&Save Log..." ), this );
-    _save->setFixedSize( 80, _save->tqsizeHint().height() );
+    _save->setFixedSize( 80, _save->sizeHint().height() );
     connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
     _save->setEnabled( FALSE );
 
     _abort = new TQPushButton( i18n( "&Abort" ), this );
-    _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
+    _abort->setFixedSize( 80, _abort->sizeHint().height() );
     connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
@@ -409,7 +409,7 @@ void VerifyDlg::updateStats()
     _kbytesRead->setText( str );
 
     if ( elapsed > 0 ) {
-        str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
+        str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
         _transferRate->setText( str );
     }
 }
diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h
index 41df846..e9b5db6 100644
--- a/kdat/VerifyDlg.h
+++ b/kdat/VerifyDlg.h
@@ -33,7 +33,7 @@ class LoggerWidget;
 class TapeDrive;
 
 /**
- * @short tqStatus dialog for verifying/restoring parts of an archive.
+ * @short Status dialog for verifying/restoring parts of an archive.
  */
 class VerifyDlg : public TQDialog {
     Q_OBJECT
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index a1f1353..c184690 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -19,7 +19,7 @@
 #include <unistd.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 
@@ -51,14 +51,14 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo
     } else {
         lbl1 = new TQLabel( i18n( "Verify in folder:" ), this );
     }
-    lbl1->setFixedSize( lbl1->tqsizeHint() );
+    lbl1->setFixedSize( lbl1->sizeHint() );
 
     _entry = new TQLineEdit( this );
     _entry->setText( def );
-    _entry->setFixedHeight( _entry->tqsizeHint().height() );
+    _entry->setFixedHeight( _entry->sizeHint().height() );
 
     TQPushButton* browse = new TQPushButton( i18n( "..." ), this );
-    browse->setFixedSize( browse->tqsizeHint() );
+    browse->setFixedSize( browse->sizeHint() );
 
     TQLabel* lbl2;
     if ( _restore ) {
@@ -66,15 +66,15 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo
     } else {
         lbl2 = new TQLabel( i18n( "Verify files:" ), this );
     }
-    lbl2->setFixedHeight( lbl2->tqsizeHint().height() );
+    lbl2->setFixedHeight( lbl2->sizeHint().height() );
 
     TQListBox* fileList = new TQListBox( this );
     fileList->insertStringList(files);
 
     KPushButton* ok     = new KPushButton( KStdGuiItem::ok(), this );
-    ok->setFixedSize( 80, ok->tqsizeHint().height() );
+    ok->setFixedSize( 80, ok->sizeHint().height() );
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
-    cancel->setFixedSize( 80, cancel->tqsizeHint().height() );
+    cancel->setFixedSize( 80, cancel->sizeHint().height() );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
 
diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp
index 516fb92..df68b3d 100644
--- a/kdat/ktreeview.cpp
+++ b/kdat/ktreeview.cpp
@@ -79,7 +79,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText,
 KTreeViewItem::~KTreeViewItem()
 {
     if (deleteChildren) {
-	// remove the tqchildren
+	// remove the children
 	KTreeViewItem* i = child;
 	while (i) {
 	    KTreeViewItem* d = i;
@@ -121,7 +121,7 @@ TQRect KTreeViewItem::boundingRect(int indent) const
 }
 
 // returns the child item at the specified index
-KTreeViewItem* KTreeViewItem::tqchildAt(int index) const
+KTreeViewItem* KTreeViewItem::childAt(int index) const
 {
     if (!hasChild())
 	return 0;
@@ -133,7 +133,7 @@ KTreeViewItem* KTreeViewItem::tqchildAt(int index) const
     return item;
 }
 
-// returns the number of tqchildren this item has
+// returns the number of children this item has
 uint KTreeViewItem::childCount() const
 {
     return numChildren;
@@ -193,7 +193,7 @@ const TQString& KTreeViewItem::getText() const
     return text;
 }
 
-// indicates whether this item has any tqchildren
+// indicates whether this item has any children
 bool KTreeViewItem::hasChild() const
 {
     return child != 0;
@@ -260,7 +260,7 @@ void KTreeViewItem::insertChild(int index, KTreeViewItem* newChild)
 
 // indicates whether this item is displayed expanded
 // NOTE: a TRUE response does not necessarily indicate the item
-// has any tqchildren
+// has any children
 bool KTreeViewItem::isExpanded() const
 {
     return expanded;
@@ -333,14 +333,14 @@ void KTreeViewItem::paintExpandButton(TQPainter* p, int indent, int cellHeight)
 }
 
 // paint the highlight
-void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& tqcolorGroup,
+void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& colorGroup,
 				   bool hasFocus, TQt::GUIStyle style) const
 {
     TQColor fc;
     if (style == TQt::WindowsStyle)
 	fc = TQt::darkBlue;			/* hardcoded in TQt */
     else
-	fc = tqcolorGroup.text();
+	fc = colorGroup.text();
     TQRect textRect = textBoundingRect(indent);
     int t,l,b,r;
     textRect.coords(&l, &t, &r, &b);
@@ -372,7 +372,7 @@ void KTreeViewItem::paintText(TQPainter* p, int indent, int cellHeight,
 			       p->fontMetrics().leading()) / 2);
     if (highlighted) {
 	paintHighlight(p, indent, cg, owner->hasFocus(),
-                       (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
+                       (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
 	p->setPen(cg.base());
 	p->setBackgroundColor(cg.text());
     }
@@ -403,7 +403,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
 	p->drawLine(parentLeaderX, cellCenterY, parentLeaderX, cellBottomY);
 
     /*
-     * If this item has tqchildren or siblings in the tree or is a child of
+     * If this item has children or siblings in the tree or is a child of
      * an item other than the root item then draw the little line from the
      * item out to the left.
      */
@@ -411,7 +411,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
 	parent->parent != 0 ||
 	/*
 	 * The following handles the case of an item at the end of the
-	 * topmost level which doesn't have tqchildren.
+	 * topmost level which doesn't have children.
 	 */
 	parent->getChild() != this)
     {
@@ -435,7 +435,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
 // removes the given (direct) child from the branch
 bool KTreeViewItem::removeChild(KTreeViewItem* theChild)
 {
-    // search item in list of tqchildren
+    // search item in list of children
     KTreeViewItem* prevItem = 0;
     KTreeViewItem* toRemove = getChild();
     while (toRemove && toRemove != theChild) {
@@ -599,7 +599,7 @@ KTreeView::KTreeView(TQWidget *parent,
     //case WindowsStyle:
     //case MotifStyle:
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	setBackgroundColor(tqcolorGroup().base());
+	setBackgroundColor(colorGroup().base());
 	//break;
     /*default:
 	setFrameStyle(TQFrame::Panel | TQFrame::Plain);
@@ -646,7 +646,7 @@ void KTreeView::appendChildItem(const TQString & theText, const TQPixmap& thePix
     appendChildItem(item, thePath);
 }
 
-// appends the given item to the tqchildren of the item at the given index
+// appends the given item to the children of the item at the given index
 void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
 {
     /* find parent item and append new item to parent's sub tree */
@@ -656,7 +656,7 @@ void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
     appendChildItem(parentItem, newItem);
 }
 
-// appends the given item to the tqchildren of the item at the end of the
+// appends the given item to the children of the item at the end of the
 // given path
 void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath)
 {
@@ -744,7 +744,7 @@ void KTreeView::clear()
   if(goingDown || TQApplication::closingDown())
     return;
   if(autoU && isVisible())
-    tqrepaint();
+    repaint();
   setAutoUpdate(autoU);
 }
 
@@ -789,7 +789,7 @@ int KTreeView::expandLevel() const
 
 // expands or collapses the subtree rooted at the given item,
 // as approptiate
-// if item has no tqchildren, does nothing
+// if item has no children, does nothing
 void KTreeView::expandOrCollapseItem(int index)
 {
   KTreeViewItem *item = itemAt(index);
@@ -813,7 +813,7 @@ bool KTreeView::forEveryItem(KForEvery func, void* user, KTreeViewItem* item)
 	if ((*func)(item, user)) {
 	    return true;
 	}
-	// visit the tqchildren (recursively)
+	// visit the children (recursively)
 	if (item->hasChild()) {
 	    if (forEveryItem(func, user, item))
 		return true;
@@ -833,7 +833,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user,
     if (item == 0) {
 	item = treeRoot;
     } else {
-	// tqchildren are invisible (hence, nothing to do)
+	// children are invisible (hence, nothing to do)
 	// if item is invisible or collapsed
 	if (!item->isVisible() || !item->isExpanded()) {
 	    return false;
@@ -847,7 +847,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user,
 	if ((*func)(item, user)) {
 	    return true;
 	}
-	// visit the tqchildren (recursively)
+	// visit the children (recursively)
 	if (item->hasChild() && item->isExpanded()) {
 	    if (forEveryVisibleItem(func, user, item))
 		return true;
@@ -1113,7 +1113,7 @@ void KTreeView::setExpandButtonDrawing(bool enable)
   drawExpandButton = enable;
   forEveryItem(&KTreeView::setItemExpandButtonDrawing, 0);
   if(autoUpdate() && isVisible())
-    tqrepaint();
+    repaint();
 }
 
 // sets depth to which subtrees are automatically expanded, and
@@ -1132,7 +1132,7 @@ void KTreeView::setExpandLevel(int level)
   }
   setCurrentItem(itemRow(item));
   if(autoUpdate() && isVisible())
-    tqrepaint();
+    repaint();
 }
 
 // sets the indent margin for all branches and repaints if auto update enabled
@@ -1143,7 +1143,7 @@ void KTreeView::setIndentSpacing(int spacing)
     itemIndent = spacing;
     updateCellWidth();
     if (autoUpdate() && isVisible())
-	tqrepaint();
+	repaint();
 }
 
 // enables/disables vertical scrollbar
@@ -1160,7 +1160,7 @@ void KTreeView::setShowItemText(bool enable)
   showText = enable;
   forEveryItem(&KTreeView::setItemShowText, 0);
   if(autoUpdate() && isVisible())
-    tqrepaint();
+    repaint();
 }
 
 // indicates whether vertical scrolling is by pixel or row
@@ -1177,7 +1177,7 @@ void KTreeView::setTreeDrawing(bool enable)
   drawTree = enable;
   forEveryItem(&KTreeView::setItemTreeDrawing, 0);
   if(autoUpdate() && isVisible())
-    tqrepaint();
+    repaint();
 }
 
 // indicates whether item text keys are displayed
@@ -1251,18 +1251,18 @@ void KTreeView::appendChildItem(KTreeViewItem* theParent,
 	newItem->setExpanded(true);
     }
 
-    // fix up branch levels of any tqchildren that the new item may already have
+    // fix up branch levels of any children that the new item may already have
     if(newItem->hasChild()) {
 	fixChildren(newItem);
     }
 
-    // if necessary, adjust cell width, number of rows and tqrepaint
+    // if necessary, adjust cell width, number of rows and repaint
     if (newItem->isVisible() || theParent->childCount() == 1) {
 	bool autoU = autoUpdate();
 	setAutoUpdate(false);
 	updateVisibleItems();
 	if(autoU && isVisible())
-	    tqrepaint();
+	    repaint();
 	setAutoUpdate(autoU);
     }
 }
@@ -1302,7 +1302,7 @@ void KTreeView::collapseSubTree(KTreeViewItem* subRoot)
 	}
     }
     // roland
-    tqrepaint();
+    repaint();
     setAutoUpdate(TRUE);
     // roland
 }
@@ -1331,7 +1331,7 @@ void KTreeView::expandOrCollapse(KTreeViewItem* parent)
 	emit expanded(parentIndex);
     }
     if (autoU && isVisible())
-	tqrepaint();
+	repaint();
     setAutoUpdate(autoU);
 }
 
@@ -1361,7 +1361,7 @@ void KTreeView::expandSubTree(KTreeViewItem* subRoot)
 	}
     }
     // roland
-    tqrepaint();
+    repaint();
     setAutoUpdate(TRUE);
     // roland
 
@@ -1493,7 +1493,7 @@ bool KTreeView::insertItem(KTreeViewItem* referenceItem,
     }
     else {
 	// no reference item, append at end of visible tree
-	// need to tqrepaint
+	// need to repaint
 	parentItem = treeRoot;
 	parentItem->appendChild(newItem);
     }
@@ -1502,18 +1502,18 @@ bool KTreeView::insertItem(KTreeViewItem* referenceItem,
     if (level(newItem) < expansion)
 	newItem->setExpanded(true);
 
-    // fix up branch levels of any tqchildren
+    // fix up branch levels of any children
     if (newItem->hasChild())
 	fixChildren(newItem);
 
-    // if tqrepaint necessary, do it if visible and auto update
+    // if repaint necessary, do it if visible and auto update
     // enabled
     if (newItem->isVisible() || parentItem->childCount() == 1) {
 	bool autoU = autoUpdate();
 	setAutoUpdate(FALSE);
 	updateVisibleItems();
 	if(autoU && isVisible())
-	    tqrepaint();
+	    repaint();
 	setAutoUpdate(autoU);
     }
     return true;
@@ -1545,7 +1545,7 @@ void KTreeView::join(KTreeViewItem *item)
     takeItem(item);
     insertItem(itemParent, item, FALSE);
     if(autoU && isVisible())
-      tqrepaint();
+      repaint();
     setAutoUpdate(autoU);
   }
 }
@@ -1649,9 +1649,9 @@ void KTreeView::lowerItem(KTreeViewItem *item)
     bool autoU = autoUpdate();
     setAutoUpdate(FALSE);
     takeItem(item);
-    insertItem(itemParent->tqchildAt(itemChildIndex), item, FALSE);
+    insertItem(itemParent->childAt(itemChildIndex), item, FALSE);
     if(autoU && isVisible())
-      tqrepaint();
+      repaint();
     setAutoUpdate(autoU);
   }
 }
@@ -1859,7 +1859,7 @@ void KTreeView::paintCell(TQPainter* p, int row, int)
 	return;
 
     p->setClipRect(cellRect(), TQPainter::CoordPainter );
-    TQColorGroup cg = tqcolorGroup();
+    TQColorGroup cg = colorGroup();
     int indent = indentation(item);
     item->paint(p, indent, cg,
 		current == row);		/* highlighted */
@@ -1875,9 +1875,9 @@ void KTreeView::raiseItem(KTreeViewItem *item)
     bool autoU = autoUpdate();
     setAutoUpdate(FALSE);
     takeItem(item);
-    insertItem(itemParent->tqchildAt(--itemChildIndex), item, TRUE);
+    insertItem(itemParent->childAt(--itemChildIndex), item, TRUE);
     if(autoU && isVisible())
-      tqrepaint();
+      repaint();
     setAutoUpdate(autoU);
   }
 }
@@ -1897,7 +1897,7 @@ KTreeViewItem* KTreeView::recursiveFind(KPath& path)
 	return 0;
 
     /*
-     * Iterate through the parent's tqchildren searching for searchString.
+     * Iterate through the parent's children searching for searchString.
      */
     KTreeViewItem* sibling = parent->getChild();
     while (sibling != 0) {
@@ -1961,9 +1961,9 @@ void KTreeView::split(KTreeViewItem *item)
   bool autoU = autoUpdate();
   setAutoUpdate(FALSE);
   takeItem(item);
-  appendChildItem(itemParent->tqchildAt(--itemChildIndex), item);
+  appendChildItem(itemParent->childAt(--itemChildIndex), item);
   if(autoU && isVisible())
-    tqrepaint();
+    repaint();
   setAutoUpdate(autoU);
 }
 
@@ -2003,7 +2003,7 @@ void KTreeView::takeItem(KTreeViewItem* item)
 	updateVisibleItems();
 
 	if (autoU && isVisible())
-	    tqrepaint();
+	    repaint();
 	setAutoUpdate(autoU);
     }
 
@@ -2041,10 +2041,10 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count
     }
 
     /*
-     * Record the tqchildren of item in the list of visible items.
+     * Record the children of item in the list of visible items.
      *
      * Don't register item itself, it's already in the list. Also only
-     * allocate new space for tqchildren.
+     * allocate new space for children.
      */
     count += item->childCount();
     if (count > itemCapacity) {
@@ -2066,7 +2066,7 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count
 	visibleItems = newItems;
 	itemCapacity = newCapacity;
     }
-    // insert tqchildren
+    // insert children
     for (KTreeViewItem* i = item->getChild(); i != 0; i = i->getSibling()) {
 	visibleItems[index++] = i;
 	updateVisibleItemRec(i, index, count);
diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h
index d0af2d5..6e43518 100644
--- a/kdat/ktreeview.h
+++ b/kdat/ktreeview.h
@@ -43,18 +43,18 @@ public:
      * item can be constructed this way, the text has to be non-null when
      * the item is added to the tree, or it will not be inserted.
      * 
-     * The constructor sets the delete-tqchildren flag to false. This flag
+     * The constructor sets the delete-children flag to false. This flag
      * tells the item whether it shall delete the child items when it is
      * itself deleted. By default the creator of the item is responsible to
      * also delete the child items. (However, the versions of
      * KTreeView::appendChildItem and KTreeView::insertChildItem that do
-     * not take a KTreeViewItem set the delete-tqchildren flag to true.)
+     * not take a KTreeViewItem set the delete-children flag to true.)
      */
     KTreeViewItem(const TQString& theText = TQString()); // text can not be null when added to the list!
     KTreeViewItem(const TQString& theText, const TQPixmap& thePixmap);
 
     /**
-     * Destructor. It destroys its tqchildren if this item has been marked
+     * Destructor. It destroys its children if this item has been marked
      * with setDeleteChildren(true).
      */
     virtual ~KTreeViewItem();
@@ -70,7 +70,7 @@ public:
      * Returns a pointer to the child item at the given index in this
      * item's sub tree, or 0 if not found.
      */	
-    KTreeViewItem* tqchildAt(int index) const;
+    KTreeViewItem* childAt(int index) const;
 
     /**
      * Returns the number of child items in this item's sub tree.
@@ -123,7 +123,7 @@ public:
     const TQString& getText() const;
 
     /**
-     * Indicates whether this item has any tqchildren.
+     * Indicates whether this item has any children.
      */
     bool hasChild() const;
 
@@ -152,7 +152,7 @@ public:
      * items (if any) would be visible if this item were visible.
      * 
      * Note: If this function returns true, it does not necessarily indicate that
-     * this item is visible or that this item has any tqchildren.
+     * this item is visible or that this item has any children.
      */
     bool isExpanded() const;
 
@@ -174,12 +174,12 @@ public:
      * Sets the delayed-expanding flag. If this flag is true, the expanding
      * signal is emitted when the item is about to be expanded. The expand
      * button is always painted for this item, even if it doesn't have
-     * tqchildren.
+     * children.
      */
     void setDelayedExpanding(bool flag);
 
     /**
-     * Tells the item whether it should delete its tqchildren when it is
+     * Tells the item whether it should delete its children when it is
      * deleted. The default is false, which means that the child items must
      * be deleted explicitly.
      */
@@ -417,8 +417,8 @@ public:
 
     /**
      * Appends a new child item to the item at the specified row. If that
-     * item already has tqchildren, the new item is appended below these
-     * tqchildren. A KTreeViewItem is created for which the delete-tqchildren
+     * item already has children, the new item is appended below these
+     * children. A KTreeViewItem is created for which the delete-children
      * flag is set to true.
      */
     void appendChildItem(const TQString & theText, const TQPixmap& thePixmap,
@@ -432,8 +432,8 @@ public:
 
     /**
      * Appendss the specified item as a child of the item that is at the
-     * specified row. If that item already has tqchildren, the new item is
-     * appended below these tqchildren.
+     * specified row. If that item already has children, the new item is
+     * appended below these children.
      */
     void appendChildItem(KTreeViewItem* newItem, int index);
 
@@ -529,7 +529,7 @@ public:
     /**
      * Iterates every item in the tree, visible or not, and applies the
      * function func with a pointer to each item and user data supplied as
-     * parameters. The tqchildren of the specified root item are visited
+     * parameters. The children of the specified root item are visited
      * (root itself is not visited!). If root is 0 all items in the tree
      * are visited. KForEveryFunc is defined as:
      * 
@@ -568,7 +568,7 @@ public:
      * the value of prefix. The new item is added to the same branch as the
      * referenced item. If row is -1, the item is simply appended to the
      * tree at the topmost level. A KTreeViewItem is created for which the
-     * delete-tqchildren flag is set to true. Returns true if the item has
+     * delete-children flag is set to true. Returns true if the item has
      * been successfully inserted in the tree, otherwise false.
      */
     bool insertItem(const TQString & theText, const TQPixmap& thePixmap,
diff --git a/kfile-plugins/rpm/kfile_rpm.cpp b/kfile-plugins/rpm/kfile_rpm.cpp
index 72cf72a..39ef9c1 100644
--- a/kfile-plugins/rpm/kfile_rpm.cpp
+++ b/kfile-plugins/rpm/kfile_rpm.cpp
@@ -126,18 +126,18 @@ bool KRpmPlugin::readInfo( KFileMetaInfo& info, uint what)
 				case RPM_INT32_TYPE:	uint32_t int32tag;
 							dstream >> int32tag;
 							if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int32tag));
-							if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int32tag ));
+							if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int32tag ));
 							break;
 				case RPM_INT16_TYPE:	uint16_t int16tag;
 							dstream >> int16tag;
 							if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int16tag));
-							if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int16tag ));
+							if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int16tag ));
 							break;
 				case RPM_I18NSTRING_TYPE: // Fallthru
 				case RPM_STRING_TYPE:   TQString strtag; char in;
 							while ( ( in = file.getch() ) != '\0' ) strtag += in;
 							if ( !tagname.isEmpty() ) appendItem(general, tagname, strtag);
-							if( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), strtag);
+							if( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), strtag);
 							break;
 			}
 			file.at(oldPos); // Restore old position
diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in
index 0a02012..25c9373 100644
--- a/knetworkconf/backends/parse.pl.in
+++ b/knetworkconf/backends/parse.pl.in
@@ -1451,12 +1451,12 @@ sub gst_parse_xml
 sub gst_parse_xml_child_names
 {
   my ($file, $varpath) = @_;
-  my ($model, $branch, @tqchildren);
+  my ($model, $branch, @children);
 
   ($model) = &gst_xml_model_scan ($file);
   $branch  = &gst_xml_model_find ($model, $varpath);
 
-  if (!$branch) { return @tqchildren; }
+  if (!$branch) { return @children; }
 
   my @list = @$branch;
   shift @list;  # Attributes
@@ -1465,7 +1465,7 @@ sub gst_parse_xml_child_names
   {
     if ($list [0] ne "__unparsed__" && $list [0] ne "0")
     {
-      push @tqchildren, shift @list;
+      push @children, shift @list;
     }
     else
     {
@@ -1475,7 +1475,7 @@ sub gst_parse_xml_child_names
     shift @list;
   }
 
-  return @tqchildren;
+  return @children;
 }
 
 sub gst_parse_alchemist
@@ -1505,7 +1505,7 @@ sub gst_parse_alchemist_print_option
 
   return undef if (!$branch);
 
-  $options = &gst_xml_model_get_tqchildren ($branch);
+  $options = &gst_xml_model_get_children ($branch);
 
   foreach $o (@$options)
   {
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index 8114f19..a72e3ef 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -1457,22 +1457,22 @@ sub gst_replace_alchemist_ensure_list_types
   for $elem (@path)
   {
     next if ($elem eq "");
-    my @tqchildren = @$branch;
-    shift @tqchildren;  # Attributes
+    my @children = @$branch;
+    shift @children;  # Attributes
     $branch = undef;
 
-    while (@tqchildren)
+    while (@children)
     {
-      if ($tqchildren [0] eq $elem)
+      if ($children [0] eq $elem)
       {
-        shift @tqchildren;
-        $branch = shift @tqchildren;
+        shift @children;
+        $branch = shift @children;
         &gst_xml_model_set_attribute ($branch, "TYPE", "LIST");
         last;
       }
 
-      shift @tqchildren;
-      shift @tqchildren;
+      shift @children;
+      shift @children;
     }
 
     last if ($branch == undef);
@@ -1532,7 +1532,7 @@ sub gst_replace_alchemist_print_option
 
   # See if option is already defined.
 
-  $options = &gst_xml_model_get_tqchildren ($branch);
+  $options = &gst_xml_model_get_children ($branch);
 
   foreach $o (@$options)
   {
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index cd2201c..b9810c6 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -352,34 +352,34 @@ sub gst_xml_model_print_recurse
   my ($tree, $indent) = @_;
   my ($string);
 
-  my @tqchildren = @$tree;
-  shift @tqchildren;  # Attributes
+  my @children = @$tree;
+  shift @children;  # Attributes
 
-  while (@tqchildren)
+  while (@children)
   {
-    my $branch = $tqchildren [1];
+    my $branch = $children [1];
 
-    if ($tqchildren [0] eq "__unparsed__")
+    if ($children [0] eq "__unparsed__")
     {
-      $string .= "<" . $tqchildren [1] . ">";
+      $string .= "<" . $children [1] . ">";
     }
-    elsif ($tqchildren [0] eq "0")
+    elsif ($children [0] eq "0")
     {
-      $string .= $tqchildren [1];
+      $string .= $children [1];
     }
     elsif (@$branch == 1)  # Empty tag.
     {
-      $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . "/>";
+      $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . "/>";
     }
     else
     {
-      $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . ">";
+      $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . ">";
       $string .= &gst_xml_model_print_recurse ($branch);
-      $string .= "</" . $tqchildren [0] . ">";
+      $string .= "</" . $children [0] . ">";
     }
 
-    shift @tqchildren;
-    shift @tqchildren;
+    shift @children;
+    shift @children;
   }
 
 #  if ($branch)
@@ -825,21 +825,21 @@ sub gst_xml_model_find
   for $elem (@path)
   {
     next if ($elem eq "");
-    my @tqchildren = @$branch;
-    shift @tqchildren;  # Attributes
+    my @children = @$branch;
+    shift @children;  # Attributes
     $branch = undef;
 
-    while (@tqchildren)
+    while (@children)
     {
-      if ($tqchildren [0] eq $elem)
+      if ($children [0] eq $elem)
       {
-        shift @tqchildren;
-        $branch = shift @tqchildren;
+        shift @children;
+        $branch = shift @children;
         last;
       }
 
-      shift @tqchildren;
-      shift @tqchildren;
+      shift @children;
+      shift @children;
     }
 
     last if ($branch == undef);
@@ -890,23 +890,23 @@ sub gst_xml_model_ensure
   {
     next if ($elem eq "");
 
-    my @tqchildren = @$branch;
+    my @children = @$branch;
     my $parent_branch = $branch;
 
-    shift @tqchildren;  # Attributes
+    shift @children;  # Attributes
     $branch = undef;
 
-    while (@tqchildren)
+    while (@children)
     {
-      if ($tqchildren [0] eq $elem)
+      if ($children [0] eq $elem)
       {
-        shift @tqchildren;
-        $branch = shift @tqchildren;
+        shift @children;
+        $branch = shift @children;
         last;
       }
 
-      shift @tqchildren;
-      shift @tqchildren;
+      shift @children;
+      shift @children;
     }
 
     if ($branch == undef)
@@ -950,22 +950,22 @@ sub gst_xml_model_remove
   return -1;
 }
 
-sub gst_xml_model_get_tqchildren
+sub gst_xml_model_get_children
 {
   my ($branch) = @_;
-  my (@tqchildren);
+  my (@children);
 
-  if (!$branch) { return \@tqchildren; }
+  if (!$branch) { return \@children; }
 
   for ($i = 1; $i < @$branch; $i += 2)
   {
     if (@$branch [$i] ne "__unparsed__" && @$branch [$i] ne "0")
     {
-      push @tqchildren, @$branch [$i + 1];
+      push @children, @$branch [$i + 1];
     }
   }
 
-  return \@tqchildren;
+  return \@children;
 }
 
 sub gst_xml_model_get_pcdata
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
index 361f893..d68dffe 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
@@ -58,7 +58,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
     kpbCancel->setText( i18n( "&Cancel" ) );
     TQToolTip::add( kpbCancel, i18n( "Forget changes" ) );
 
-    //Creat and add the KAddDeviceDlg widget to the main tqlayout
+    //Creat and add the KAddDeviceDlg widget to the main layout
     addDlg = new KAddDeviceDlg(this);
     mainLayout->addWidget(addDlg);
     mainLayout->setResizeMode(TQLayout::Auto);
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h
index e4c118e..97b4792 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.h
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.h
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui
index 2066705..60a720f 100644
--- a/knetworkconf/knetworkconf/kadddevicedlg.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlg.ui
@@ -22,13 +22,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
@@ -118,7 +118,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -252,7 +252,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -269,7 +269,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -352,7 +352,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
index 4bacfab..f79401d 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
@@ -12,13 +12,13 @@
             <height>81</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -44,7 +44,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>16</height>
@@ -69,7 +69,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -116,7 +116,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index 397df4c..c111143 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -70,7 +70,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>180</width>
                     <height>20</height>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout25</cstring>
+                        <cstring>layout25</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -174,7 +174,7 @@
                             <property name="name">
                                 <cstring>kpbAddHost</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -191,7 +191,7 @@
                             <property name="name">
                                 <cstring>kpbEditHost</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -208,7 +208,7 @@
                             <property name="name">
                                 <cstring>kpbRemoveHost</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
index e4ad380..af91fc8 100644
--- a/knetworkconf/knetworkconf/kdetectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
index 0986db4..37098be 100644
--- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
+++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
@@ -43,7 +43,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -54,7 +54,7 @@
             <property name="name">
                 <cstring>label</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>150</width>
                     <height>0</height>
@@ -74,7 +74,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index a769705..2a5c4c0 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -230,7 +230,7 @@ void KNetworkConf::configureDeviceSlot(){
   if (item != NULL)
   {
     TQString currentDevice = item->text(0);
-    configDlg.setCaption(i18n("Configure Device %1").tqarg(currentDevice));
+    configDlg.setCaption(i18n("Configure Device %1").arg(currentDevice));
     KNetworkInterface *dev = getDeviceInfo(currentDevice);
     KAddDeviceDlgExtension *advancedOptions = (KAddDeviceDlgExtension *)configDlg.extension();
 
@@ -677,9 +677,9 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){
   KInterfaceUpDownDlg* dialog = new KInterfaceUpDownDlg(this,"Changing device state");
 
   if (state == DEVICE_UP)
-    dialog->label->setText(i18n("Enabling interface <b>%1</b>").tqarg(dev));
+    dialog->label->setText(i18n("Enabling interface <b>%1</b>").arg(dev));
   else
-    dialog->label->setText(i18n("Disabling interface <b>%1</b>").tqarg(dev));
+    dialog->label->setText(i18n("Disabling interface <b>%1</b>").arg(dev));
 
   dialog->setModal(true);
   dialog->show();
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index d5cf482..467ad67 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -39,7 +39,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdialog.h>
 #include <kinputdialog.h>
 #include <kpopupmenu.h>
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
index 2405333..7e2a4da 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>510</width>
             <height>410</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -71,7 +71,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout16</cstring>
+                            <cstring>layout16</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -95,7 +95,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>301</width>
                                         <height>20</height>
@@ -177,7 +177,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -231,7 +231,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>230</height>
@@ -306,7 +306,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>181</width>
                                                 <height>0</height>
@@ -358,7 +358,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>31</width>
                                                 <height>0</height>
@@ -385,13 +385,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>70</width>
                                                 <height>0</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>65</width>
                                                 <height>32767</height>
@@ -415,7 +415,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>90</height>
@@ -462,7 +462,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -478,7 +478,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>20</height>
@@ -523,7 +523,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>16</height>
@@ -534,7 +534,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout25</cstring>
+                                    <cstring>layout25</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -550,7 +550,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>21</height>
@@ -561,7 +561,7 @@
                                         <property name="name">
                                             <cstring>kpbAddDomainServer</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -578,7 +578,7 @@
                                         <property name="name">
                                             <cstring>kpbEditDomainServer</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -595,7 +595,7 @@
                                         <property name="name">
                                             <cstring>kpbRemoveDomainServer</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -618,7 +618,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>21</height>
@@ -669,7 +669,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout20</cstring>
+                                    <cstring>layout20</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -679,7 +679,7 @@
                                         <property name="name">
                                             <cstring>kpbAddKnownHost</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -696,7 +696,7 @@
                                         <property name="name">
                                             <cstring>kpbEditKnownHost</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -713,7 +713,7 @@
                                         <property name="name">
                                             <cstring>kpbRemoveKnownHost</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -807,7 +807,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout28</cstring>
+                                    <cstring>layout28</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -857,7 +857,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>51</height>
@@ -876,7 +876,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>150</height>
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
index e6aa338..5f4d44e 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
@@ -38,7 +38,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){
   if (pathToProgram.isEmpty())
   {
     KMessageBox::error(0,
-                        i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that  \n{KDE_PATH}/%1 \nfile is present.").tqarg(BACKEND_PATH),
+                        i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that  \n{KDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH),
                         i18n("Could Not Find Network Configuration Backend Script"));
       dialog->close();
       //kapp->quit();
@@ -301,7 +301,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo)
 //  KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal
   KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true);
   dialog->setCaption(i18n("Reloading Network"));
-  dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>"));
+  dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").arg("<center>").arg("</center>"));
   dialog->show();
 
   xmlOuput = "";
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index f25c99d..2deac9e 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -17,7 +17,7 @@
 
 #include <klocale.h>
 #include <kcmodule.h>
-#include <tqlayout.h> 
+#include <layout.h> 
 #include <version.h>
 #include "knetworkconfmodule.h"
 
@@ -110,7 +110,7 @@ KAboutData *aboutData = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"
 
 TQString KNetworkConfModule::quickHelp() const
 {
-  return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").tqarg("<h1>").tqarg("</h1><p>").tqarg("</p>");
+  return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("<h1>").arg("</h1><p>").arg("</p>");
 }
 
 //#include "knetworkconfmodule.moc"
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
index 579f0e4..dc30c12 100644
--- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
+++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
@@ -60,9 +60,9 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
   if ( !item )
     return;
  
-  const TQRect tqitemRect = listView->tqitemRect( item );
+  const TQRect itemRect = listView->itemRect( item );
  
-  if ( !tqitemRect.isValid() )
+  if ( !itemRect.isValid() )
     return;
   
   const int col = listView->header()->sectionAt( p.x() );
@@ -75,7 +75,7 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
   if ( !headerRect.isValid() )
     return;
  
-  const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width() + 60, tqitemRect.height() );
+  const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width() + 60, itemRect.height() );
  
   TQString tipStr;
  
@@ -91,31 +91,31 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
       {
         if (device->getType() != LOOPBACK_IFACE_TYPE)
         {
-          tipStr.append(i18n("<p><b>Interface:</b> %1").tqarg(device->getDeviceName().latin1()));
-          tipStr.append(i18n("<br><b>Type:</b> %1").tqarg(device->getType()));
+          tipStr.append(i18n("<p><b>Interface:</b> %1").arg(device->getDeviceName().latin1()));
+          tipStr.append(i18n("<br><b>Type:</b> %1").arg(device->getType()));
           TQString bootProto;
           if (device->getBootProto() == "none")
             bootProto = "Manual";
           else
             bootProto = device->getBootProto();
-          tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").tqarg(bootProto));
+          tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").arg(bootProto));
           if (bootProto != "dhcp")
           {
-            tipStr.append(i18n("<br><b>IP Address:</b>   %1").tqarg(device->getIpAddress()));
-            tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").tqarg(device->getBroadcast()));
+            tipStr.append(i18n("<br><b>IP Address:</b>   %1").arg(device->getIpAddress()));
+            tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").arg(device->getBroadcast()));
           }  
-          tipStr.append(i18n("<br><b>On Boot:</b> %1").tqarg(device->getOnBoot()));    
+          tipStr.append(i18n("<br><b>On Boot:</b> %1").arg(device->getOnBoot()));    
         }
       }
       KRoutingInfo *route = profile->getRoutingInfo();
-      tipStr.append(i18n("</p><p><b>Default Gateway:</b>   %1").tqarg(route->getGateway()));
+      tipStr.append(i18n("</p><p><b>Default Gateway:</b>   %1").arg(route->getGateway()));
       KDNSInfo *dns = profile->getDNSInfo();
-      tipStr.append(i18n("<br><b>Domain Name:</b> %1").tqarg(dns->getDomainName()));
-      tipStr.append(i18n("<br><b>Machine Name:</b> %1").tqarg(dns->getMachineName()));
+      tipStr.append(i18n("<br><b>Domain Name:</b> %1").arg(dns->getDomainName()));
+      tipStr.append(i18n("<br><b>Machine Name:</b> %1").arg(dns->getMachineName()));
       TQStringList nameServers = dns->getNameServers();
       for ( TQStringList::Iterator it = nameServers.begin(); it != nameServers.end(); ++it)
       {
-        tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").tqarg((*it)));
+        tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").arg((*it)));
       }
     }  
   }
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index 9a1f62d..705396e 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -12,13 +12,13 @@
             <height>130</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>342</width>
             <height>130</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>342</width>
             <height>130</height>
@@ -32,7 +32,7 @@
     </property>
     <widget class="TQLabel">
         <property name="name">
-            <cstring>tlNetworktqStatus</cstring>
+            <cstring>tlNetworkStatus</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -50,7 +50,7 @@
         <property name="text">
             <string></string>
         </property>
-        <property name="tqalignment">
+        <property name="alignment">
             <set>AlignCenter</set>
         </property>
     </widget>
diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui
index 2bbfd95..496502b 100644
--- a/knetworkconf/knetworkconf/kselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>130</width>
                     <height>20</height>
diff --git a/kpackage/cache.cpp b/kpackage/cache.cpp
index d60be2f..69ef37b 100644
--- a/kpackage/cache.cpp
+++ b/kpackage/cache.cpp
@@ -60,7 +60,7 @@ TQString cacheObj::PDir()
   TQDir d(tmpd);
   if (!d.exists()) {
     if (!d.mkdir(tmpd)) {
-      KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
+      KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
       tmpd = "";
     } else {
       chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -81,7 +81,7 @@ TQString cacheObj::CDir()
     TQDir d(tmpd);
     if (!d.exists()) {
       if (!d.mkdir(tmpd)) {
-	KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
+	KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
 	tmpd = "";
       } else {
 	chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -95,7 +95,7 @@ int cacheObj::newDCache(const TQString &url, const TQString &fn, TQString  &fnam
 
   KURL u(url);
   if ( !u.isValid() ) {
-    KpMsgE(i18n("Malformed URL: %1").tqarg(url),TRUE);
+    KpMsgE(i18n("Malformed URL: %1").arg(url),TRUE);
     return -1;
   }
 
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index ce28d21..f7c6ee0 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -156,7 +156,7 @@ void DEBAPT::fileS()
       kprun->exec();
    } 
   } else {
-    KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
+    KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
   }
 }
 
@@ -185,13 +185,13 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
   packageInfo *p;
   TQStringList  plist;
 
-  kpackage->settqStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
+  kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").arg(hostName));
   kpackage->setPercent(0);
 
   TQString cmd = "cat " STATUS;
 
   TQStringList list = kpty->run(cmd);
-  kpackage->settqStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
+  kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").arg(hostName));
   //  kdDebug() << "P=" << list.count() <<"\n";
   kpackage->setPercent(50);
 
@@ -228,7 +228,7 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->settqStatus(i18n("DEB APT"));
+  kpackage->setStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
@@ -241,16 +241,16 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
 
   //  kdDebug() << "H=" << hostName << "\n";
   if (hostName.isEmpty())
-    kpackage->settqStatus(i18n("Querying DEB APT available list"));
+    kpackage->setStatus(i18n("Querying DEB APT available list"));
   else
-    kpackage->settqStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
+    kpackage->setStatus(i18n("Querying DEB APT available list: %1").arg(hostName));
   kpackage->setPercent(0);
 
   TQStringList list = kpty->run("apt-cache dumpavail");
   if (hostName.isEmpty())
-    kpackage->settqStatus(i18n("Processing DEB APT available list"));
+    kpackage->setStatus(i18n("Processing DEB APT available list"));
   else
-     kpackage->settqStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
+     kpackage->setStatus(i18n("Processing DEB APT available list: %1").arg(hostName));
 
   //  kdDebug() << "A=" << list.count() <<"\n";
   kpackage->setPercent(50);
@@ -284,7 +284,7 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->settqStatus(i18n("DEB APT"));
+  kpackage->setStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
@@ -365,7 +365,7 @@ TQStringList DEBAPT::FindFile(const TQString &name, bool searchAll)
 
       return filelist;
     } else {
-      KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
+      KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
       TQStringList nill;
       return nill;
     }
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index d0bdd69..41146fe 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -155,7 +155,7 @@ void DEB::listPackList(TQPtrList<packageInfo> *pki, const TQString &fname, cache
     local = u.isLocalFile();
   }
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   TQFile file(STATUS);
diff --git a/kpackage/debInterface.h b/kpackage/debInterface.h
index 78bfe4c..8b26b14 100644
--- a/kpackage/debInterface.h
+++ b/kpackage/debInterface.h
@@ -34,7 +34,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 
 #include <kprocess.h>
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 7831a5e..167ec1b 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -128,7 +128,7 @@ static void insertGroups(TQMap<TQString, TQString> *a, TQString cats)
 packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, const TQString &version) {
   TQString name( pname);
   bool installed = false;
-  kpackage->settqStatus(i18n("Getting package info"));
+  kpackage->setStatus(i18n("Getting package info"));
 
   kdDebug() << "Looking at package " << pname << endl;
 
@@ -205,7 +205,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
     }
     a["description"] = desc;
   } else {
-    kpackage->settqStatus(TQString());
+    kpackage->setStatus(TQString());
     return 0;
   }
 
@@ -213,7 +213,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
   ret->packageState = installed? packageInfo::INSTALLED : packageInfo::AVAILABLE;
   ret->fixup();
   if (!installed) ret->smerge(typeID);
-  kpackage->settqStatus(TQString());
+  kpackage->setStatus(TQString());
   return ret;
 }
 
@@ -234,7 +234,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
 
   // Run pkg_info on the package name to get the file list.
   // The file list is returned on stdout, one per line.
-  kpackage->settqStatus(i18n("Getting file list"));
+  kpackage->setStatus(i18n("Getting file list"));
 
   TQStringList ret;
 
@@ -249,7 +249,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
   } else {
     if (!p->hasProperty("name")) {
       ret.append(i18n("Can't find package name!"));
-      kpackage->settqStatus(TQString());
+      kpackage->setStatus(TQString());
       return ret;
     }
 
@@ -270,7 +270,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
   
   ret = list;
   
-  kpackage->settqStatus(TQString());
+  kpackage->setStatus(TQString());
   return ret;
 }
 
@@ -498,7 +498,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
   // Open a pipe to a pkg_info process in order to read the comment, name
   // and description for the packages.
 
-  kpackage->settqStatus(i18n("Querying BSD packages database for installed packages"));
+  kpackage->setStatus(i18n("Querying BSD packages database for installed packages"));
 
   TQString cmd = PKG_INFO_BIN;
   cmd += " -acdl ";
@@ -527,8 +527,8 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
      // Find the last word on this line (which should be the package name) minus a trailing :.
       TQString pkg = name.section(' ',-1);
       if (pkg.isEmpty()) {
-        KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").tqarg(value), TRUE);
-        kpackage->settqStatus(TQString());
+        KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").arg(value), TRUE);
+        kpackage->setStatus(TQString());
         return;
       } else {
         if (pkg[pkg.length()-1] == ':') {
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 877f2f3..6a333f8 100644
--- a/kpackage/findf.cpp
+++ b/kpackage/findf.cpp
@@ -68,7 +68,7 @@ FindF::FindF(TQWidget *parent)
     value->setFocus();
 
     TQLabel *valueLabel = new TQLabel(value, i18n("Find:"), frame1);
-    valueLabel->tqsetAlignment( AlignRight );
+    valueLabel->setAlignment( AlignRight );
 
     tab = new KListView(frame1, "tab");
     connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
diff --git a/kpackage/findf.h b/kpackage/findf.h
index 8abaea3..a4e3643 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -41,7 +41,7 @@
 #include <tqfiledialog.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE headers
 #include <kapplication.h>
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 964f21c..448b74c 100644
--- a/kpackage/gentooInterface.cpp
+++ b/kpackage/gentooInterface.cpp
@@ -124,7 +124,7 @@ void Gentoo::listInstalledPackages(TQPtrList<packageInfo> *pki)
 
   TQString sline = i18n("Looking for Gentoo packages: ");
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   TQFile f(portageDir+"profiles/categories");
diff --git a/kpackage/kio.h b/kpackage/kio.h
index 94bb16b..3379cbc 100644
--- a/kpackage/kio.h
+++ b/kpackage/kio.h
@@ -33,7 +33,7 @@
 
 #include <tqobject.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include "../config.h"
 #include <kio/job.h>
 
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index 4ed7c74..29de45f 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -143,7 +143,7 @@ void KISS::listInstalledPackages(TQPtrList<packageInfo> *pki)
   if (!reader.start(0,FALSE))
     return;
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   vb = "" ;
diff --git a/kpackage/kpPty.h b/kpackage/kpPty.h
index 327f3ec..a3afdba 100644
--- a/kpackage/kpPty.h
+++ b/kpackage/kpPty.h
@@ -30,7 +30,7 @@
 #include <tqmultilineedit.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h> 
+#include <textcodec.h> 
 #include <tqmap.h>
 
 #include <kprocio.h>
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index 34d0a0a..c7e99b6 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -44,7 +44,7 @@ kpTerm::kpTerm(kpPty *pt, TQWidget * parent,  const char * name ) :
   pty = pt;
   setFont(KGlobalSettings::fixedFont());
   //  setMinimumWidth(fontMetrics().maxWidth()*80 +
-  //      tqminimumSizeHint().width());
+  //      minimumSizeHint().width());
   setWordWrap(NoWrap);
   setReadOnly(TRUE);
 }
diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h
index 466d7c5..e997d39 100644
--- a/kpackage/kpTerm.h
+++ b/kpackage/kpTerm.h
@@ -31,9 +31,9 @@
 
 #include "../config.h"
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 17697ce..2c90b9f 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -485,9 +485,9 @@ pkgInterface *KPACKAGE::pkType(const TQString &fname)
       }
     }
     fclose(file);
-    KpMsgE(i18n("Unknown package type: %1").tqarg(fname),TRUE);
+    KpMsgE(i18n("Unknown package type: %1").arg(fname),TRUE);
   } else {
-    KpMsgE(i18n("File not found: %1").tqarg(fname),TRUE);
+    KpMsgE(i18n("File not found: %1").arg(fname),TRUE);
   }
 
   return 0;
@@ -585,7 +585,7 @@ TQString KPACKAGE::getFileName(const KURL & url, TQString &cacheName )
   TQString fname = "";
 
   if ( !url.isValid() )  {
-    KpMsgE(i18n("Malformed URL: %1").tqarg(url.url()),TRUE);
+    KpMsgE(i18n("Malformed URL: %1").arg(url.url()),TRUE);
   } else {
 
     // Just a usual file ?
@@ -643,12 +643,12 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
     } else {
       save_url = url;
 
-      settqStatus(i18n("Starting KIO"));
+      setStatus(i18n("Starting KIO"));
 
       Kio kio;
 
       if (kio.download(url, cf)) {
-	settqStatus(i18n("KIO finished"));
+	setStatus(i18n("KIO finished"));
 	TQFileInfo fi(cf);
 	if (!(fi.exists() && fi.size() > 0)) {
           unlink(TQFile::encodeName(cf));
@@ -660,7 +660,7 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
 	  return cf;
 	}
       } else {
-	settqStatus(i18n("KIO failed"));
+	setStatus(i18n("KIO failed"));
 	return "";
       }
     }
@@ -732,13 +732,13 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped
   openNetFiles(list.toStringList());
 }
 
-void KPACKAGE::settqStatus(const TQString &s)	// set the text in the status bar
+void KPACKAGE::setStatus(const TQString &s)	// set the text in the status bar
 {
   status->setText(s);
   kapp->processEvents();	// refresh the screen
 }
 
-TQString KPACKAGE::gettqStatus()	// get the text in the status bar
+TQString KPACKAGE::getStatus()	// get the text in the status bar
 {
   if(status)
     return status->text();
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index 2b72029..c096a0c 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -77,13 +77,13 @@ public:
 	   OPEN_READONLY 	= 2,
 	   OPEN_INSERT 		= 4 };
 
-  void settqStatus(const TQString &s);
+  void setStatus(const TQString &s);
   // this sets the status bar's string to s
 
   void setPercent(int x);
   // this set the status bar's progress to x
 
-  TQString gettqStatus();
+  TQString getStatus();
   // this gets the current status string on the status bar
 
   //  void setMode(int newmode, pkgInterface *type, int refresh);
diff --git a/kpackage/kplview.h b/kpackage/kplview.h
index 7e31529..41b6f4f 100644
--- a/kpackage/kplview.h
+++ b/kpackage/kplview.h
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE headers
 #include "klistview.h"
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 3ec4d07..cdd7f45 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -170,9 +170,9 @@ void managementWidget::setupWidgets()
   connect(linstButton,TQT_SIGNAL(clicked()),
 	  TQT_SLOT(installMultClicked()));
 
-  leftbox->addLayout(lbuttons,0); // top level tqlayout as child
+  leftbox->addLayout(lbuttons,0); // top level layout as child
 
-  // Setup the `buttons' tqlayout
+  // Setup the `buttons' layout
   lbuttons->addWidget(linstButton,1,AlignBottom);
   lbuttons->addWidget(luinstButton,1,AlignBottom);
   lbuttons->addStretch(1);
@@ -200,11 +200,11 @@ void managementWidget::setupWidgets()
 	  TQT_SLOT(installSingleClicked()));
 
 
-  // Setup the `right panel' tqlayout
+  // Setup the `right panel' layout
   rightbox->addWidget(packageDisplay,10);
-  rightbox->addLayout(rbuttons,0); // top level tqlayout as child
+  rightbox->addLayout(rbuttons,0); // top level layout as child
 
-  // Setup the `buttons' tqlayout
+  // Setup the `buttons' layout
   rbuttons->addWidget(instButton,1);
   rbuttons->addWidget(uinstButton,1);
   rbuttons->addStretch(1);
@@ -289,7 +289,7 @@ void managementWidget::setupInstButton()
 
 void managementWidget::arrangeWidgets()
 {
-  // this is done automatically by the tqlayout managers
+  // this is done automatically by the layout managers
 }
 
 void managementWidget::tabChanged(int tab)
@@ -352,7 +352,7 @@ void managementWidget::rebuildListTree()
   packageInfo *i;
   int  n = 0;
 
-  kpackage->settqStatus(i18n("Building package tree"));
+  kpackage->setStatus(i18n("Building package tree"));
   kpackage->setPercent(0);
 
   treeList->setSorting(-1);
@@ -378,7 +378,7 @@ void managementWidget::rebuildListTree()
   treeList->setSorting(0);
 
   kpackage->setPercent(100);	// set the progress
-  kpackage->settqStatus("");
+  kpackage->setStatus("");
 
   checkMarked();
 }
diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h
index f4bd82a..b48e711 100644
--- a/kpackage/managementWidget.h
+++ b/kpackage/managementWidget.h
@@ -47,7 +47,7 @@
 #include <tqpushbutton.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
@@ -181,7 +181,7 @@ private:
   // This widget displays the package info / file-list
 
   TQBoxLayout *top, *leftbox, *rightbox, *lbuttons, *rbuttons;
-  // These are the tqgeometry managers
+  // These are the geometry managers
 
   TQFrame *leftpanel, *rightpanel;
   // frame to put TQBox in
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 7594d51..6fa467f 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -40,7 +40,7 @@
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
@@ -96,8 +96,8 @@ Options::Options(TQWidget *parent)
 	  } else {
 	    msgStr = kpinterface[i]->name;
 	    msgStr = i18n("%1: %2 not found")
-	      .tqarg(kpinterface[i]->name)
-	      .tqarg(kpinterface[i]->errExe);
+	      .arg(kpinterface[i]->name)
+	      .arg(kpinterface[i]->errExe);
 	  }
 	  packageBox[i] = new TQGroupBox(2,Qt::Horizontal,msgStr, framet, "box");
 	  packageHandle[i] =  new TQCheckBox(i18n("Enable"), packageBox[i]);
@@ -146,7 +146,7 @@ Options::Options(TQWidget *parent)
       vp->addWidget(pcache[2]);
 
       TQGroupBox* cd = new TQGroupBox (1, Qt::Horizontal, i18n("Cache Folder"), page) ;
-      cd->tqsetSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
+      cd->setSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
 
       cachedir = new KURLRequester("", cd, "cachedir");
     }
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index 5016439..f81f769 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -35,7 +35,7 @@
 
 #include <tqapplication.h>
 #include <tqfileinfo.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -280,7 +280,7 @@ void packageDisplayWidget::updateFileList()
   TQStringList errorfiles;
 
   // set the status
-  kpackage->settqStatus(i18n("Updating File List"));
+  kpackage->setStatus(i18n("Updating File List"));
 
   // clear the file list
   fileList->clear();
@@ -306,7 +306,7 @@ void packageDisplayWidget::updateFileList()
     errorfiles = package->interface->verify(package, files);
   }
 
-  kpackage->settqStatus(i18n("Updating File List"));
+  kpackage->setStatus(i18n("Updating File List"));
 
   uint c=0, p=0;
   uint step = (files.count() / 100) + 1;
diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp
index 05fd3ca..2e1aca7 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -46,7 +46,7 @@ packagePropertiesWidget::packagePropertiesWidget
 
   //  hide();
   package=NULL;
-  TQColorGroup cg = tqcolorGroup();
+  TQColorGroup cg = colorGroup();
   setBackgroundColor(cg.base());
   initTranslate();
 }
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index fba9263..435e830 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -142,7 +142,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
   packageInfo *p;
 
   TQString sline( queryMsg + fname );
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
 
   kdDebug() << "listDir fn=" << fname << " dir=" << dir << endl;
 
@@ -163,8 +163,8 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
       while ( (fi=it.current()) ) {           // for each entry...
 	if ( fi->isDir() ) {
 	  // entry is a subdir
-	  if ( fi->fileName() != TQString::tqfromLatin1(".") &&
-	       fi->fileName() != TQString::tqfromLatin1("..") )
+	  if ( fi->fileName() != TQString::fromLatin1(".") &&
+	       fi->fileName() != TQString::fromLatin1("..") )
 	    {
 	      // not current dir and not parent dir
 	      // -> recursive call:
@@ -197,7 +197,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
       }
     } else {
       // directory is not readable
-      kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").tqarg(d.absPath() ) << endl;
+      kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").arg(d.absPath() ) << endl;
     }
   } else {
       TQFile f(fname);
@@ -257,12 +257,12 @@ TQString pkgInterface::getPackList(cacheObj *cp)
 
     unlink(TQFile::encodeName(tmpf));
     if (kpkg)
-      kpackage->settqStatus(i18n("Starting Kio"));
+      kpackage->setStatus(i18n("Starting Kio"));
 
     Kio kio;
     if (kio.download(url, tmpf)) {
       if (kpkg)
-	kpackage->settqStatus(i18n("Kio finished"));
+	kpackage->setStatus(i18n("Kio finished"));
       TQFileInfo f(tmpf);
       if (!(f.exists() && f.size() > 0)) {
 	unlink(TQFile::encodeName(tmpf));
@@ -272,7 +272,7 @@ TQString pkgInterface::getPackList(cacheObj *cp)
       }
     } else {
       if (kpkg)
-	kpackage->settqStatus(i18n("Kio failed"));
+	kpackage->setStatus(i18n("Kio failed"));
       return "";
     }
   } else {
@@ -297,7 +297,7 @@ TQString pkgInterface::getDir(cacheObj *cp) {
       cl.write();
       return tmpDir;
     } else {
-      KpMsgE(i18n("Cannot read folder %1").tqarg(url),FALSE);
+      KpMsgE(i18n("Cannot read folder %1").arg(url),FALSE);
       unlink(tmpDir.ascii());
       return TQString();
     }
@@ -327,7 +327,7 @@ TQStringList pkgInterface::verify(packageInfo *, const TQStringList &files)
 
     uint step = (files.count() / 100) + 1;
 
-    kpackage->settqStatus(i18n("Verifying"));
+    kpackage->setStatus(i18n("Verifying"));
     kpackage->setPercent(0);
 
     for( TQStringList::ConstIterator it = files.begin();
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index 4775fce..9d62f2f 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -102,38 +102,38 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
   connect(cancelButton,TQT_SIGNAL(clicked()),TQT_SLOT(cancelButtonClicked()));
   connect(Keep, TQT_SIGNAL(toggled(bool)), TQT_SLOT(keepToggle(bool)));
 
-  // Do the tqlayout
-  vtqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
-  vtqlayout->addWidget(title,0);
+  // Do the layout
+  vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
+  vlayout->addWidget(title,0);
 
   {
-    htqlayout = new TQBoxLayout(vtqlayout,TQBoxLayout::LeftToRight, spacingHint());
+    hlayout = new TQBoxLayout(vlayout,TQBoxLayout::LeftToRight, spacingHint());
 
     {
-      tqlayout = new TQBoxLayout(htqlayout,TQBoxLayout::TopToBottom, spacingHint());
+      layout = new TQBoxLayout(hlayout,TQBoxLayout::TopToBottom, spacingHint());
 
       packages = new KListView(this);
-      tqlayout->addWidget(packages,20);
+      layout->addWidget(packages,20);
       packages->addColumn(i18n("PACKAGES"),200);
 
       connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
 	    this, TQT_SLOT(slotSearch( TQListViewItem * )));
 
-      tqlayout->addStretch(1);
+      layout->addStretch(1);
       for (i = 0; i < bnumber; i++) {
-	tqlayout->addWidget(Boxs[i],1);
+	layout->addWidget(Boxs[i],1);
       }
-      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
-      TQBoxLayout *stqlayout = new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight);
-      stqlayout->addStretch(1);
-      stqlayout->addWidget(Keep, 1);
-      stqlayout->addStretch(1);
+      TQBoxLayout *slayout = new TQBoxLayout(layout, TQBoxLayout::LeftToRight);
+      slayout->addStretch(1);
+      slayout->addWidget(Keep, 1);
+      slayout->addStretch(1);
 
-      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
       TQBoxLayout *buttons = new TQBoxLayout(TQBoxLayout::LeftToRight);
-      tqlayout->addLayout(buttons);
+      layout->addLayout(buttons);
 
       buttons->addWidget(installButton,2);
       buttons->addStretch(1);
@@ -141,7 +141,7 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
     }
     {
       term = new kpTerm(kpty,this);
-      htqlayout->addWidget(term, 1000);
+      hlayout->addWidget(term, 1000);
     }
   }
   resize(800, 400);
@@ -202,7 +202,7 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
     }
   }
 
- s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).tqarg(insType,pkgInt->name);
+ s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).arg(insType,pkgInt->name);
  title->setText(s);
 
   for (TQStringList::Iterator pit = plist.begin(); pit != plist.end(); ++pit ) {
diff --git a/kpackage/pkgOptions.h b/kpackage/pkgOptions.h
index becbc54..b933542 100644
--- a/kpackage/pkgOptions.h
+++ b/kpackage/pkgOptions.h
@@ -34,7 +34,7 @@
 #include "../config.h"
 // TQt headers
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -104,8 +104,8 @@ signals:
   void finished(int refresh);
 
 protected:
-  // The tqlayout managers
-  TQBoxLayout *tqlayout, *htqlayout, *vtqlayout;
+  // The layout managers
+  TQBoxLayout *layout, *hlayout, *vlayout;
 
   // Sub widgets
   TQPushButton *installButton;
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 9017c8a..568e651 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -36,7 +36,7 @@ Modal::Modal(TQString msg, TQWidget *parent, const char * name )
   : KDialog( parent, name, TRUE )
 {
   TQLabel *line1 = new TQLabel(msg,this);
-  line1->tqsetAlignment(AlignCenter);
+  line1->setAlignment(AlignCenter);
   line1->setAutoResize(true);
 
  }
@@ -136,13 +136,13 @@ int procbuf::start (TQString  msg, bool errorDlg,
 	    << " exit=" << proc->exitStatus() << endl;
   if (timed) {
     kdDebug() << "timeout..................\n";
-    KpMsg("Error",i18n("Timeout: %1").tqarg(timeMsg), TRUE);
+    KpMsg("Error",i18n("Timeout: %1").arg(timeMsg), TRUE);
     delete proc; proc = 0;
     return 0;
   } else {
     if (!proc->normalExit() || proc->exitStatus()) {
       if (errorDlg) {
-	KpMsg("Error",i18n("Kprocess error:%1").tqarg(buf), TRUE);
+	KpMsg("Error",i18n("Kprocess error:%1").arg(buf), TRUE);
       }
       delete proc; proc = 0;
       return 0;
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 9b0401f..1cc4a85 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -160,11 +160,11 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
   TQString  cmd = "rpm  -q -a";
   cmd += packageQuery();
 
-  kpackage->settqStatus(i18n("Querying RPM package list"));
+  kpackage->setStatus(i18n("Querying RPM package list"));
   kpackage->setPercent(0);
 
   TQStringList list = kpty->run(cmd);
-  kpackage->settqStatus(i18n("Processing RPM package list"));
+  kpackage->setStatus(i18n("Processing RPM package list"));
   //  kdDebug() << "P=" << list.count() <<"\n";
   kpackage->setPercent(50);
 
@@ -197,7 +197,7 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->settqStatus(i18n("DEB APT"));
+  kpackage->setStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index 2a7bb25..a2cf9ff 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -54,7 +54,7 @@ Search::Search(TQWidget *parent, const char * name)
     value = new TQLineEdit( frame1, "v");
     vf->addWidget(value,0);
     value->setFocus();
-    value->setFixedHeight(value->tqsizeHint().height());
+    value->setFixedHeight(value->sizeHint().height());
     value->setMinimumWidth(250);
     connect(value, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(textChanged(const TQString &)));
 
@@ -64,13 +64,13 @@ Search::Search(TQWidget *parent, const char * name)
     substr = new TQCheckBox(i18n("Sub string"), frame1, "substr");
     substr->setChecked(TRUE);
     hc->addWidget(substr,1,AlignLeft);
-    substr->setFixedSize(substr->tqsizeHint());
+    substr->setFixedSize(substr->sizeHint());
     hc->addStretch(1);
 
     wrap = new TQCheckBox(i18n("Wrap search"), frame1, "wrap");
     wrap->setChecked(TRUE);
     hc->addWidget(wrap,1,AlignRight);
-    wrap->setFixedSize(wrap->tqsizeHint());
+    wrap->setFixedSize(wrap->sizeHint());
 
     enableButton( User1, false );
 
@@ -104,7 +104,7 @@ void Search::ok_slot()
   }
   if (pkg == 0)
     KpMsg(i18n("Note"),
-	  i18n("%1 was not found.").tqarg(to_find),TRUE);
+	  i18n("%1 was not found.").arg(to_find),TRUE);
 }
 
 void Search::done_slot()
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index ae51d7b..e4c97a6 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -206,7 +206,7 @@ void SLACK::listInstalledPackages(TQPtrList<packageInfo> *pki)
   TQDir d(DIR);
   if (d.exists()) {
     TQString sline = i18n("Querying SLACK package list: ");
-    kpackage->settqStatus(sline);
+    kpackage->setStatus(sline);
 
     const TQFileInfoList *list = d.entryInfoList();
     int count = list->count();
@@ -260,7 +260,7 @@ void SLACK::listPackList(TQPtrList<packageInfo> *pki, const TQString &s,  cacheO
   TQString sline = i18n("Querying SLACK package list: ");
   sline += cp->location;
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   np = 0;
@@ -619,7 +619,7 @@ TQStringList SLACK::FindFile(const TQString &name, bool)
   TQDir d(DIR);
   if (d.exists()) {
     TQString sline = i18n("Querying SLACK package list: ");
-    kpackage->settqStatus(sline);
+    kpackage->setStatus(sline);
 
     const TQFileInfoList *list = d.entryInfoList();
     int count = list->count();
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 1a66446..c662da8 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -140,7 +140,7 @@ dpanel::dpanel(dpanel *basep,  const TQString &Pfilter,  bool bsubdirs,
 
     if (bsubdirs) {
       psubdirs = new TQCheckBox(i18n("Subfolders"),this);
-      psubdirs->setFixedSize(psubdirs->tqsizeHint());
+      psubdirs->setFixedSize(psubdirs->sizeHint());
       pack->addWidget(psubdirs,0);
     }
 
@@ -272,9 +272,9 @@ void updateLoc::doBase(const TQString & bmsg)
   if (haveBase) {
     fbase = new TQGroupBox(bmsg, this);
     fbase->setColumnLayout(0, Qt::Vertical );
-    fbase->tqlayout()->setSpacing( KDialog::spacingHint() );
-    fbase->tqlayout()->setMargin( KDialog::marginHint() );
-    vbase = new TQVBoxLayout(fbase->tqlayout());
+    fbase->layout()->setSpacing( KDialog::spacingHint() );
+    fbase->layout()->setMargin( KDialog::marginHint() );
+    vbase = new TQVBoxLayout(fbase->layout());
     vf->addWidget(fbase,1);
     base = new dpanel(fbase);
     vbase->addWidget(base,0);
@@ -410,10 +410,10 @@ pdUpdateLoc::pdUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, cons
 
   TQGroupBox *floc = new TQGroupBox(lmsg, this);
   floc->setColumnLayout(0, Qt::Vertical );
-  floc->tqlayout()->setSpacing( KDialog::spacingHint() );
-  floc->tqlayout()->setMargin( KDialog::marginHint() );
+  floc->layout()->setSpacing( KDialog::spacingHint() );
+  floc->layout()->setMargin( KDialog::marginHint() );
   vf->addWidget(floc,1);
-  TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
+  TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
 
   for (int i = 0; i < numLines; i++) {
     dp[i] = new dpanel(base, filter,  subdirs, floc);
@@ -547,10 +547,10 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const
   for (int i = 0; i < numLines; i++) {
     TQGroupBox *floc = new TQGroupBox(*kcIt, this);
     floc->setColumnLayout(0, Qt::Vertical );
-    floc->tqlayout()->setSpacing( KDialog::spacingHint() );
-    floc->tqlayout()->setMargin( KDialog::marginHint() );
+    floc->layout()->setSpacing( KDialog::spacingHint() );
+    floc->layout()->setMargin( KDialog::marginHint() );
     vf->addWidget(floc,1);
-    TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
+    TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
 
     combo[i] = new KComboBox( true, floc);
     KCompletion *comp = combo[i]->completionObject();
diff --git a/kpackage/updateLoc.h b/kpackage/updateLoc.h
index 2305cb2..ebd5d53 100644
--- a/kpackage/updateLoc.h
+++ b/kpackage/updateLoc.h
@@ -42,7 +42,7 @@
 #include <tqfiledialog.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 // KDE headers
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 8c7dc90..1951aa2 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -49,23 +49,23 @@ void ksv::IO::removeFile (const TQFileInfo& info, TQDir& dir, TQString& rich, TQ
   if (!dir.remove(info.fileName(), FALSE))
 	{
 	  rich = (i18n ("<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\"<br/>")
-			  .tqarg(info.fileName())
-			  .tqarg(dir.path())
-			  .tqarg(strerror(errno)));
+			  .arg(info.fileName())
+			  .arg(dir.path())
+			  .arg(strerror(errno)));
 	  plain = (i18n ("FAILED to remove %1 from %2: \"%3\"\n")
-               .tqarg(info.fileName())
-               .tqarg(dir.path())
-               .tqarg(strerror(errno)));
+               .arg(info.fileName())
+               .arg(dir.path())
+               .arg(strerror(errno)));
 	}
   else
 	{
 	  rich = i18n("removed <cmd>%1</cmd> from <cmd>%2</cmd><br/>")
-		.tqarg(info.fileName())
-		.tqarg(dir.path());
+		.arg(info.fileName())
+		.arg(dir.path());
 	  
 	  plain = i18n("removed %1 from %2\n")
-		.tqarg(info.fileName())
-		.tqarg(dir.path());
+		.arg(info.fileName())
+		.arg(dir.path());
 	}
 }
 
@@ -80,8 +80,8 @@ void ksv::IO::dissectFilename (const TQString& file, TQString& base, int& nr)
 void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
                            TQString& rich, TQString& plain)
 {
-  const TQString symName = TQString("%1%2%3").tqarg(start ? "S" : "K").tqarg(data.numberString()).tqarg(data.label());
-  const TQString symPath = TQString("%1/rc%2.d/").tqarg(KSVConfig::self()->runlevelPath()).tqarg(runlevel);
+  const TQString symName = TQString("%1%2%3").arg(start ? "S" : "K").arg(data.numberString()).arg(data.label());
+  const TQString symPath = TQString("%1/rc%2.d/").arg(KSVConfig::self()->runlevelPath()).arg(runlevel);
 
   const TQString symbol = symPath + symName;
   TQString target = data.filename();
@@ -92,20 +92,20 @@ void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
 
   if (symlink(target.local8Bit(), symbol.local8Bit()) == 0)
 	{
-	  rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").tqarg(symName).tqarg(symPath);
-	  plain = i18n("created %1 in %2\n").tqarg(symName).tqarg(symPath);
+	  rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").arg(symName).arg(symPath);
+	  plain = i18n("created %1 in %2\n").arg(symName).arg(symPath);
 	}
   else
 	{
 	  rich = i18n("<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\"<br/>")
-		.tqarg(symName)
-		.tqarg(symPath)
-		.tqarg(strerror(errno));
+		.arg(symName)
+		.arg(symPath)
+		.arg(strerror(errno));
       
 	  plain = i18n("FAILED to create %1 in %2: \"%3\"\n")
-		.tqarg(symName)
-		.tqarg(symPath)
-		.tqarg(strerror(errno));
+		.arg(symName)
+		.arg(symPath)
+		.arg(strerror(errno));
 	}
 }
 
@@ -201,7 +201,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s,
       s >> rlMagic;
       s >> section;
 
-      if (rlMagic != TQString::tqfromLatin1("RUNLEVEL %1").tqarg(i))
+      if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i))
         return false;
       
       if (section != "START")
@@ -240,14 +240,14 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
 
   s << TQCString("KSysV")
     << version
-    << TQDateTime::tqcurrentDateTime(); // save date
+    << TQDateTime::currentDateTime(); // save date
 
   for (int i = 0; i < ksv::runlevelNumber; ++i)
     {
       TQ_INT32 numberOfItems = start[i]->childCount();
 
-      s << TQString::tqfromLatin1 ("RUNLEVEL %1").arg (i)
-        << TQString::tqfromLatin1 ("START")
+      s << TQString::fromLatin1 ("RUNLEVEL %1").arg (i)
+        << TQString::fromLatin1 ("START")
         << numberOfItems;
       
       for (TQListViewItemIterator it (start[i]); 
@@ -259,7 +259,7 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
 
       numberOfItems = stop[i]->childCount();
 
-      s << TQString::tqfromLatin1 ("STOP")
+      s << TQString::fromLatin1 ("STOP")
         << numberOfItems;
 
       for (TQListViewItemIterator it (stop[i]); 
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index dabf882..06ab6f7 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -28,14 +28,14 @@
 #include <tqgroupbox.h>
 #include <tqaccel.h>
 #include <tqscrollbar.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqcstring.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqvaluelist.h>
 #include <tqsplitter.h>
@@ -251,9 +251,9 @@ void KSVContent::initLList()
       mRunlevels[i]->setSpacing (KDialog::spacingHint());
 
       // create TQString for label
-      TQString _label (i18n("Runlevel &%1").tqarg(i));
+      TQString _label (i18n("Runlevel &%1").arg(i));
       // and for the name
-      TQString _name (i18n("Runlevel %1").tqarg(i));
+      TQString _name (i18n("Runlevel %1").arg(i));
 
       TQVBox* startBox = new TQVBox (mRunlevels[i]);
       TQWhatsThis::add (startBox,
@@ -262,7 +262,7 @@ void KSVContent::initLList()
 							"determines the order in which the services are started. " \
 							"You can arrange them via drag and drop, as long as a suitable " \
 							"<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \
-							"to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i));
+							"to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i));
 
       TQLabel* rlL = new TQLabel(_label, startBox);
       new TQLabel(i18n("Start"), startBox);
@@ -280,7 +280,7 @@ void KSVContent::initLList()
 							"determines the order in which the services are stopped. " \
 							"You can arrange them via drag and drop, as long as a suitable " \
 							"<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \
-							"to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i));
+							"to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i));
 
       // create the "STOP" list:
       stopRL[i] = new KSVDragList(stopBox, (_name + " STOP").latin1());
@@ -351,9 +351,9 @@ void KSVContent::initLList()
 
 	  // use this loop for setting tooltips
  	  startRL[i]->setToolTip (i18n("Drag here to start services\n" \
-                                   "when entering runlevel %1").tqarg(i));
+                                   "when entering runlevel %1").arg(i));
  	  stopRL[i]->setToolTip (i18n("Drag here to stop services\n" \
-                                  "when entering runlevel %1").tqarg(i));
+                                  "when entering runlevel %1").arg(i));
 
 	  for (int j = 0; j < ksv::runlevelNumber; ++j)
 		{
@@ -422,7 +422,7 @@ void KSVContent::initRunlevels()
       startRL[i]->clear();
       stopRL[i]->clear();
 
-      const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(i);
+      const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").arg(i);
 
       if (!TQDir(_path).exists())
 		continue;
@@ -476,8 +476,8 @@ void KSVContent::slotWriteSysV()
 
   for (int i = 0; i < ksv::runlevelNumber; ++i)
     {
-	  appendLog(i18n("<rl>RUNLEVEL %1</rl>").tqarg(i),
-				i18n("** RUNLEVEL %1 **").tqarg(i));
+	  appendLog(i18n("<rl>RUNLEVEL %1</rl>").arg(i),
+				i18n("** RUNLEVEL %1 **").arg(i));
 
       clearRL(i); // rm changed/deleted entries
 
@@ -525,7 +525,7 @@ void KSVContent::repaintRunlevels ()
 
 void KSVContent::clearRL(int _rl)
 {
-  TQString path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(_rl);
+  TQString path = conf->runlevelPath() + TQString("/rc%1.d").arg(_rl);
 
   TQDir dir (path);
 
@@ -539,7 +539,7 @@ void KSVContent::clearRL(int _rl)
 	  if (d->newEntry() && d->originalRunlevel() != startRL[_rl]->name())
 		break;
 
-	  TQFileInfo file (path + TQString("/S%1%2").tqarg(d->numberString()).tqarg(d->label()));
+	  TQFileInfo file (path + TQString("/S%1%2").arg(d->numberString()).arg(d->label()));
 
 	  TQString rich, plain;
 	  ksv::IO::removeFile (file, dir, rich, plain);
@@ -557,7 +557,7 @@ void KSVContent::clearRL(int _rl)
 	  if (d->newEntry() && d->originalRunlevel() != stopRL[_rl]->name())
 		break;
 
-	  TQFileInfo file (path + TQString("/K%1%2").tqarg(d->numberString()).tqarg(d->label()));
+	  TQFileInfo file (path + TQString("/K%1%2").arg(d->numberString()).arg(d->label()));
 
 	  TQString rich, plain;
 	  ksv::IO::removeFile (file, dir, rich, plain);
@@ -613,8 +613,8 @@ void KSVContent::stopService (const TQString& path)
   connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
 
   // refresh textDisplay
-  appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").tqarg(path),
-			i18n("** Stopping %1 **").tqarg(path));
+  appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path),
+			i18n("** Stopping %1 **").arg(path));
 
   _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
 
@@ -639,8 +639,8 @@ void KSVContent::startService (const TQString& path)
   connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
 
   // refresh textDisplay
-  appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").tqarg(path),
-			i18n("** Starting %1 **").tqarg(path));
+  appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path),
+			i18n("** Starting %1 **").arg(path));
 
   _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
 
@@ -679,8 +679,8 @@ void KSVContent::restartService (const TQString& path)
   connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
 
   // refresh textDisplay
-  appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").tqarg(path),
-			i18n("** Re-starting %1 **").tqarg(path));
+  appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path),
+			i18n("** Re-starting %1 **").arg(path));
 
   _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
 
@@ -856,7 +856,7 @@ void KSVContent::pasteAppend()
     {
 	  KSVData data;
 
-	  if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
+	  if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
 		{
 		  KSVAction* action = 0L;
 
@@ -1062,22 +1062,22 @@ void KSVContent::calcMinSize ()
   TQCOORD& w = mMinSize.rwidth();
   TQCOORD& h = mMinSize.rheight();
 
-  w = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().width();
-  h = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().height();
+  w = 2 * KDialog::marginHint() + mScriptBox->sizeHint().width();
+  h = 2 * KDialog::marginHint() + mScriptBox->sizeHint().height();
 
   for (int i = 0; i < ksv::runlevelNumber; ++i)
     {
       if (mRunlevels[i]->isHidden())
         continue;
 
-      w += KDialog::spacingHint() + mRunlevels[i]->tqsizeHint().width();
-      h = kMax (h, mRunlevels[i]->tqsizeHint().height());
+      w += KDialog::spacingHint() + mRunlevels[i]->sizeHint().width();
+      h = kMax (h, mRunlevels[i]->sizeHint().height());
     }
 
-  mContent->tqlayout()->setEnabled(false);
+  mContent->layout()->setEnabled(false);
   mContent->setMinimumSize(mMinSize);
   mScroller->updateScrollBars();
-  mContent->tqlayout()->setEnabled(true);
+  mContent->layout()->setEnabled(true);
 }
 
 void KSVContent::mergeLoadedPackage (TQValueList<KSVData>* start,
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index 2c92baa..f02a145 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -1,7 +1,7 @@
 // (c) 2000 Peter Putzer
 
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqvbox.h>
@@ -33,7 +33,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
 				  parent, "KSysV Preferences", true, true),
   mConfig (KSVConfig::self())
 {
-  setMinimumSize (tqsizeHint ());
+  setMinimumSize (sizeHint ());
 
   /**
    * Look & Feel Page
diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp
index 1e2e8bf..423e9b5 100644
--- a/ksysv/Properties.cpp
+++ b/ksysv/Properties.cpp
@@ -2,8 +2,8 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqtextview.h>
-#include <tqlayout.h>
+#include <textview.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
@@ -48,7 +48,7 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props)
   desc->setSpacing (1);
 
   TQLabel* label = new TQLabel(i18n("Description:"), desc);
-  label->setFixedHeight (label->tqsizeHint().height());
+  label->setFixedHeight (label->sizeHint().height());
 
   TQString text;
   ksv::getServiceDescription (data.filename(), text);
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index 5c31402..3d6745e 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -2,7 +2,7 @@
 
 #include <tqtimer.h>
 #include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 
 #include <kdebug.h>
@@ -37,14 +37,14 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString
 
   lockBox->setMargin (1);
   lockBox->setFrameStyle (TQFrame::NoFrame);
-  lockBox->setFixedSize (lockBox->tqsizeHint());
+  lockBox->setFixedSize (lockBox->sizeHint());
 
   connect (mTimer, TQT_SIGNAL (timeout()), this, TQT_SLOT (timerEvent()));
   mTimer->start (mInterval);
 
   for (int i = 0; i < ksv::runlevelNumber; ++i)
 	{
-	  mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").tqarg(i));
+	  mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").arg(i));
 	}
 
   updateStatus();
@@ -122,7 +122,7 @@ void RunlevelAuthIcon::setRunlevelPath (const TQString& path)
 
   for (int i = 0; i < ksv::runlevelNumber; ++i)
 	{
-	  mRLInfo[i]->setFile ((path + "/rc%1.d").tqarg(i));
+	  mRLInfo[i]->setFile ((path + "/rc%1.d").arg(i));
 	}
 
   mTimer->start(mInterval);
diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp
index b4687d6..af885a7 100644
--- a/ksysv/ServiceDlg.cpp
+++ b/ksysv/ServiceDlg.cpp
@@ -12,7 +12,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqcombobox.h>
@@ -25,7 +25,7 @@
 #include "ksvdraglist.h"
 #include "ServiceDlg.h"
 
-#define MIN_SIZE(A) A->setMinimumSize(A->tqsizeHint())
+#define MIN_SIZE(A) A->setMinimumSize(A->sizeHint())
 
 ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
 						TQWidget* parent, const char* name)
@@ -40,14 +40,14 @@ ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
   MIN_SIZE(desc);
   desc->setBuddy(mServices);
   MIN_SIZE(mServices);
-  mServices->setMinimumWidth(mServices->tqminimumSize().width() * 2);
+  mServices->setMinimumWidth(mServices->minimumSize().width() * 2);
 
   TQBoxLayout* serv_layout = new TQHBoxLayout();
   top->addLayout (serv_layout);
   serv_layout->addWidget(desc);
   serv_layout->addWidget(mServices);
   
-  setFixedSize (tqsizeHint());
+  setFixedSize (sizeHint());
 }
 
 ServiceDlg::~ServiceDlg()
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index f039d63..b428b90 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -38,16 +38,16 @@
 #include <kprinter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqbuttongroup.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqtooltip.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
 #include <tqregexp.h>
 #include <tqdatastream.h>
 #include <tqpixmapcache.h>
-#include <tqtextview.h>
+#include <textview.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqwhatsthis.h>
 #include <tqsimplerichtext.h>
 
@@ -87,12 +87,12 @@
 #include <tqlabel.h>
 #include <kstatusbar.h>
 
-namespace tqStatus
+namespace Status
 {
   enum {
     Changed, Checklist, Writable
   };
-} // namespace tqStatus
+} // namespace Status
 
 KSVTopLevel::KSVTopLevel()
   : KMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose),
@@ -426,16 +426,16 @@ void KSVTopLevel::initStatusBar()
                                       "or ask your sysadmin to install %1 <em>suid</em> or " \
                                       "<em>sgid</em>.</p><p>The latter way is <strong>not</strong> "\
                                       "recommended though, due to security issues.</p>")
-                   .tqarg (kapp->aboutData()->programName()).tqarg(kapp->aboutData()->programName()));
+                   .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName()));
 
-  authIconBox->setMinimumSize (authIconBox->tqminimumSizeHint());
-  visBox->setMinimumSize (visBox->tqminimumSizeHint());
+  authIconBox->setMinimumSize (authIconBox->minimumSizeHint());
+  visBox->setMinimumSize (visBox->minimumSizeHint());
 
   status->addWidget (authIconBox, 0, false);
-  status->insertItem ("", tqStatus::Changed, 100);
+  status->insertItem ("", Status::Changed, 100);
   status->addWidget (visBox, 0, true);
 
-  status->setItemAlignment (tqStatus::Changed, AlignLeft|AlignVCenter);
+  status->setItemAlignment (Status::Changed, AlignLeft|AlignVCenter);
 }
 
 void KSVTopLevel::slotShowConfig()
@@ -499,7 +499,7 @@ void KSVTopLevel::saveOptions()
 
 void KSVTopLevel::slotUpdateRunning (const TQString& text)
 {
-  statusBar()->changeItem(text, tqStatus::Changed);
+  statusBar()->changeItem(text, Status::Changed);
 }
 
 void KSVTopLevel::editCut() {
@@ -508,7 +508,7 @@ void KSVTopLevel::editCut() {
   if (list && list->currentItem())
 	{
 	  KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L);
-	  kapp->tqclipboard()->setData (mime);
+	  kapp->clipboard()->setData (mime);
 
 	  KSVData data = *list->currentItem()->data();
 	  delete list->currentItem();
@@ -525,7 +525,7 @@ void KSVTopLevel::editCopy()
   if (list)
 	{
 	  KSVDrag* mime = new KSVDrag (*static_cast<KSVItem*> (list->currentItem()), 0L, 0L);
-	  kapp->tqclipboard()->setData (mime);
+	  kapp->clipboard()->setData (mime);
 	}
 }
 
@@ -537,7 +537,7 @@ void KSVTopLevel::editPaste()
     {
 	  KSVData data;
 
-	  if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
+	  if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
 		{
 		  KSVAction* action = 0L;
 
@@ -563,7 +563,7 @@ void KSVTopLevel::setChanged (bool val)
   mFileSave->setEnabled (val);
 
   // update statusbar
-  statusBar()->changeItem(val ? i18n(" Changed") : TQString(), tqStatus::Changed);
+  statusBar()->changeItem(val ? i18n(" Changed") : TQString(), Status::Changed);
 
   // clear messages
   statusBar()->clear();
@@ -651,7 +651,7 @@ void KSVTopLevel::print()
 //                   .arg (ksv::hostname()));
 //       y += fm.lineSpacing();
 
-//       p.drawText (10, y, TQDateTime::tqcurrentDateTime().toString());
+//       p.drawText (10, y, TQDateTime::currentDateTime().toString());
 //       y += fm.lineSpacing() * 2; // an extra empty line
 
 //       for (int i = 0; i < ksv::runlevelNumber; ++i)
@@ -659,7 +659,7 @@ void KSVTopLevel::print()
 //           p.setFont (TQFont("courier", 16, TQFont::Bold));
 //           TQFontMetrics fm = p.fontMetrics();
 
-//           p.drawText (10, y, i18n ("Runlevel %1").tqarg(i));
+//           p.drawText (10, y, i18n ("Runlevel %1").arg(i));
 //           y += fm.lineSpacing();
 
 //           checkPage
@@ -771,17 +771,17 @@ void KSVTopLevel::printLog()
         rheading.setWidth (&p, width);
         int tmp_h = rheading.height();
         TQRegion region (0, y, width, tmp_h);
-        rheading.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+        rheading.draw (&p, 0, y, region, colorGroup(), 0L);
 
         y += tmp_h;
 
-        TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())),
+        TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
                                TQFont("times"), TQString(), ksv::styleSheet(),
                                TQMimeSourceFactory::defaultFactory());
         rdate.setWidth (&p, width);
         tmp_h = rdate.height();
 	TQRegion r2 (0, y, width, tmp_h);
-        rdate.draw (&p, 0, y, r2, tqcolorGroup(), 0L);
+        rdate.draw (&p, 0, y, r2, colorGroup(), 0L);
 
         y += tmp_h;
       }
@@ -799,7 +799,7 @@ void KSVTopLevel::printLog()
                 break;
 
               TQRegion region (0, y, width, tmp_h);
-              rich.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+              rich.draw (&p, 0, y, region, colorGroup(), 0L);
 
               y += tmp_h;
               ++line;
@@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit ()
 	}
   else
 	{
-	  TQMimeSource* mime = kapp->tqclipboard()->data();
+	  TQMimeSource* mime = kapp->clipboard()->data();
 
 	  if (mime && mime->provides ("application/x-ksysv"))
 		setPaste (true);
@@ -938,7 +938,7 @@ void KSVTopLevel::slotSaveLog()
 
   s << "KDE System V Init Editor"
     << endl
-    << TQDateTime::tqcurrentDateTime().toString()
+    << TQDateTime::currentDateTime().toString()
     << endl << endl
     << mView->log()
     << endl;
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index 15dc5b9..2594b01 100644
--- a/ksysv/configwizard.ui
+++ b/ksysv/configwizard.ui
@@ -10,7 +10,7 @@
         <cstring>ConfigWizard</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -137,7 +137,7 @@
                     <enum>Expanding</enum>
                 </property>
                 <property>
-                    <name>tqsizeHint</name>
+                    <name>sizeHint</name>
                     <size>
                         <width>20</width>
                         <height>20</height>
@@ -281,7 +281,7 @@
                     <enum>Expanding</enum>
                 </property>
                 <property>
-                    <name>tqsizeHint</name>
+                    <name>sizeHint</name>
                     <size>
                         <width>20</width>
                         <height>20</height>
@@ -367,7 +367,7 @@
                                     <cstring>mServicesPath</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>tqminimumSize</name>
+                                    <name>minimumSize</name>
                                     <size>
                                         <width>100</width>
                                         <height>0</height>
@@ -430,7 +430,7 @@
                     </sizepolicy>
                 </property>
                 <property stdset="1">
-                    <name>tqminimumSize</name>
+                    <name>minimumSize</name>
                     <size>
                         <width>0</width>
                         <height>10</height>
@@ -489,7 +489,7 @@
                                     <cstring>mRunlevelPath</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>tqminimumSize</name>
+                                    <name>minimumSize</name>
                                     <size>
                                         <width>100</width>
                                         <height>0</height>
@@ -544,7 +544,7 @@
                     <enum>Expanding</enum>
                 </property>
                 <property>
-                    <name>tqsizeHint</name>
+                    <name>sizeHint</name>
                     <size>
                         <width>20</width>
                         <height>20</height>
@@ -590,7 +590,7 @@ You have finished the initial configuration of SysV-Init Editor. &lt;b&gt;Press&
                     <enum>RichText</enum>
                 </property>
                 <property stdset="1">
-                    <name>tqalignment</name>
+                    <name>alignment</name>
                     <set>AlignTop|AlignLeft</set>
                 </property>
                 <property>
diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp
index 95af765..7b3a421 100644
--- a/ksysv/kdltooltip.cpp
+++ b/ksysv/kdltooltip.cpp
@@ -39,8 +39,8 @@ void KDLToolTip::maybeTip (const TQPoint& p)
   TQString text;
   TQRect rect;
 
-  const TQRect vert = mParent->verticalScrollBar()->tqgeometry();
-  const TQRect horiz = mParent->horizontalScrollBar()->tqgeometry();
+  const TQRect vert = mParent->verticalScrollBar()->geometry();
+  const TQRect horiz = mParent->horizontalScrollBar()->geometry();
 
   if (vert.contains(p))
 	{
@@ -66,14 +66,14 @@ void KDLToolTip::maybeTip (const TQPoint& p)
 	  TQListViewItem* i = mParent->itemAt (rp);
 	  KSVItem* item = static_cast<KSVItem*> (i);
 	  	
-	  rect = mParent->header()->tqgeometry();
+	  rect = mParent->header()->geometry();
       if (rect.contains (p))
         {
 		  text = mParent->tooltip();
         }
       else if (item)
 		{
-		  rect = mParent->tqitemRect (i);
+		  rect = mParent->itemRect (i);
 		  rect.moveTopLeft (mParent->viewport()->mapToParent (rect.topLeft()));
 
 		  text = item->tooltip();
@@ -84,7 +84,7 @@ void KDLToolTip::maybeTip (const TQPoint& p)
 
           TQListViewItem* last = mParent->lastItem();          
           if (last)
-            rect.setTop (mParent->viewport()->mapToParent (mParent->tqitemRect(last).bottomRight()).y());
+            rect.setTop (mParent->viewport()->mapToParent (mParent->itemRect(last).bottomRight()).y());
           
 		  text = mParent->tooltip();
 		}
diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index 986e805..e2b4b30 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -1,7 +1,7 @@
 // (c) 2000 Peter Putzer
 
 #include <tqscrollbar.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstyle.h>
 
 #include <kdebug.h>
@@ -77,18 +77,18 @@ void KScroller::resizeEvent (TQResizeEvent* e)
   updateScrollBars();
 }
 
-TQSize KScroller::tqminimumSizeHint() const
+TQSize KScroller::minimumSizeHint() const
 {
-  TQSize size = tqsizeHint();
+  TQSize size = sizeHint();
   if (size.width() > 300)
      size.setWidth(300);
   return size;
 }
 
-TQSize KScroller::tqsizeHint() const
+TQSize KScroller::sizeHint() const
 {
-  TQSize size = mContent->tqminimumSize();
-  int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+  TQSize size = mContent->minimumSize();
+  int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
   size += TQSize( extra, extra );
   return size;
 }
@@ -97,7 +97,7 @@ void KScroller::updateScrollBars ()
 {
   int w = width();
   int h = height();
-  TQSize cs = mContent->tqminimumSize();
+  TQSize cs = mContent->minimumSize();
 
   setupVertical ( cs.width(), cs.height(), w, h);
   setupHorizontal ( cs.width(), cs.height(), w, h);
@@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h)
 
   if (cw > w)
     {
-      int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
 
       if (!mVertical->isHidden())
         w -= extra;
@@ -139,7 +139,7 @@ void KScroller::setupVertical (int, int ch, int w, int h)
 
   if (ch > h)
     {
-      int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
       mVertical->setRange (0, ch - h);
       mVertical->setPageStep (h);
       mVertical->setLineStep (25);
@@ -175,7 +175,7 @@ void KScroller::setupCornerWidget (int w, int h)
 {
   if (!mVertical->isHidden() && !mHorizontal->isHidden())
     {
-      int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
 
       mCornerWidget->raise();
       mCornerWidget->setGeometry (w - extra, h - extra, extra, extra);
diff --git a/ksysv/kscroller.h b/ksysv/kscroller.h
index 77a78f9..5b63346 100644
--- a/ksysv/kscroller.h
+++ b/ksysv/kscroller.h
@@ -70,7 +70,7 @@ public slots:
   void setCornerWidget (TQWidget* corner);
 
   /**
-   * Update the scrollbars. Call whenever you change the contents tqminimumSize.
+   * Update the scrollbars. Call whenever you change the contents minimumSize.
    */
   void updateScrollBars ();
 
@@ -83,12 +83,12 @@ protected:
   /**
    * Reimplemented for internal reasons, the API is not affected.
    */
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
   /**
    * Reimplemented for internal reasons, the API is not affected.
    */
-  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize minimumSizeHint() const;
 
 
 private slots:
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index a4a713d..7ad9090 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -100,7 +100,7 @@ void KSVConfig::writeSettings() {
   mConfig->writeEntry("Service Font", mServiceFont);
   mConfig->writeEntry("Number Font", mNumberFont);
 
-  // save screen tqgeometry
+  // save screen geometry
   KMainWindow* mw = static_cast<KMainWindow*>(kapp->mainWidget());
 
   if (mw)
diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp
index b71ab78..de9cea8 100644
--- a/ksysv/ksv_core.cpp
+++ b/ksysv/ksv_core.cpp
@@ -13,7 +13,7 @@
  ***************************************************************************/
 
 #include <tqpushbutton.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kapplication.h>
 #include <kglobalsettings.h>
diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp
index a869d46..ad908bc 100644
--- a/ksysv/ksvconfigwizard.cpp
+++ b/ksysv/ksvconfigwizard.cpp
@@ -25,7 +25,7 @@
 */
 #include "ksvconfigwizard.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdialog.h>
 #include <kfiledialog.h>
diff --git a/ksysv/ksvdrag.cpp b/ksysv/ksvdrag.cpp
index e524bef..7d94536 100644
--- a/ksysv/ksvdrag.cpp
+++ b/ksysv/ksvdrag.cpp
@@ -65,7 +65,7 @@ const char* KSVDrag::format (int i) const
 	}
 }
 
-TQByteArray KSVDrag::tqencodedData (const char* format) const
+TQByteArray KSVDrag::encodedData (const char* format) const
 {
   TQByteArray res;
 
@@ -90,7 +90,7 @@ bool KSVDrag::decodeNative (const TQMimeSource* mime, KSVData& data)
 {
   if (mime && mime->provides ("application/x-ksysv"))
 	{
-	  TQDataStream ds (mime->tqencodedData ("application/x-ksysv"), IO_ReadOnly);
+	  TQDataStream ds (mime->encodedData ("application/x-ksysv"), IO_ReadOnly);
 	  ds >> data;
 
 	  return true;
diff --git a/ksysv/ksvdrag.h b/ksysv/ksvdrag.h
index 00bb1a3..3c2010c 100644
--- a/ksysv/ksvdrag.h
+++ b/ksysv/ksvdrag.h
@@ -20,7 +20,7 @@ public:
   virtual ~KSVDrag();
 
   virtual const char* format (int i) const;
-  TQByteArray tqencodedData (const char*) const;
+  TQByteArray encodedData (const char*) const;
   
   static bool decodeNative (const TQMimeSource*, KSVData&);
   
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index 6c57f55..65a1b3e 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -385,7 +385,7 @@ void KSVDragList::initItem (TQString file, TQString path, TQString name, TQ_INT8
   tmp->setChanged (false);
 
   setUpdatesEnabled(true);
-  tqrepaint(false);
+  repaint(false);
 }
 
 void KSVDragList::setDefaultIcon (const TQPixmap& icon)
@@ -532,7 +532,7 @@ void KSVDragList::startDrag ()
 
   if (d)
 	{
-	  d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup()));
+	  d->setPixmap (mItemToDrag->paintDragIcon (font(), colorGroup()));
 
 	  d->drag();
 	}
@@ -762,7 +762,7 @@ void KSVDragList::setEnabled (bool enable)
     {
       if (!testWState(WState_Disabled))
         {
-          if (tqfocusWidget() == this)
+          if (focusWidget() == this)
             focusNextPrevChild (TRUE);
           setWState (WState_Disabled);
           // setBackgroundFromMode(); // this is private in TQWidget...
@@ -793,7 +793,7 @@ void KServiceDragList::startDrag ()
 
   if (d)
 	{
-	  d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup()));
+	  d->setPixmap (mItemToDrag->paintDragIcon (font(), colorGroup()));
 
 	  d->dragCopy();
 	}
diff --git a/ksysv/ksvlookandfeel.cpp b/ksysv/ksvlookandfeel.cpp
index 9c68cfb..1a1a658 100644
--- a/ksysv/ksvlookandfeel.cpp
+++ b/ksysv/ksvlookandfeel.cpp
@@ -26,7 +26,7 @@
 #include "ksvlookandfeel.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdialog.h>
 #include <kfontdialog.h>
diff --git a/ksysv/ksvmiscconfig.cpp b/ksysv/ksvmiscconfig.cpp
index d894262..821fb9a 100644
--- a/ksysv/ksvmiscconfig.cpp
+++ b/ksysv/ksvmiscconfig.cpp
@@ -26,7 +26,7 @@
 #include "ksvmiscconfig.h"
 
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdialog.h>
 
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 07911b3..9a902a5 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -82,7 +82,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -110,7 +110,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -133,7 +133,7 @@
                             <property name="text">
                                 <string>Services:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -149,7 +149,7 @@
                             <property name="text">
                                 <string>Sorting numbers:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -182,7 +182,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>10</height>
@@ -238,7 +238,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>80</width>
                                     <height>0</height>
@@ -265,7 +265,7 @@
                             <property name="text">
                                 <string>&amp;Changed:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -286,7 +286,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>80</width>
                                     <height>0</height>
@@ -313,7 +313,7 @@
                             <property name="text">
                                 <string>&amp;New:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -334,7 +334,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>80</width>
                                     <height>0</height>
@@ -366,7 +366,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>80</width>
                                     <height>0</height>
@@ -393,7 +393,7 @@
                             <property name="text">
                                 <string>New &amp;&amp; &amp;selected:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -409,7 +409,7 @@
                             <property name="text">
                                 <string>Changed &amp;&amp; s&amp;elected:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -432,7 +432,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui
index 6d45733..ca19113 100644
--- a/ksysv/miscconfig.ui
+++ b/ksysv/miscconfig.ui
@@ -83,7 +83,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -130,7 +130,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>10</height>
@@ -153,7 +153,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 051e267..109a9e8 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -94,7 +94,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
@@ -134,7 +134,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>10</height>
@@ -198,7 +198,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
@@ -236,7 +236,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index 089ebe5..aab746c 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -47,7 +47,7 @@ KSVTrash::KSVTrash (TQWidget* parent, const char* name)
   TQToolTip::add(mLabel, i18n("Drag here to remove services"));
   TQToolTip::add(this, i18n("Drag here to remove services"));
     
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
   setAcceptDrops(true);
 
   mLabel->installEventFilter(this);
@@ -75,7 +75,7 @@ void KSVTrash::dropEvent (TQDropEvent* e)
 
   if (mOpen)
     {
-      mLabel->tqrepaint(); 
+      mLabel->repaint(); 
       mOpen = false;
     }
 }
@@ -102,7 +102,7 @@ void KSVTrash::dragLeaveEvent ( TQDragLeaveEvent* )
 {
   if (mOpen)
     {
-      mLabel->tqrepaint(); 
+      mLabel->repaint(); 
       mOpen = false;
     }
 }
@@ -131,7 +131,7 @@ bool KSVTrash::eventFilter( TQObject *, TQEvent *e )
     }
 }
 
-TQSize KSVTrash::tqsizeHint() const
+TQSize KSVTrash::sizeHint() const
 {
   static TQSize size = TQSize (mPixmapWidth + 2 * 5, mPixmapWidth + 2 * 7);
 
diff --git a/ksysv/trash.h b/ksysv/trash.h
index eb62562..13596a4 100644
--- a/ksysv/trash.h
+++ b/ksysv/trash.h
@@ -34,7 +34,7 @@ public:
   KSVTrash (TQWidget* parent = 0, const char* name = 0);
   virtual ~KSVTrash();
   
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
 protected:
   /**
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 828e225..24181b9 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -50,7 +50,7 @@ addUser::addUser( KU::KUser *AUser, bool useprivategroup,
   createhome->setChecked(true);
   copyskel = new TQCheckBox(i18n("Copy skeleton"), group);
   connect(createhome, TQT_SIGNAL(toggled(bool)), copyskel, TQT_SLOT(setEnabled(bool)));
-  fronttqlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
+  frontlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
 
   if ( useprivategroup ) pbprigr->setEnabled( false );
 }
@@ -65,14 +65,14 @@ void addUser::slotOk()
 
   if ( ( user->getCaps() & KU::KUser::Cap_POSIX ) && 
     kug->getUsers().lookup( user->getUID() ) ) {
-    KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").tqarg( user->getUID() ) );
+    KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").arg( user->getUID() ) );
     return;
   }
 
   if ( ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) && 
      ( user->getCaps() & KU::KUser::Cap_Samba ) ) {
     if ( kug->getUsers().lookup_sam( user->getSID().getRID() ) ) {
-      KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").tqarg( user->getSID().getRID() ) );
+      KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").arg( user->getSID().getRID() ) );
       return;
     }
   }
@@ -115,15 +115,15 @@ bool addUser::checkHome()
        if ( KMessageBox::
          warningContinueCancel ( 0,
            i18n("Folder %1 already exists!\n%2 may become owner and permissions may change.\nDo you really want to use %3?").
-           tqarg(h_dir).tqarg(user->getName()).tqarg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
+           arg(h_dir).arg(user->getName()).arg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
 
          return false;
        else
          return true;
     } else
-      KMessageBox::error( 0, i18n("%1 is not a folder.").tqarg(h_dir) );
+      KMessageBox::error( 0, i18n("%1 is not a folder.").arg(h_dir) );
   } else
-    KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(h_dir) );
+    KMessageBox::error( 0, i18n("stat() failed on %1.").arg(h_dir) );
 
   return false;
 }
@@ -145,13 +145,13 @@ bool addUser::checkMailBox()
   if (r == 0)
     if (S_ISREG(s.st_mode))
       KMessageBox::error( 0, i18n("Mailbox %1 already exists (uid=%2).")
-                 .tqarg(mailboxpath)
-                 .tqarg(s.st_uid) );
+                 .arg(mailboxpath)
+                 .arg(s.st_uid) );
     else
       KMessageBox::error( 0, i18n("%1 exists but is not a regular file.")
-                 .tqarg(mailboxpath) );
+                 .arg(mailboxpath) );
   else
-    KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(mailboxpath) );
+    KMessageBox::error( 0, i18n("stat() failed on %1.").arg(mailboxpath) );
 
   return false;
 }
diff --git a/kuser/delUser.cpp b/kuser/delUser.cpp
index 775ff6c..b1ee7e0 100644
--- a/kuser/delUser.cpp
+++ b/kuser/delUser.cpp
@@ -30,11 +30,11 @@ delUser::delUser(KU::KUser *AUser, TQWidget *parent, const char *name)
 {                   
   TQVBox *page = makeVBoxMainWidget();
   new TQLabel( i18n("<p>Deleting user <b>%1</b>"
-                   "<p>Also perform the following actions:").tqarg(AUser->getName()),
+                   "<p>Also perform the following actions:").arg(AUser->getName()),
               page);
-  m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").tqarg(AUser->getHomeDir()), page);
+  m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").arg(AUser->getHomeDir()), page);
   TQString mailboxpath = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + AUser->getName();
-  m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").tqarg(mailboxpath), page);
+  m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").arg(mailboxpath), page);
   setButtonGuiItem(KDialogBase::Ok, KStdGuiItem::del());
 }
 
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index 0cea581..39e1f59 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqvalidator.h>
 #include <tqwhatsthis.h>
@@ -51,7 +51,7 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   rid.rid = 514; rid.name = i18n("Domain Guests"); rid.desc = i18n("Guests"); mRids.append( rid );
 
   TQFrame *page = makeMainWidget();
-  TQGridLayout *tqlayout = new TQGridLayout( page, 10, 3, marginHint(), spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 10, 3, marginHint(), spacingHint() );
   TQLabel *lb;
 
   lb = new TQLabel( page );
@@ -64,8 +64,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   legid->setEnabled( mAdd );
   legid->setReadOnly( ro );
   lb->setBuddy( legid );
-  tqlayout->addWidget( lb, 0, 0 );
-  tqlayout->addMultiCellWidget( legid, 0, 0, 1, 2 );
+  layout->addWidget( lb, 0, 0 );
+  layout->addMultiCellWidget( legid, 0, 0, 1, 2 );
 
   if ( mSamba ) {
     lb = new TQLabel( page );
@@ -82,8 +82,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     lerid->setEnabled( mAdd );
     connect( lerid, TQT_SIGNAL(activated(int)), TQT_SLOT(ridSelected(int)) );
     lb->setBuddy( lerid );
-    tqlayout->addWidget( lb, 1, 0 );
-    tqlayout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
+    layout->addWidget( lb, 1, 0 );
+    layout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
   }
 
   lb = new TQLabel( page );
@@ -96,8 +96,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   legrpname->setReadOnly( ro );
   legrpname->setFocus();
   lb->setBuddy( legrpname );
-  tqlayout->addWidget( lb, 2, 0 );
-  tqlayout->addMultiCellWidget( legrpname, 2, 2, 1, 2 );
+  layout->addWidget( lb, 2, 0 );
+  layout->addMultiCellWidget( legrpname, 2, 2, 1, 2 );
 
   if ( mSamba ) {
     lb = new TQLabel( page );
@@ -106,8 +106,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     ledesc->setText( kg->getDesc() );
     ledesc->setReadOnly( ro );
     lb->setBuddy( ledesc );
-    tqlayout->addWidget( lb, 3, 0 );
-    tqlayout->addMultiCellWidget( ledesc, 3, 3, 1, 2 );
+    layout->addWidget( lb, 3, 0 );
+    layout->addMultiCellWidget( ledesc, 3, 3, 1, 2 );
 
     lb = new TQLabel( page );
     lb->setText(i18n("Display name:"));
@@ -115,8 +115,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     ledispname->setText( kg->getDisplayName() );
     ledispname->setReadOnly( ro );
     lb->setBuddy( ledispname );
-    tqlayout->addWidget( lb, 4, 0 );
-    tqlayout->addMultiCellWidget( ledispname, 4, 4, 1, 2 );
+    layout->addWidget( lb, 4, 0 );
+    layout->addMultiCellWidget( ledispname, 4, 4, 1, 2 );
 
     lb = new TQLabel( page );
     lb->setText(i18n("Type:"));
@@ -136,8 +136,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
         break;
     }
     lb->setBuddy( letype );
-    tqlayout->addWidget( lb, 5, 0 );
-    tqlayout->addMultiCellWidget( letype, 5, 5, 1, 2 );
+    layout->addWidget( lb, 5, 0 );
+    layout->addMultiCellWidget( letype, 5, 5, 1, 2 );
 
     lb = new TQLabel( page );
     lb->setText(i18n("Domain SID:"));
@@ -145,11 +145,11 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     ledomsid->setText( sid.getDOM() );
     ledomsid->setReadOnly( ro );
     lb->setBuddy( ledomsid );
-    tqlayout->addWidget( lb, 6, 0 );
-    tqlayout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
+    layout->addWidget( lb, 6, 0 );
+    layout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
 
     cbsamba = new TQCheckBox( i18n("Disable Samba group information"), page );
-    tqlayout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 );
+    layout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 );
     connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledesc, TQT_SLOT(setDisabled(bool)) );
     connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledispname, TQT_SLOT(setDisabled(bool)) );
     connect( cbsamba, TQT_SIGNAL(toggled(bool)), letype, TQT_SLOT(setDisabled(bool)) );
@@ -162,18 +162,18 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   m_list_in->setFullWidth(true); // Single column, full widget width.
   m_list_in->addColumn(i18n("Users in Group"));
   m_list_in->setSelectionMode( TQListView::Extended );
-  tqlayout->addWidget( m_list_in, 8, 0 );
+  layout->addWidget( m_list_in, 8, 0 );
 
   TQVBox *vbox = new TQVBox(page);
   TQPushButton *btadd = new TQPushButton(i18n("Add <-"), vbox);
   TQPushButton *btdel = new TQPushButton(i18n("Remove ->"), vbox);
-  tqlayout->addWidget( vbox, 8, 1 );
+  layout->addWidget( vbox, 8, 1 );
 
   m_list_notin = new KListView(page);
   m_list_notin->setFullWidth(true); // Single column, full widget width.
   m_list_notin->addColumn(i18n("Users NOT in Group"));
   m_list_notin->setSelectionMode(TQListView::Extended);
-  tqlayout->addWidget( m_list_notin, 8, 2 );
+  layout->addWidget( m_list_notin, 8, 2 );
 //  TQString whatstr = i18n("Select the users that should be in this kg->");
 //  TQWhatsThis::add(m_list, whatstr);
 //  connect(this,TQT_SIGNAL(okClicked(void)),
@@ -274,19 +274,19 @@ void editGroup::slotOk()
     kug->getGroups().lookup( legrpname->text() ) ) {
 
     KMessageBox::sorry( 0,
-      i18n("Group with name %1 already exists.").tqarg(legrpname->text()) );
+      i18n("Group with name %1 already exists.").arg(legrpname->text()) );
     return;
   }
 
   if ( mAdd ) {
     if ( mSamba && !cbsamba->isChecked() && kug->getGroups().lookup_sam( sid ) ) {
       KMessageBox::sorry( 0,
-        i18n("Group with SID %1 already exists.").tqarg( sid.getSID() ) );
+        i18n("Group with SID %1 already exists.").arg( sid.getSID() ) );
       return;
     }
     if (kug->getGroups().lookup(s.toInt())) {
       KMessageBox::sorry( 0,
-        i18n("Group with gid %1 already exists.").tqarg(s.toInt()) );
+        i18n("Group with gid %1 already exists.").arg(s.toInt()) );
       return;
     }
   }
diff --git a/kuser/filessettings.ui b/kuser/filessettings.ui
index abbafb6..83a8827 100644
--- a/kuser/filessettings.ui
+++ b/kuser/filessettings.ui
@@ -212,7 +212,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index ed650d2..2efcab5 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -155,7 +155,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -200,7 +200,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kuser/kgroup.cpp b/kuser/kgroup.cpp
index dbbff91..77fcc91 100644
--- a/kuser/kgroup.cpp
+++ b/kuser/kgroup.cpp
@@ -28,7 +28,7 @@
 
 KU::KGroup::KGroup()
 {
-  pwd = TQString::tqfromLatin1("*");
+  pwd = TQString::fromLatin1("*");
   gid = 0;
   type = 2;
   caps = 0;
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index 4534ac5..8734936 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -95,7 +95,7 @@ bool KGroupFiles::reload()
     rc = stat(TQFile::encodeName(filename), &st);
     if(rc != 0) {
       KMessageBox::error( 0, i18n("stat call on file %1 failed: %2\nCheck KUser settings.").
-        tqarg(filename).tqarg(TQString::tqfromLatin1(strerror(errno))) );
+        arg(filename).arg(TQString::fromLatin1(strerror(errno))) );
       if( (processing_file & GROUP) != 0 ) {
         group_errno = errno;
         if(!nisgroup_filename.isEmpty()) {
@@ -121,7 +121,7 @@ bool KGroupFiles::reload()
     FILE *fgrp = fopen(TQFile::encodeName(filename), "r");
     TQString tmp;
     if (fgrp == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) );
       return FALSE;
     }
 
@@ -194,16 +194,16 @@ bool KGroupFiles::save()
   // read KUser configuration info
 
   group_filename = mCfg->groupsrc();
-  new_group_filename = group_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+  new_group_filename = group_filename + TQString::fromLatin1(KU_CREATE_EXT);
 #ifdef HAVE_SHADOW
   gshadow_filename = mCfg->gshadowsrc();
   if ( !KStandardDirs::exists( gshadow_filename ) )
       gshadow_filename = TQString();
   else
-      new_gshadow_filename = gshadow_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+      new_gshadow_filename = gshadow_filename + TQString::fromLatin1(KU_CREATE_EXT);
 #endif
   nisgroup_filename = mCfg->nisgroupsrc();
-  new_nisgroup_filename = nisgroup_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+  new_nisgroup_filename = nisgroup_filename + TQString::fromLatin1(KU_CREATE_EXT);
   if( nisgroup_filename != group_filename ) {
     mingid = mCfg->nismingid();
   }
@@ -233,14 +233,14 @@ bool KGroupFiles::save()
 
   if(!group_filename.isEmpty()) {
     if((group_fd = fopen(TQFile::encodeName(new_group_filename), "w")) == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_group_filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_group_filename) );
       return false;
     }
   }
 
   if(!gshadow_filename.isEmpty()) {
     if((gshadow_fd = fopen(TQFile::encodeName(new_gshadow_filename), "w")) == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_gshadow_filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_gshadow_filename) );
       if ( group_fd ) fclose ( group_fd );
       return false;
     }
@@ -248,7 +248,7 @@ bool KGroupFiles::save()
 
   if(!nisgroup_filename.isEmpty() && (nisgroup_filename != group_filename)) {
     if((nisgroup_fd = fopen(TQFile::encodeName(new_nisgroup_filename), "w")) == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_nisgroup_filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_nisgroup_filename) );
       if ( group_fd ) fclose ( group_fd );
       if ( gshadow_fd ) fclose ( gshadow_fd );
       return false;
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index cfd3e49..4ac7c43 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -548,24 +548,24 @@ int KU::KUser::createHome()
 {
 
   if(p_dir.isNull() || p_dir.isEmpty()) {
-    KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").tqarg(p_name) );
+    KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").arg(p_name) );
     return(0);
   }
   if (mkdir(TQFile::encodeName(p_dir), 0700) != 0) {
     if (errno != EEXIST)
     {
-      KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+      KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
       return(0);
     }
   }
 
   if (chown(TQFile::encodeName(p_dir), p_uid, p_gid) != 0) {
-    KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+    KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
     return(1);
   }
 
   if (chmod(TQFile::encodeName(p_dir), KU_HOMEDIR_PERM) != 0) {
-    KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+    KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
     return(1);
   }
   return(1);
@@ -580,33 +580,33 @@ int KU::KUser::tryCreate(const TQString &dir)
   if (rc == 0) {
     if (S_ISDIR(sb.st_mode)) {
       if (KMessageBox::warningContinueCancel( 0,
-        i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").tqarg(dir).tqarg(p_name),
+        i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").arg(dir).arg(p_name),
         TQString(), KStdGuiItem::cont() ) == KMessageBox::Continue) {
 
         if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
-          KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+          KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
         }
         return(0);
       } else {
-        KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").tqarg(dir).tqarg(p_name) );
+        KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").arg(dir).arg(p_name) );
         return(-1);
       }
     } else {
-      KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").tqarg(dir).tqarg(p_name) );
+      KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").arg(dir).arg(p_name) );
       return(-1);
     }
   } else {
     if (errno == ENOENT) {
       if (mkdir(TQFile::encodeName(dir), 0700) != 0) {
-        KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))));
+        KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))));
         return(-1);
       }
       if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
-        KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+        KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
       }
       return(0);
     } else {
-      KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+      KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
       return(-1);
     }
   }
@@ -622,8 +622,8 @@ int KU::KUser::createMailBox()
     if (errno != EEXIST)
     {
       KMessageBox::error( 0, i18n("Cannot create %1: %2")
-                .tqarg(mailboxpath)
-                .tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                .arg(mailboxpath)
+                .arg(TQString::fromLocal8Bit(strerror(errno))) );
       return -1;
     }
   }
@@ -632,13 +632,13 @@ int KU::KUser::createMailBox()
 
   if (chown(TQFile::encodeName(mailboxpath), p_uid, KU_MAILBOX_GID) != 0) {
     KMessageBox::error( 0, i18n("Cannot change owner on mailbox: %1\nError: %2")
-                .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
     return -1;
   }
 
   if (chmod(TQFile::encodeName(mailboxpath), KU_MAILBOX_PERM) != 0) {
     KMessageBox::error( 0, i18n("Cannot change permissions on mailbox: %1\nError: %2")
-                .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
     return -1;
   }
 
@@ -651,8 +651,8 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
   TQDir s(srcPath);
   TQDir d(dstPath);
 
-  TQString dot = TQString::tqfromLatin1(".");
-  TQString dotdot = TQString::tqfromLatin1("..");
+  TQString dot = TQString::fromLatin1(".");
+  TQString dotdot = TQString::fromLatin1("..");
   
   s.setFilter( TQDir::All | TQDir::Hidden | TQDir::System );
 
@@ -683,7 +683,7 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
 
       if (symlink(TQFile::encodeName(link),TQFile::encodeName(d.filePath(name))) != 0) {
         KMessageBox::error( 0, i18n("Error creating symlink %1.\nError: %2")
-                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
       }
     } else if ( info.isDir() ) {
       TQDir dir(filename);
@@ -693,12 +693,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
 
       if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
         KMessageBox::error( 0, i18n("Cannot change owner of folder %1.\nError: %2")
-                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
       }
 
       if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
         KMessageBox::error( 0, i18n("Cannot change permissions on folder %1.\nError: %2")
-                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
       }
 
     } else {
@@ -708,12 +708,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
 
       if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
         KMessageBox::error( 0, i18n("Cannot change owner of file %1.\nError: %2")
-                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
       }
 
       if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
         KMessageBox::error( 0, i18n("Cannot change permissions on file %1.\nError: %2")
-                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
       }
     }
   }
@@ -726,12 +726,12 @@ int KU::KUser::copySkel()
   mode_t mode;
   
   if (!s.exists()) {
-    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").tqarg(s.absPath()).tqarg(p_name) );
+    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").arg(s.absPath()).arg(p_name) );
     return (-1);
   }
 
   if (!d.exists()) {
-    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").tqarg(d.absPath()) );
+    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").arg(d.absPath()) );
     return (-1);
   }
   
@@ -750,14 +750,14 @@ int KU::KUser::removeHome()
     if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) {
       if (!KIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) {
              KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2")
-                       .tqarg(p_dir).tqarg(KIO::NetAccess::lastErrorString()) );
+                       .arg(p_dir).arg(KIO::NetAccess::lastErrorString()) );
       }
     } else {
-      KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").tqarg(p_dir).tqarg(sb.st_uid).tqarg(sb.st_gid) );
+      KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) );
     }
   else {
     KMessageBox::error( 0, i18n("stat call on file %1 failed.\nError: %2")
-                 .tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                 .arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
   }
 
   return 0;
@@ -772,10 +772,10 @@ int KU::KUser::removeCrontabs()
 
   file = TQFile::decodeName(CRONTAB_DIR) + "/" + p_name;
   if ( access(TQFile::encodeName(file), F_OK) == 0 ) {
-    command = TQString::tqfromLatin1("crontab -u %1 -r").tqarg(KProcess::quote(p_name));
+    command = TQString::fromLatin1("crontab -u %1 -r").arg(KProcess::quote(p_name));
     if ( system(TQFile::encodeName(command)) != 0 ) {
       KMessageBox::error( 0, i18n("Cannot remove crontab %1.\nError: %2")
-                  .tqarg(command).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .arg(command).arg(TQString::fromLocal8Bit(strerror(errno))) );
      }
   }
 
@@ -789,7 +789,7 @@ int KU::KUser::removeMailBox()
   file = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + p_name;
   if (remove(TQFile::encodeName(file)) != 0) {
     KMessageBox::error( 0, i18n("Cannot remove mailbox %1.\nError: %2")
-                .tqarg(file).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+                .arg(file).arg(TQString::fromLocal8Bit(strerror(errno))) );
   }
 
   return 0;
@@ -808,7 +808,7 @@ int KU::KUser::removeProcesses()
         break;
       case -1:
         KMessageBox::error( 0,
-          i18n("Cannot fork while trying to kill processes for uid %1.").tqarg(p_uid) );
+          i18n("Cannot fork while trying to kill processes for uid %1.").arg(p_uid) );
         break;
     }
 
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 868f100..5ccfe58 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -115,7 +115,7 @@ bool KUserFiles::loadpwd()
     mCfg->setPasswdsrc( PASSWORD_FILE );
     mCfg->setGroupsrc( GROUP_FILE );
     passwd_filename = mCfg->passwdsrc();
-    KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").tqarg(mCfg->passwdsrc().tqarg(mCfg->groupsrc())) );
+    KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").arg(mCfg->passwdsrc().arg(mCfg->groupsrc())) );
   }
 
   if(!passwd_filename.isEmpty()) {
@@ -128,7 +128,7 @@ bool KUserFiles::loadpwd()
   for(int i = 0; i < MAXFILES; i++) {
     rc = stat(TQFile::encodeName(filename), &st);
     if(rc != 0) {
-      KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").tqarg(filename).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+      KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").arg(filename).arg(TQString::fromLocal8Bit(strerror(errno))) );
       if( (processing_file & P_PASSWD) != 0 ) {
         passwd_errno = errno;
         if(!nispasswd_filename.isEmpty()) {
@@ -155,7 +155,7 @@ bool KUserFiles::loadpwd()
 #ifdef HAVE_FGETPWENT
     FILE *fpwd = fopen(TQFile::encodeName(filename), "r");
     if(fpwd == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) );
       return FALSE;
     }
 
@@ -179,7 +179,7 @@ bool KUserFiles::loadpwd()
       tmpKU->setHomeDir(TQString::fromLocal8Bit(p->pw_dir));
       tmpKU->setShell(TQString::fromLocal8Bit(p->pw_shell));
 #if defined(__FreeBSD__) || defined(__bsdi__)
-      tmpKU->setClass(TQString::tqfromLatin1(p->pw_class));
+      tmpKU->setClass(TQString::fromLatin1(p->pw_class));
       tmpKU->setLastChange(p->pw_change);
       tmpKU->setExpire(p->pw_expire);
 #endif
@@ -238,7 +238,7 @@ bool KUserFiles::loadsdw()
   FILE *f;
   kdDebug() << "open shadow file: " << shadow_file << endl;
   if ((f = fopen( TQFile::encodeName(shadow_file), "r")) == NULL) {
-    KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(shadow_file) );
+    KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(shadow_file) );
     caps &= ~Cap_Shadow;
     return TRUE;
   }
@@ -250,7 +250,7 @@ bool KUserFiles::loadsdw()
 
     kdDebug() << "shadow entry: " << spw->sp_namp << endl;
     if ((up = lookup(TQString::fromLocal8Bit(spw->sp_namp))) == NULL) {
-      KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").tqarg(TQString::fromLocal8Bit(spw->sp_namp)) );
+      KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").arg(TQString::fromLocal8Bit(spw->sp_namp)) );
       continue;
     }
 
@@ -314,9 +314,9 @@ bool KUserFiles::savepwd()
   passwd_filename = mCfg->passwdsrc();
   nispasswd_filename = mCfg->nispasswdsrc();
   TQString new_passwd_filename =
-    passwd_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+    passwd_filename + TQString::fromLatin1(KU_CREATE_EXT);
   TQString new_nispasswd_filename =
-    nispasswd_filename+TQString::tqfromLatin1(KU_CREATE_EXT);
+    nispasswd_filename+TQString::fromLatin1(KU_CREATE_EXT);
 
   if( nispasswd_filename != passwd_filename ) {
     minuid = mCfg->nisminuid();
@@ -343,13 +343,13 @@ bool KUserFiles::savepwd()
   if(!passwd_filename.isEmpty()) {
     if ((passwd_fd =
       fopen(TQFile::encodeName(new_passwd_filename),"w")) == NULL)
-        KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(passwd_filename) );
+        KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(passwd_filename) );
   }
 
   if(!nispasswd_filename.isEmpty() && (nispasswd_filename != passwd_filename)){
     if ((nispasswd_fd =
       fopen(TQFile::encodeName(new_nispasswd_filename),"w")) == NULL)
-        KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(nispasswd_filename) );
+        KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(nispasswd_filename) );
   }
 
   TQPtrListIterator<KU::KUser> it( mUsers );
@@ -512,7 +512,7 @@ bool KUserFiles::savesdw()
   struct spwd s;
   KU::KUser *up;
   TQString shadow_file = mCfg->shadowsrc();
-  TQString new_shadow_file = shadow_file+TQString::tqfromLatin1(KU_CREATE_EXT);
+  TQString new_shadow_file = shadow_file+TQString::fromLatin1(KU_CREATE_EXT);
 
   if ( shadow_file.isEmpty() )
     return TRUE;
@@ -523,7 +523,7 @@ bool KUserFiles::savesdw()
   }
 
   if ((f = fopen(TQFile::encodeName(new_shadow_file), "w")) == NULL) {
-    KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_shadow_file) );
+    KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_shadow_file) );
     return FALSE;
   }
 
@@ -588,7 +588,7 @@ void KUserFiles::createPassword( KU::KUser *user, const TQString &password )
 {
   if ( caps & Cap_Shadow ) {
     user->setSPwd( encryptPass( password, mCfg->md5shadow() ) );
-    user->setPwd( TQString::tqfromLatin1("x") );
+    user->setPwd( TQString::fromLatin1("x") );
   } else
     user->setPwd( encryptPass( password, false ) );
 }
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index 5d4979a..74ee465 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -341,7 +341,7 @@ void KUserLDAP::createPassword( KU::KUser *user, const TQString &password )
             hash[6], hash[7], hash[8], hash[9], hash[10], hash[11],
             hash[12], hash[13], hash[14], hash[15]);
 
-    user->setNTPwd( TQString::tqfromLatin1( (const char*) &hex, 32 ) );
+    user->setNTPwd( TQString::fromLatin1( (const char*) &hex, 32 ) );
 
     if ( mCfg->lanmanhash() ) {
 
@@ -354,7 +354,7 @@ void KUserLDAP::createPassword( KU::KUser *user, const TQString &password )
             hash[6], hash[7], hash[8], hash[9], hash[10], hash[11],
             hash[12], hash[13], hash[14], hash[15]);
 
-      user->setLMPwd( TQString::tqfromLatin1( (const char*) &hex, 32 ) );
+      user->setLMPwd( TQString::fromLatin1( (const char*) &hex, 32 ) );
     } else {
       user->setLMPwd( "" );
     }
@@ -372,11 +372,11 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
   cn = mCfg->ldapcnfullname() ? user->getFullName() : user->getName();
   if ( cn.isEmpty() ) cn = user->getName();
 
-  gecos = TQString::tqfromLatin1("%1,%2,%3,%4")
-    .tqarg(user->getFullName())
-    .tqarg(user->getOffice1())
-    .tqarg(user->getOffice2())
-    .tqarg(user->getAddress());
+  gecos = TQString::fromLatin1("%1,%2,%3,%4")
+    .arg(user->getFullName())
+    .arg(user->getOffice1())
+    .arg(user->getOffice2())
+    .arg(user->getAddress());
 
   samflags = "[U";
   samflags += user->getDisabled() ? 'D' : ' ';
diff --git a/kuser/kusersystem.cpp b/kuser/kusersystem.cpp
index 584bd74..8c67fcb 100644
--- a/kuser/kusersystem.cpp
+++ b/kuser/kusersystem.cpp
@@ -88,7 +88,7 @@ bool KUserSystem::loadpwd()
     tmpKU->setHomeDir(TQString::fromLocal8Bit(p->pw_dir));
     tmpKU->setShell(TQString::fromLocal8Bit(p->pw_shell));
 #if defined(__FreeBSD__) || defined(__bsdi__)
-    tmpKU->setClass(TQString::tqfromLatin1(p->pw_class));
+    tmpKU->setClass(TQString::fromLatin1(p->pw_class));
     tmpKU->setLastChange(p->pw_change);
     tmpKU->setExpire(p->pw_expire);
 #endif
diff --git a/kuser/kuservw.cpp b/kuser/kuservw.cpp
index 43bb19b..6059726 100644
--- a/kuser/kuservw.cpp
+++ b/kuser/kuservw.cpp
@@ -45,7 +45,7 @@ int KUserViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
 }
 
 void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                               int column, int width, int tqalignment )
+                               int column, int width, int alignment )
 {
     TQColorGroup _cg( cg );
     TQColor c = _cg.text();
@@ -53,7 +53,7 @@ void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
     if ( mUser->getDisabled() )
         _cg.setColor( TQColorGroup::Text, KGlobalSettings::visitedLinkColor() );
 
-    KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+    KListViewItem::paintCell( p, _cg, column, width, alignment );
 
     _cg.setColor( TQColorGroup::Text, c );
 }
diff --git a/kuser/kuservw.h b/kuser/kuservw.h
index fa5827f..f69573d 100644
--- a/kuser/kuservw.h
+++ b/kuser/kuservw.h
@@ -35,7 +35,7 @@ public:
 private:  
   virtual TQString text ( int ) const;
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-    int column, int width, int tqalignment );
+    int column, int width, int alignment );
   virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
   KU::KUser *mUser;
 };
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index 7d962f6..7dff3a1 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -40,7 +40,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -220,7 +220,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -264,7 +264,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -283,7 +283,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kuser/ldapsettings.ui b/kuser/ldapsettings.ui
index 575ea2f..6466874 100644
--- a/kuser/ldapsettings.ui
+++ b/kuser/ldapsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -253,7 +253,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index 5d168ac..fd9eee6 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -165,7 +165,7 @@ void mainView::userdel()
     if ( group &&
       KMessageBox::questionYesNo( 0, i18n("You are using private groups.\n"
         "Do you want to delete the user's private group '%1'?")
-        .tqarg(group->getName()), TQString(),
+        .arg(group->getName()), TQString(),
         KStdGuiItem::del(), i18n("Do Not Delete")) == KMessageBox::Yes) {
       kdDebug() << "del private group" << endl;
       kug->getGroups().del( group );
@@ -203,7 +203,7 @@ void mainView::useradd()
   if ( !ok ) return;
 
   if ( kug->getUsers().lookup( name ) ) {
-    KMessageBox::sorry( 0, i18n("User with name %1 already exists.").tqarg( name ) );
+    KMessageBox::sorry( 0, i18n("User with name %1 already exists.").arg( name ) );
     return;
   }
 
@@ -305,7 +305,7 @@ void mainView::setpwd()
   if ( count > 1 ) {
     if ( KMessageBox::questionYesNo( 0,
       i18n("You have selected %1 users. Do you really want to change the password for all the selected users?")
-		.tqarg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
+		.arg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
   }
   pwddlg d( this );
   if ( d.exec() != TQDialog::Accepted ) return;
@@ -444,7 +444,7 @@ void mainView::grpdel()
       KU::KUser *user = kug->getUsers().first();
       while ( user ) {
         if ( user->getGID() == group->getGID() ) {
-          KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).tqarg( group->getName() ).tqarg( user->getName() ) );
+          KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).arg( group->getName() ).arg( user->getName() ) );
           return;
         }
         user = kug->getUsers().next();
@@ -457,12 +457,12 @@ void mainView::grpdel()
     case 0: return;
     case 1:
       if (KMessageBox::warningContinueCancel( 0,
-        i18n("Do you really want to delete the group '%1'?").tqarg(group->getName()),
+        i18n("Do you really want to delete the group '%1'?").arg(group->getName()),
         TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
       break;
     default:
       if (KMessageBox::warningContinueCancel( 0,
-        i18n("Do you really want to delete the %1 selected groups?").tqarg(selected),
+        i18n("Do you really want to delete the %1 selected groups?").arg(selected),
         TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
   }
 
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index 95524f3..0f3dfbd 100644
--- a/kuser/mainWidget.cpp
+++ b/kuser/mainWidget.cpp
@@ -73,7 +73,7 @@ void mainWidget::setupActions()
 
   KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection());
 
-#define BarIconC(x)	BarIcon(TQString::tqfromLatin1(x))
+#define BarIconC(x)	BarIcon(TQString::fromLatin1(x))
 
   (void) new KAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, TQT_TQOBJECT(md),
     TQT_SLOT(useradd()), actionCollection(), "add_user");
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 2e1ebab..6b26a72 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -37,13 +37,13 @@
 
 bool backup(const TQString & name)
 {
-  TQString tmp = name + TQString::tqfromLatin1(KU_BACKUP_EXT);
+  TQString tmp = name + TQString::fromLatin1(KU_BACKUP_EXT);
   TQFile::remove( tmp );
 
   if (copyFile(TQFile::encodeName(name), TQFile::encodeName(tmp)) == -1)
   {
     TQString str;
-    KMessageBox::error( 0, i18n("Can't create backup file for %1").tqarg(name) );
+    KMessageBox::error( 0, i18n("Can't create backup file for %1").arg(name) );
     return false;
   }
   return true;
@@ -68,17 +68,17 @@ int copyFile(const TQString & from, const TQString & to)
   fo.setName(to);
   
   if (!fi.exists()) {
-    KMessageBox::error( 0, i18n("File %1 does not exist.").tqarg(from) );
+    KMessageBox::error( 0, i18n("File %1 does not exist.").arg(from) );
     return (-1);
   }
 
   if (!fi.open(IO_ReadOnly)) {
-    KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").tqarg(from) );
+    KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").arg(from) );
     return (-1);
   }
 
   if (!fo.open(IO_Raw | IO_WriteOnly | IO_Truncate)) {
-    KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").tqarg(to) );
+    KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").arg(to) );
     return (-1);
   }
   
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index a68d629..e14a809 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -26,7 +26,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -39,7 +39,7 @@
                     <property name="text">
                         <string>Time before password expires to issue an expire warning:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -53,7 +53,7 @@
                     <property name="text">
                         <string>Time when password expires after last password change:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -67,7 +67,7 @@
                     <property name="text">
                         <string>Time when account will be disabled after expiration of password:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
                     <property name="text">
                         <string>Time before password may not be changed after last password change:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -157,7 +157,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -206,7 +206,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index dbd73d0..ac3b00e 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -23,7 +23,7 @@
 
 #include <tqdatetime.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqfile.h>
 
@@ -38,38 +38,38 @@
 #include "kglobal_.h"
 #include "misc.h"
 
-void propdlg::addRow(TQWidget *parent, TQGridLayout *tqlayout, int row,
+void propdlg::addRow(TQWidget *parent, TQGridLayout *layout, int row,
   TQWidget *widget, const TQString &label, const TQString &what,
   bool two_column, bool nochange)
 {
    TQLabel *lab = new TQLabel(widget, label, parent);
-   lab->setMinimumSize(lab->tqsizeHint());
-   widget->setMinimumSize(widget->tqsizeHint());
-   tqlayout->addWidget(lab, row, 0);
+   lab->setMinimumSize(lab->sizeHint());
+   widget->setMinimumSize(widget->sizeHint());
+   layout->addWidget(lab, row, 0);
    if (!what.isEmpty())
    {
       TQWhatsThis::add(lab, what);
       TQWhatsThis::add(widget, what);
    }
    if (two_column)
-      tqlayout->addMultiCellWidget(widget, row, row, 1, 2);
+      layout->addMultiCellWidget(widget, row, row, 1, 2);
    else
-      tqlayout->addWidget(widget, row, 1);
+      layout->addWidget(widget, row, 1);
 
    if ( !nochange || ro ) return;
    TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
-   tqlayout->addWidget( nc, row, 3 );
+   layout->addWidget( nc, row, 3 );
    nc->hide();
    mNoChanges[ widget ] = nc;
 }
 
-KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int row,
+KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *layout, int row,
   const TQString &title, bool never)
 {
     KIntSpinBox *days;
 
     TQLabel *label = new TQLabel( title, parent );
-    tqlayout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
+    layout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
 
     days = new KIntSpinBox( parent );
     label->setBuddy( days );
@@ -84,12 +84,12 @@ KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int
     {
       days->setMinValue( 0 );
     }
-    tqlayout->addWidget( days, row, 2 );
+    layout->addWidget( days, row, 2 );
 
     connect(days, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
 
     TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
-    tqlayout->addWidget( nc, row, 3 );
+    layout->addWidget( nc, row, 3 );
     nc->hide();
     mNoChanges[ days ] = nc;
 
@@ -105,44 +105,44 @@ void propdlg::initDlg()
   // Tab 1: User Info
   {
     TQFrame *frame = addPage(i18n("User Info"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
     int row = 0;
 
     frontpage = frame;
-    fronttqlayout = tqlayout;
+    frontlayout = layout;
 
     lbuser = new TQLabel(frame);
 //    whatstr = i18n("WHAT IS THIS: User login");
-    addRow(frame, tqlayout, row++, lbuser, i18n("User login:"), whatstr, false, false);
+    addRow(frame, layout, row++, lbuser, i18n("User login:"), whatstr, false, false);
 
     leid = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: User Id");
     leid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
-    addRow(frame, tqlayout, row++, leid, i18n("&User ID:"), whatstr);
+    addRow(frame, layout, row++, leid, i18n("&User ID:"), whatstr);
     connect(leid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     if ( !ro ) {
       pbsetpwd = new TQPushButton(i18n("Set &Password..."), frame);
-      tqlayout->addWidget(pbsetpwd, 0, 2);
+      layout->addWidget(pbsetpwd, 0, 2);
       connect(pbsetpwd, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpwd()));
     }
 
 
     lefname = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: Full Name");
-    addRow(frame, tqlayout, row++, lefname, i18n("Full &name:"), whatstr);
+    addRow(frame, layout, row++, lefname, i18n("Full &name:"), whatstr);
     connect(lefname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
     lefname->setFocus();
 
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_InetOrg ) {
       lesurname = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: Surname");
-      addRow(frame, tqlayout, row++, lesurname, i18n("Surname:"), whatstr);
+      addRow(frame, layout, row++, lesurname, i18n("Surname:"), whatstr);
       connect(lesurname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
       lemail = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: Email");
-      addRow(frame, tqlayout, row++, lemail, i18n("Email address:"), whatstr);
+      addRow(frame, layout, row++, lemail, i18n("Email address:"), whatstr);
       connect(lemail, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
     }
 
@@ -156,12 +156,12 @@ void propdlg::initDlg()
     connect(leshell, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(changed()));
     connect(leshell, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Login Shell");
-    addRow(frame, tqlayout, row++, leshell, i18n("&Login shell:"), whatstr);
+    addRow(frame, layout, row++, leshell, i18n("&Login shell:"), whatstr);
 
     lehome = new KLineEdit(frame);
     connect(lehome, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Home Directory");
-    addRow(frame, tqlayout, row++, lehome, i18n("&Home folder:"), whatstr);
+    addRow(frame, layout, row++, lehome, i18n("&Home folder:"), whatstr);
 
     // FreeBSD appears to use the comma separated fields in the GECOS entry
     // differently than Linux.
@@ -169,47 +169,47 @@ void propdlg::initDlg()
       leoffice = new KLineEdit(frame);
       connect(leoffice, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office");
-      addRow(frame, tqlayout, row++, leoffice, i18n("&Office:"), whatstr);
+      addRow(frame, layout, row++, leoffice, i18n("&Office:"), whatstr);
 
       leophone = new KLineEdit(frame);
       connect(leophone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office Phone");
-      addRow(frame, tqlayout, row++, leophone, i18n("Offi&ce Phone:"), whatstr);
+      addRow(frame, layout, row++, leophone, i18n("Offi&ce Phone:"), whatstr);
 
       lehphone = new KLineEdit(frame);
       connect(lehphone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Home Phone");
-      addRow(frame, tqlayout, row++, lehphone, i18n("Ho&me Phone:"), whatstr);
+      addRow(frame, layout, row++, lehphone, i18n("Ho&me Phone:"), whatstr);
 
       leclass = new KLineEdit(frame);
       connect(leclass, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Login class");
-      addRow(frame, tqlayout, row++, leclass, i18n("Login class:"), whatstr, true);
+      addRow(frame, layout, row++, leclass, i18n("Login class:"), whatstr, true);
     } else {
       leoffice1 = new KLineEdit(frame);
       connect(leoffice1, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office1");
-      addRow(frame, tqlayout, row++, leoffice1, i18n("&Office #1:"), whatstr);
+      addRow(frame, layout, row++, leoffice1, i18n("&Office #1:"), whatstr);
 
       leoffice2 = new KLineEdit(frame);
       connect(leoffice2, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office2");
-      addRow(frame, tqlayout, row++, leoffice2, i18n("O&ffice #2:"), whatstr);
+      addRow(frame, layout, row++, leoffice2, i18n("O&ffice #2:"), whatstr);
 
       leaddress = new KLineEdit(frame);
       connect(leaddress, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Address");
-      addRow(frame, tqlayout, row++, leaddress, i18n("&Address:"), whatstr);
+      addRow(frame, layout, row++, leaddress, i18n("&Address:"), whatstr);
     }
     cbdisabled = new TQCheckBox(frame);
     connect(cbdisabled, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-    addRow(frame, tqlayout, row++, cbdisabled, i18n("Account &disabled"), whatstr);
+    addRow(frame, layout, row++, cbdisabled, i18n("Account &disabled"), whatstr);
 
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Disable_POSIX ) {
       cbposix = new TQCheckBox(frame);
       connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
       connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbposixChanged()));
-      addRow(frame, tqlayout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
+      addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
     } else {
       cbposix = 0;
     }
@@ -222,40 +222,40 @@ void propdlg::initDlg()
 
   // Tab 2 : Password Management
     TQFrame *frame = addPage(i18n("Password Management"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
     int row = 0;
 
     TQDateTime time;
     leslstchg = new TQLabel(frame);
-    addRow(frame, tqlayout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
+    addRow(frame, layout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
 
-    tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+    layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
     row++;
 
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Shadow ) {
-      tqlayout->addWidget( new TQLabel( i18n("POSIX parameters:"), frame ), row++, 0 );
-      lesmin = addDaysGroup(frame, tqlayout, row++, i18n("Time before password may &not be changed after last password change:"), false);
-      lesmax = addDaysGroup(frame, tqlayout, row++, i18n("Time when password &expires after last password change:") );
-      leswarn = addDaysGroup(frame, tqlayout, row++, i18n("Time before password expires to &issue an expire warning:"));
-      lesinact = addDaysGroup(frame, tqlayout, row++, i18n("Time when account will be &disabled after expiration of password:"));
-      tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+      layout->addWidget( new TQLabel( i18n("POSIX parameters:"), frame ), row++, 0 );
+      lesmin = addDaysGroup(frame, layout, row++, i18n("Time before password may &not be changed after last password change:"), false);
+      lesmax = addDaysGroup(frame, layout, row++, i18n("Time when password &expires after last password change:") );
+      leswarn = addDaysGroup(frame, layout, row++, i18n("Time before password expires to &issue an expire warning:"));
+      lesinact = addDaysGroup(frame, layout, row++, i18n("Time when account will be &disabled after expiration of password:"));
+      layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
       row++;
     }
     /*
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) {
-      tqlayout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
-      tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+      layout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
+      layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
       row++;
     }
     */
     TQLabel *label = new TQLabel( i18n("&Account will expire on:"), frame );
-    tqlayout->addWidget( label, row, 0 );
+    layout->addWidget( label, row, 0 );
     lesexpire = new KDateTimeWidget( frame );
     label->setBuddy( lesexpire );
-    tqlayout->addMultiCellWidget( lesexpire, row, row, 1, 2);
+    layout->addMultiCellWidget( lesexpire, row, row, 1, 2);
 
     cbexpire = new TQCheckBox( i18n("Never"), frame );
-    tqlayout->addWidget( cbexpire, row++, 3 );
+    layout->addWidget( cbexpire, row++, 3 );
 
     connect( lesexpire, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(changed()) );
     connect( cbexpire, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
@@ -265,60 +265,60 @@ void propdlg::initDlg()
   // Tab 3: Samba
   if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) {
     TQFrame *frame = addPage(i18n("Samba"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 10, 4, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 10, 4, marginHint(), spacingHint());
     int row = 0;
 
     lerid = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Rid");
     lerid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
-    addRow(frame, tqlayout, row++, lerid, i18n("RID:"), whatstr);
+    addRow(frame, layout, row++, lerid, i18n("RID:"), whatstr);
     connect(lerid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     leliscript = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, leliscript, i18n("Login script:"), whatstr);
+    addRow(frame, layout, row++, leliscript, i18n("Login script:"), whatstr);
     connect(leliscript, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     leprofile = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, leprofile, i18n("Profile path:"), whatstr);
+    addRow(frame, layout, row++, leprofile, i18n("Profile path:"), whatstr);
     connect(leprofile, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     lehomedrive = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, lehomedrive, i18n("Home drive:"), whatstr);
+    addRow(frame, layout, row++, lehomedrive, i18n("Home drive:"), whatstr);
     connect(lehomedrive, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     lehomepath = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, lehomepath, i18n("Home path:"), whatstr);
+    addRow(frame, layout, row++, lehomepath, i18n("Home path:"), whatstr);
     connect(lehomepath, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     leworkstations = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, leworkstations, i18n("User workstations:"), whatstr);
+    addRow(frame, layout, row++, leworkstations, i18n("User workstations:"), whatstr);
     connect(leworkstations, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     ledomain = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, ledomain, i18n("Domain name:"), whatstr);
+    addRow(frame, layout, row++, ledomain, i18n("Domain name:"), whatstr);
     connect(ledomain, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     ledomsid = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, ledomsid, i18n("Domain SID:"), whatstr);
+    addRow(frame, layout, row++, ledomsid, i18n("Domain SID:"), whatstr);
     connect(ledomsid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     cbsamba = new TQCheckBox(frame);
     connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
     connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbsambaChanged()));
-    addRow(frame, tqlayout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
+    addRow(frame, layout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
   }
 
   // Tab 4: Groups
   {
     TQFrame *frame = addPage(i18n("Groups"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, marginHint(), spacingHint());
 
     lstgrp = new KListView(frame);
     lstgrp->setFullWidth(true); // Single column, full widget width.
@@ -326,12 +326,12 @@ void propdlg::initDlg()
     if ( ro ) lstgrp->setSelectionMode( TQListView::NoSelection );
 //    TQString whatstr = i18n("Select the groups that this user belongs to.");
     TQWhatsThis::add(lstgrp, whatstr);
-    tqlayout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
+    layout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
     leprigr = new TQLabel( i18n("Primary group: "), frame );
-    tqlayout->addWidget( leprigr, 1, 0 );
+    layout->addWidget( leprigr, 1, 0 );
     if ( !ro ) {
       pbprigr = new TQPushButton( i18n("Set as Primary"), frame );
-      tqlayout->addWidget( pbprigr, 1, 1 );
+      layout->addWidget( pbprigr, 1, 1 );
       connect( pbprigr, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpgroup()) );
     }
     connect( lstgrp, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(gchanged()) );
@@ -346,7 +346,7 @@ propdlg::propdlg( const TQPtrList<KU::KUser> &users,
 {
   mUsers = users;
   if ( mUsers.getFirst() != mUsers.getLast() )
-    setCaption( i18n("User Properties - %1 Selected Users").tqarg( mUsers.count() ) );
+    setCaption( i18n("User Properties - %1 Selected Users").arg( mUsers.count() ) );
   initDlg();
   loadgroups( false );
   selectuser();
@@ -658,14 +658,14 @@ void propdlg::setpgroup()
      {
         item->setEnabled(true);
         item->setOn(prevPrimaryGroupWasOn);
-        item->tqrepaint();
+        item->repaint();
      }
      if ( groupName == primaryGroup )
      {
         primaryGroupWasOn = item->isOn();
         item->setEnabled(false);
         item->setOn(true);
-        item->tqrepaint();
+        item->repaint();
      }
 
      item = (TQCheckListItem *) item->nextSibling();
@@ -941,7 +941,7 @@ void propdlg::slotOk()
   {
     if (kug->getUsers().lookup(newuid)) {
       KMessageBox::sorry( 0,
-        i18n("User with UID %1 already exists").tqarg(newuid) );
+        i18n("User with UID %1 already exists").arg(newuid) );
       return;
     }
   }
@@ -951,7 +951,7 @@ void propdlg::slotOk()
     if ( oldrid != newrid ) {
       if (kug->getUsers().lookup_sam(newrid)) {
         KMessageBox::sorry( 0,
-          i18n("User with RID %1 already exists").tqarg(newrid) );
+          i18n("User with RID %1 already exists").arg(newrid) );
         return;
       }
     }
@@ -968,7 +968,7 @@ void propdlg::slotOk()
       		i18n("<p>The shell %1 is not yet listed in the file %2. "
       		     "In order to use this shell you must add it to "
       		     "this file first."
-      		     "<p>Do you want to add it now?").tqarg(newshell).tqarg(TQFile::decodeName(SHELL_FILE)),
+      		     "<p>Do you want to add it now?").arg(newshell).arg(TQFile::decodeName(SHELL_FILE)),
       		i18n("Unlisted Shell"),
       		i18n("&Add Shell"),
       		i18n("Do &Not Add"));
diff --git a/kuser/propdlg.h b/kuser/propdlg.h
index d4fa163..c71a535 100644
--- a/kuser/propdlg.h
+++ b/kuser/propdlg.h
@@ -27,7 +27,7 @@
 #include <tqlistbox.h>
 #include <tqtooltip.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 
 #include <klineedit.h>
@@ -70,7 +70,7 @@ protected:
   bool check();
   void loadgroups( bool fixedprivgroup );
   bool checkShell(const TQString &shell);
-  void addRow( TQWidget *parent, TQGridLayout *tqlayout, int row, 
+  void addRow( TQWidget *parent, TQGridLayout *layout, int row, 
   TQWidget *widget, const TQString &label, const TQString &what, 
   bool two_column=true, bool nochange=true );
   void setLE( KLineEdit *le, const TQString &val, bool first );
@@ -79,11 +79,11 @@ protected:
   TQString mergeLE( KLineEdit *le, const TQString &val, bool one );
   int mergeSB( KIntSpinBox *sb, int val, bool one );
 
-  KIntSpinBox *addDaysGroup( TQWidget  *parent, TQGridLayout *tqlayout, int row, 
+  KIntSpinBox *addDaysGroup( TQWidget  *parent, TQGridLayout *layout, int row, 
     const TQString &title, bool never=true );
 
   TQFrame *frontpage;
-  TQGridLayout *fronttqlayout;
+  TQGridLayout *frontlayout;
   int frontrow;
 
   TQPtrList<KU::KUser> mUsers;
diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp
index eb970d9..631c860 100644
--- a/kuser/pwddlg.cpp
+++ b/kuser/pwddlg.cpp
@@ -32,14 +32,14 @@ pwddlg::pwddlg( TQWidget* parent, const char* name )
 
   TQLabel* lb1 = new TQLabel(page, "lb1");
   lb1->setText(i18n("Password:"));
-  lb1->setMinimumSize(lb1->tqsizeHint());
-  lb1->tqsetAlignment(AlignRight|AlignVCenter);
+  lb1->setMinimumSize(lb1->sizeHint());
+  lb1->setAlignment(AlignRight|AlignVCenter);
 
   lepw1 = new KLineEdit(page, "LineEdit_1");
 
   // ensure it fits at least 12 characters
   lepw1->setText( "XXXXXXXXXXXX" );
-  lepw1->setMinimumSize(lepw1->tqsizeHint());
+  lepw1->setMinimumSize(lepw1->sizeHint());
 
   // clear text
   lepw1->clear();
@@ -48,14 +48,14 @@ pwddlg::pwddlg( TQWidget* parent, const char* name )
 
   TQLabel* lb2 = new TQLabel(page, "lb2");
   lb2->setText(i18n("Verify:"));
-  lb2->setMinimumSize(lb2->tqsizeHint());
-  lb2->tqsetAlignment(AlignRight|AlignVCenter);
+  lb2->setMinimumSize(lb2->sizeHint());
+  lb2->setAlignment(AlignRight|AlignVCenter);
 
   lepw2 = new KLineEdit(page, "LineEdit_2");
 
   // ensure it fits at least 12 characters
   lepw2->setText( "XXXXXXXXXXXX" );
-  lepw2->setMinimumSize(lepw2->tqsizeHint());
+  lepw2->setMinimumSize(lepw2->sizeHint());
 
   // clear text
   lepw2->clear();
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index 9597ef2..69a9c30 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -17,7 +17,7 @@
  **/
 
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tqlabel.h>
 #include <tqgrid.h>
diff --git a/kuser/sid.cpp b/kuser/sid.cpp
index 8f3e254..4d5845b 100644
--- a/kuser/sid.cpp
+++ b/kuser/sid.cpp
@@ -74,7 +74,7 @@ bool SID::isEmpty() const
 
 void SID::updateSID()
 {
-  mSid = mDom + TQString::tqfromLatin1("-") + TQString::number( mRid );
+  mSid = mDom + TQString::fromLatin1("-") + TQString::number( mRid );
 }
 
 void SID::setSID( const TQString &sid )
diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index 3c80d2a..3b096cd 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -42,7 +42,7 @@ EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, T
 	if(isFile) {
 		select=new TQPushButton(_("Select..."), this);
 		connect(select, TQT_SIGNAL(clicked()), TQT_SLOT(selectFileClicked()));
-		select->resize(select->tqminimumSizeHint());
+		select->resize(select->minimumSizeHint());
 		setStretchFactor(select, 0);
 	} else
 		select=0;
@@ -53,29 +53,29 @@ void EditWidget::selectFileClicked()
     if(!filename.isEmpty())
 	line->setText(filename);
 }
-TQSize EditWidget::tqsizeHint() const
+TQSize EditWidget::sizeHint() const
 {
-	int w=2*SPACE_MARGIN+lbl->tqsizeHint().width()+SPACE_INSIDE+line->tqsizeHint().width();
-	int h=lbl->tqsizeHint().height();
-	if(h<line->tqsizeHint().height())
-		h=line->tqsizeHint().height();
+	int w=2*SPACE_MARGIN+lbl->sizeHint().width()+SPACE_INSIDE+line->sizeHint().width();
+	int h=lbl->sizeHint().height();
+	if(h<line->sizeHint().height())
+		h=line->sizeHint().height();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->tqsizeHint().width();
-		if(h<select->tqsizeHint().height())
-			h=select->tqsizeHint().height();
+		w+=SPACE_INSIDE+select->sizeHint().width();
+		if(h<select->sizeHint().height())
+			h=select->sizeHint().height();
 	}
 	return TQSize(w, h);
 }
-TQSize EditWidget::tqminimumSizeHint() const
+TQSize EditWidget::minimumSizeHint() const
 {
-	int w=2*SPACE_MARGIN+lbl->tqminimumSizeHint().width()+SPACE_INSIDE+line->tqminimumSizeHint().width();
-	int h=lbl->tqminimumSizeHint().height();
-	if(h<line->tqminimumSizeHint().height())
-		h=line->tqminimumSizeHint().height();
+	int w=2*SPACE_MARGIN+lbl->minimumSizeHint().width()+SPACE_INSIDE+line->minimumSizeHint().width();
+	int h=lbl->minimumSizeHint().height();
+	if(h<line->minimumSizeHint().height())
+		h=line->minimumSizeHint().height();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->tqminimumSizeHint().width();
-		if(h<select->tqminimumSizeHint().height())
-			h=select->tqminimumSizeHint().height();
+		w+=SPACE_INSIDE+select->minimumSizeHint().width();
+		if(h<select->minimumSizeHint().height())
+			h=select->minimumSizeHint().height();
 	}
 	return TQSize(w, h);
 }
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index e0901f9..89b037c 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -58,8 +58,8 @@ public:
 	void cut() { line->cut(); };
 	void copy() const { line->copy(); };
 	void paste() { line->paste(); };
-	void tqsetAlignment(int flag) { line->tqsetAlignment(flag); };
-	int tqalignment() const { return line->tqalignment(); };
+	void setAlignment(int flag) { line->setAlignment(flag); };
+	int alignment() const { return line->alignment(); };
 	void cursorLeft(bool mark, int steps=1) { line->cursorLeft(mark, steps); };
 	void cursorRight(bool mark, int steps=1) { line->cursorRight(mark, steps); };
 	void cursorWordForward(bool mark) { line->cursorWordForward(mark); };
@@ -72,8 +72,8 @@ public:
 	bool edited() const { return line->edited(); };
 	bool hasMarkedText() const { return line->hasMarkedText(); };
 	TQString markedText() const { return line->markedText(); };
-	virtual TQSize tqsizeHint() const;
-	virtual TQSize tqminimumSizeHint() const;
+	virtual TQSize sizeHint() const;
+	virtual TQSize minimumSizeHint() const;
 public slots:
 	virtual void setText(const TQString &text) { line->setText(text); };
 	void selectAll() { line->selectAll(); };
diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp
index 7140fd9..d74b6b6 100644
--- a/lilo-config/kde-qt-common/expert.cpp
+++ b/lilo-config/kde-qt-common/expert.cpp
@@ -34,9 +34,9 @@
 Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	tqlayout=new TQHBoxLayout(this);
+	layout=new TQHBoxLayout(this);
 	edit=new TQMultiLineEdit(this);
-	tqlayout->addWidget(edit);
+	layout->addWidget(edit);
 	connect(edit, TQT_SIGNAL(textChanged()), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(edit, _("You can edit the lilo.conf file directly here. All changes you make here are automatically transferred to the graphical interface."));
 	update();
diff --git a/lilo-config/kde-qt-common/expert.h b/lilo-config/kde-qt-common/expert.h
index c2971a1..a3829d3 100644
--- a/lilo-config/kde-qt-common/expert.h
+++ b/lilo-config/kde-qt-common/expert.h
@@ -31,7 +31,7 @@
 #include <lilo.h>
 #include <tqwidget.h>
 #include <tqmultilineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 class Expert:public TQWidget
 {
 	Q_OBJECT
@@ -48,7 +48,7 @@ signals:
 	void configChanged();
 private:
 	liloconf	*lilo;
-	TQHBoxLayout	*tqlayout;
+	TQHBoxLayout	*layout;
 	TQMultiLineEdit	*edit;
 };
 #endif
diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp
index e67dc1f..71e0b48 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -29,7 +29,7 @@
 #include "general.moc"
 #include "EditWidget.h"
 #include <Disks.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <ui.h>
 #include <tqwhatsthis.h>
 
@@ -38,9 +38,9 @@
 General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 	TQHBox *drv=new TQHBox(this);
 	TQLabel *drive_lbl=new TQLabel(_("Install &boot record to drive/partition:"), drv);
 	drive=new TQComboBox(false, drv);
@@ -51,7 +51,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	for(StringList::const_iterator it=p.begin(); it!=p.end(); it++)
 		drive->insertItem((*it).cstr());
 	connect(drive, TQT_SIGNAL(activated(int)), TQT_SIGNAL(configChanged()));
-	tqlayout->addWidget(drv);
+	layout->addWidget(drv);
 	TQWhatsThis::add(drv, _("Select the drive or partition you want to install the LILO boot loader to here. Unless you intend to use other boot managers in addition to LILO, this should be the MBR (master boot record) of your boot drive.<br>In this case, you should probably select <i>/dev/hda</i> if your boot drive is an IDE drive or <i>/dev/sda</i> if your boot drive is SCSI."));
 
 	TQHBox *to=new TQHBox(this);
@@ -60,7 +60,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	timeout->setSuffix(_("/10 seconds"));
 	connect(timeout, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(configChanged()));
 	to_lbl->setBuddy(timeout);
-	tqlayout->addWidget(to);
+	layout->addWidget(to);
 	TQWhatsThis::add(to, _("LILO will wait the amount of time specified here before booting the kernel (or OS) marked as <i>default</i> in the <b>Images</b> tab."));
 
 	TQHBox *modes=new TQHBox(this);
@@ -70,7 +70,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	compact=new TQCheckBox(_("Use &compact mode"), modes);
 	connect(compact, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(compact, _("Check this box if you want to use the compact mode.<br>The compact mode tries to merge read requests for adjacent sectors into a single read request. This reduces load time and keeps the boot map smaller, but will not work on all systems."));
-	tqlayout->addWidget(modes);
+	layout->addWidget(modes);
 
 	TQHBox *opts=new TQHBox(this);
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
@@ -80,7 +80,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
 	TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
-	tqlayout->addWidget(opts);
+	layout->addWidget(opts);
 
 	TQHBox *pw=new TQHBox(this);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
@@ -91,7 +91,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	password->setEchoMode(TQLineEdit::Password);
 	connect(password, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
-	tqlayout->addWidget(pw);
+	layout->addWidget(pw);
 
 	TQHBox *vgab=new TQHBox(this);
 	TQLabel *vlbl=new TQLabel(_("&Default graphics mode on text console:"), vgab);
@@ -125,13 +125,13 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
         connect( vga, TQT_SIGNAL(activated ( int )), TQT_SIGNAL(configChanged()));
-	tqlayout->addWidget(vgab);
+	layout->addWidget(vgab);
 
 	prompt=new TQCheckBox(_("Enter LILO &prompt automatically"), this);
 	TQWhatsThis::add(prompt, _("If this box is checked, LILO goes to the LILO prompt whether or not a key is pressed. If it is turned off, LILO boots the default operating system unless shift is pressed (in that case, it goes to the LILO prompt).<br>This sets the <i>prompt</i> option in lilo.conf."));
         connect(prompt, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 
-	tqlayout->addWidget(prompt);
+	layout->addWidget(prompt);
 
 	update();
 }
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index a0f1c37..559b993 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -44,18 +44,18 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 {
 	current=""; previous=""; // Using TQString() gives problems!
 	lilo=l;
-	tqlayout=new TQHBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	layout=new TQHBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 	images=new TQListBox(this);
-	tqlayout->addWidget(images, 1);
+	layout->addWidget(images, 1);
 	connect(images, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(imageSelected(const TQString &)));
 	TQWhatsThis::add(images, _("This is the list of kernels and operating systems you can currently boot. Select which one you want to edit here."));
 
 	parameters=new TQVBox(this);
 	parameters->setMargin(SPACE_MARGIN);
 	parameters->setSpacing(SPACE_INSIDE);
-	tqlayout->addWidget(parameters, 2);
+	layout->addWidget(parameters, 2);
 	image=new EditWidget(_("&Kernel:"), "", true, parameters);
 	TQWhatsThis::add(image, _("Enter the filename of the kernel you want to boot here."));
 	connect(image, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged()));
@@ -75,7 +75,7 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 	actions=new TQVBox(this);
 	actions->setMargin(SPACE_MARGIN);
 	actions->setSpacing(SPACE_INSIDE);
-	tqlayout->addWidget(actions);
+	layout->addWidget(actions);
 	dflt=new TQPushButton(_("Set &Default"), actions);
 	TQWhatsThis::add(dflt, _("Boot this kernel/OS if the user doesn't make a different choice"));
 	connect(dflt, TQT_SIGNAL(clicked()), TQT_SLOT(dfltClicked()));
diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h
index 898b95b..1f54448 100644
--- a/lilo-config/kde-qt-common/images.h
+++ b/lilo-config/kde-qt-common/images.h
@@ -31,7 +31,7 @@
 #include <lilo.h>
 #include <tqwidget.h>
 #include <tqmultilineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tqvbox.h>
@@ -63,7 +63,7 @@ private:
 	liloconf	*lilo;
 	TQString		previous;
 	TQString		current;
-	TQHBoxLayout	*tqlayout;
+	TQHBoxLayout	*layout;
 	TQListBox	*images;
 	TQVBox		*parameters;
 	EditWidget	*image;
diff --git a/lilo-config/kde/Details.cpp b/lilo-config/kde/Details.cpp
index 86e47bb..0a1e7e8 100644
--- a/lilo-config/kde/Details.cpp
+++ b/lilo-config/kde/Details.cpp
@@ -26,7 +26,7 @@
 */
 #include "Details.moc"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index 75f514c..e16cbcc 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -31,16 +31,16 @@
 #include <ui.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kaboutdata.h>
 #include <unistd.h>
 
 KControl::KControl(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
 	m=new MainWidget(this, name);
-	tqlayout->addWidget(m);
+	layout->addWidget(m);
 	connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
         if (getuid() != 0) {
             m->makeReadOnly();
diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp
index 5abce8a..579d04b 100644
--- a/lilo-config/qt/Details.cpp
+++ b/lilo-config/qt/Details.cpp
@@ -26,7 +26,7 @@
 */
 
 #include "Details.moc"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
@@ -36,9 +36,9 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 {
 	l=lilo;
 
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 
 	TQHBox *vgab=new TQHBox(this);
 	TQLabel *vlbl=new TQLabel(_("&Graphics mode on text console:"), vgab);
@@ -71,15 +71,15 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	vga->insertItem(_("VGA 1280x1024, 32767 colors (793)"));
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
-	tqlayout->addWidget(vgab);
+	layout->addWidget(vgab);
 	
 	readonly=new TQCheckBox(_("Mount root filesystem &read-only"), this);
 	TQWhatsThis::add(readonly, _("Mount the root filesystem for this kernel read-only. Since the init scripts normally take care of remounting the root filesystem in read-write mode after running some checks, this should always be turned on.<br>Don't turn this off unless you know what you're doing."));
-	tqlayout->addWidget(readonly);
+	layout->addWidget(readonly);
 
 	unsafe=new TQCheckBox(_("Do not check &partition table"), this);
 	TQWhatsThis::add(unsafe, _("This turns off some sanity checks while writing the configuration. This shouldn't be used under \"normal\" circumstances, but it's useful, for example, for installing the possibility to boot from a floppy disk without having a floppy in the drive every time you run lilo.<br>This sets the <i>unsafe</i> keyword in lilo.conf."));
-	tqlayout->addWidget(unsafe);
+	layout->addWidget(unsafe);
 
 	TQHBox *opts=new TQHBox(this);
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
@@ -87,7 +87,7 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	restricted=new TQCheckBox(_("R&estrict parameters"), opts);
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
 	TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf."));
-	tqlayout->addWidget(opts);
+	layout->addWidget(opts);
 
 	TQHBox *pw=new TQHBox(this);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
@@ -96,12 +96,12 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	password->setMaxLength(15);
 	password->setEchoMode(TQLineEdit::Password);
 	TQWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here."));
-	tqlayout->addWidget(pw);
+	layout->addWidget(pw);
 
 	TQHBox *btns=new TQHBox(this);
 	ok=new TQPushButton(_("&OK"), btns);
 	cancel=new TQPushButton(_("&Cancel"), btns);
-	tqlayout->addWidget(btns);
+	layout->addWidget(btns);
 	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 
diff --git a/lilo-config/qt/InputBox.cpp b/lilo-config/qt/InputBox.cpp
index ca1c557..231334f 100644
--- a/lilo-config/qt/InputBox.cpp
+++ b/lilo-config/qt/InputBox.cpp
@@ -26,31 +26,31 @@
 */
 
 #include "InputBox.moc"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 #include <ui.h>
 
 InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f):TQDialog(parent, name, true, f)
 {
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 	for(entries::iterator it=e.begin(); it!=e.end(); it++) {
 		EditWidget *ed=new EditWidget((*it).label, (*it).dflt, (*it).isFile, this);
 		TQWhatsThis::add(ed, (*it).help);
-		tqlayout->addWidget(ed);
+		layout->addWidget(ed);
 		edit.insert(edit.end(), ed);
 	}
 	if(hasCancel) {
 		TQHBox *btns=new TQHBox(this);
 		ok=new TQPushButton(_("&OK"), btns);
 		cancel=new TQPushButton(_("&Cancel"), btns);
-		tqlayout->addWidget(btns);
+		layout->addWidget(btns);
 		connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	} else {
 		ok=new TQPushButton(_("&OK"), this);
-		tqlayout->addWidget(ok);
+		layout->addWidget(ok);
 	}
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 }
diff --git a/lilo-config/qt/standalone.cpp b/lilo-config/qt/standalone.cpp
index 111ab40..4dc73e2 100644
--- a/lilo-config/qt/standalone.cpp
+++ b/lilo-config/qt/standalone.cpp
@@ -62,14 +62,14 @@ Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
 	TQWhatsThis::add(_cancel, _("This button exits the program without saving your changes."));
 	connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancel()));
 	_apply->setEnabled(false);
-	setMinimumWidth(actions->tqsizeHint().width()+10);
+	setMinimumWidth(actions->sizeHint().width()+10);
 	arrangeWidgets();
 }
 
 void Standalone::arrangeWidgets()
 {
-	m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
-	actions->setGeometry(SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->tqsizeHint().height());
+	m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
+	actions->setGeometry(SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->sizeHint().height());
 }
 
 void Standalone::resizeEvent(TQResizeEvent *e)
diff --git a/secpolicy/pamview.cpp b/secpolicy/pamview.cpp
index 869855b..ed51c4c 100644
--- a/secpolicy/pamview.cpp
+++ b/secpolicy/pamview.cpp
@@ -22,12 +22,12 @@
  *
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
 #include <tqlabel.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 
diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp
index 1788ee1..f74c4e9 100644
--- a/secpolicy/secpolicywin.cpp
+++ b/secpolicy/secpolicywin.cpp
@@ -49,7 +49,7 @@ SecPolicyWin::SecPolicyWin(const char *name)
 
   adjustSize();
   // work around KTMainWindow sizing bug.
-  resize(tqsizeHint().width(), tqsizeHint().height() + mBar->height() +
+  resize(sizeHint().width(), sizeHint().height() + mBar->height() +
 	 KDialog::marginHint());
   show();
 }