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

103 files changed, 560 insertions, 560 deletions

diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp
index 0966f58..4afc15d 100644
--- a/kbstateapplet/kbstate.cpp
+++ b/kbstateapplet/kbstate.cpp
@@ -179,7 +179,7 @@ void KbStateApplet::updateMenu()
 
 void calculateSizes (int space, int modifiers, int lockkeys, int accessx,
 							bool showMouse, int &lines, int &length, int &size)
-// Calculates the tqlayout based on a given number of modifiers, lockkeys and
+// Calculates the layout based on a given number of modifiers, lockkeys and
 // accessx features.
 // Output:
 // lines:  number of lines
@@ -281,17 +281,17 @@ void KbStateApplet::toggleFillSpace() {
 	fillSpace = !fillSpace;
 	saveConfig();
 	updateMenu();
-	tqlayout();
+	layout();
 	updateGeometry();
 	emit updateLayout();
 }
 
 void KbStateApplet::resizeEvent( TQResizeEvent*e ) {
    TQWidget::resizeEvent(e);
-   tqlayout();
+   layout();
 }
 
-void KbStateApplet::tqlayout() {
+void KbStateApplet::layout() {
 	int size = this->size;
 
    int lines, length, x,y,dx,dy, ldx,ldy;
@@ -608,7 +608,7 @@ bool KbStateApplet::x11Event (XEvent *evt) {
 				else
 					mouse->setActiveKey (0);
 
-				tqlayout();
+				layout();
 				updateGeometry();
 				emit updateLayout();
 				break;
@@ -660,7 +660,7 @@ void KbStateApplet::stateChangeRequest (KeyIcon *source, bool latched, bool lock
 void KbStateApplet::toggleModifier() {
    showModifiers = !showModifiers;
    updateMenu();
-   tqlayout();
+   layout();
    updateGeometry();
    saveConfig();
    emit updateLayout();
@@ -669,7 +669,7 @@ void KbStateApplet::toggleModifier() {
 void KbStateApplet::toggleLockkeys() {
    showLockkeys = !showLockkeys;
    updateMenu();
-   tqlayout();
+   layout();
    updateGeometry();
    saveConfig();
    emit updateLayout();
@@ -678,7 +678,7 @@ void KbStateApplet::toggleLockkeys() {
 void KbStateApplet::toggleMouse() {
    showMouse = !showMouse;
    updateMenu();
-   tqlayout();
+   layout();
    updateGeometry();
    saveConfig();
    emit updateLayout();
@@ -687,7 +687,7 @@ void KbStateApplet::toggleMouse() {
 void KbStateApplet::toggleAccessX() {
 	showAccessX = !showAccessX;
 	updateMenu();
-	tqlayout();
+	layout();
 	updateGeometry();
 	saveConfig();
 	emit updateLayout();
@@ -810,7 +810,7 @@ void KeyIcon::drawButton (TQPainter *p) {
    int y = (height()-locked.height())/2;
    int o = 0;
    if (isLocked || isLatched) {
-      qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), true, 1, NULL);
+      qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), true, 1, NULL);
       p->fillRect (1,1,width()-2,height()-2, KGlobalSettings::highlightColor());
 		if (strcmp(modifierKeys[keyId].icon, ""))
 			p->drawPixmap (x+1,y+1, latched);
@@ -818,7 +818,7 @@ void KeyIcon::drawButton (TQPainter *p) {
       o = 1;
    }
    else {
-      qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), false, 1, NULL);
+      qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), false, 1, NULL);
 		if (strcmp(modifierKeys[keyId].icon, ""))
 			p->drawPixmap (x,y, unlatched);
       black = KGlobalSettings::textColor();
@@ -1068,12 +1068,12 @@ void TimeoutIcon::drawButton (TQPainter *p) {
 
 StatusIcon::StatusIcon (const TQString &text, TQWidget *parent, const char *name)
  : TQPushButton (text, parent, name) {
-   tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
+   setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
 }
 
 StatusIcon::~StatusIcon () {
 }
 
-TQSize StatusIcon::tqminimumSizeHint () const {
+TQSize StatusIcon::minimumSizeHint () const {
    return TQSize (0,0);
 }
diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h
index fc6987f..65cf63f 100644
--- a/kbstateapplet/kbstate.h
+++ b/kbstateapplet/kbstate.h
@@ -40,7 +40,7 @@ public:
    StatusIcon (const TQString &text, TQWidget *parent, const char *name=0);
    ~StatusIcon ();
 
-   TQSize tqminimumSizeHint () const;
+   TQSize minimumSizeHint () const;
 };
 typedef TQPtrList<StatusIcon> IconList;
 
@@ -170,7 +170,7 @@ private slots:
 private:
    void loadConfig();
    void saveConfig();
-   void tqlayout();
+   void layout();
    
    int xkb_base_event_type;
 
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 5827468..41807f1 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -21,8 +21,8 @@
 #include <tqdir.h>
 #include <tqprinter.h>
 #include <tqpainter.h>
-#include <tqlayout.h>
-#include <tqclipboard.h>
+#include <layout.h>
+#include <clipboard.h>
 #include <tqdragobject.h>
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
@@ -247,7 +247,7 @@ void KmagApp::initActions()
 void KmagApp::initView()
 {
   m_zoomView = new KMagZoomView( this, "ZoomView" );
-  m_zoomView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) );
+  m_zoomView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) );
   m_zoomView->setFrameShape( TQFrame::StyledPanel );
   m_zoomView->setFrameShadow( TQFrame::Raised );
 
@@ -550,7 +550,7 @@ void KmagApp::saveZoomPixmap()
   bool toggled(false);
 
   // stop refresh temporarily
-  if (m_zoomView->getRefreshtqStatus()) {
+  if (m_zoomView->getRefreshStatus()) {
     slotToggleRefresh();
     toggled = true;
   }
@@ -571,7 +571,7 @@ void KmagApp::saveZoomPixmap()
           KMessageBox::error(0, i18n("Unable to upload file over the network."),
                             i18n("Error Writing File"));
         } else {
-          KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()),
+          KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()),
                               i18n("Information"), "save_confirm");
         }
       }
@@ -583,7 +583,7 @@ void KmagApp::saveZoomPixmap()
         KMessageBox::error(0, i18n("Unable to save file. Please check if you have permission to write to the directory."),
                             i18n("Error Writing File"));
       } else {
-        KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()),
+        KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()),
                                 i18n("Information"), "save_confirm");
       }
     }
@@ -597,7 +597,7 @@ void KmagApp::saveZoomPixmap()
 void KmagApp::slotToggleRefresh()
 {
   m_zoomView->toggleRefresh();
-  if(m_zoomView->getRefreshtqStatus()) {
+  if(m_zoomView->getRefreshStatus()) {
     refreshSwitch->setIcon("stop.png");
     refreshSwitch->setText(i18n("Stop"));
     refreshSwitch->setToolTip(i18n("Click to stop window update"));
@@ -810,7 +810,7 @@ void KmagApp::slotFilePrint()
 #endif
 
   // stop refresh temporarily
-  if (m_zoomView->getRefreshtqStatus()) {
+  if (m_zoomView->getRefreshStatus()) {
     slotToggleRefresh();
     toggled = true;
   }
@@ -864,7 +864,7 @@ void KmagApp::slotFileQuit()
 
 void KmagApp::copyToClipBoard()
 {
-  TQClipboard *cb=KApplication::tqclipboard();
+  TQClipboard *cb=KApplication::clipboard();
   cb->setPixmap(m_zoomView->getPixmap());
 }
 
diff --git a/kmag/kmag.h b/kmag/kmag.h
index aeee22b..445d51e 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -71,7 +71,7 @@ class KmagApp : public KMainWindow
 
 
   protected:
-    /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+    /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
      * file
      */
     void saveOptions();
diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp
index 236bddf..73caf5a 100644
--- a/kmag/kmagselrect.cpp
+++ b/kmag/kmagselrect.cpp
@@ -184,19 +184,19 @@ void KMagSelRect::hide()
 void KMagSelRect::update()
 {
   // make sure the selection window does not go outside of the display
-  if (height() > TQApplication::desktop()->tqgeometry().height())
-    setHeight (TQApplication::desktop()->tqgeometry().height());
-  if (width() > TQApplication::desktop()->tqgeometry().width())
-    setWidth (TQApplication::desktop()->tqgeometry().width());
+  if (height() > TQApplication::desktop()->geometry().height())
+    setHeight (TQApplication::desktop()->geometry().height());
+  if (width() > TQApplication::desktop()->geometry().width())
+    setWidth (TQApplication::desktop()->geometry().width());
 
   if (top() < 0)
     moveTop (0);
   if (left() < 0)
     moveLeft (0);
-  if (bottom() > TQApplication::desktop()->tqgeometry().bottom())
-    moveBottom (TQApplication::desktop()->tqgeometry().bottom());
-  if (right() > TQApplication::desktop()->tqgeometry().right())
-    moveRight (TQApplication::desktop()->tqgeometry().right());
+  if (bottom() > TQApplication::desktop()->geometry().bottom())
+    moveBottom (TQApplication::desktop()->geometry().bottom());
+  if (right() > TQApplication::desktop()->geometry().right())
+    moveRight (TQApplication::desktop()->geometry().right());
 
   if (selectionwindow != 0)
     selectionwindow->setSelRect (TQRect (topLeft(), bottomRight()));
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index f0f3715..47f6a46 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -80,22 +80,22 @@ static uchar phand_bits[] = {
 
 
 static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Window start = 0, int level = -1) {
-  Window root, parent, *tqchildren; uint ntqchildren;
+  Window root, parent, *children; uint nchildren;
   if (0 == start)
     start = qt_xrootwin();
 
   bool winIdFound = false;
-  if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &tqchildren, &ntqchildren)) {
-    for (uint i=0; i < ntqchildren; ++i) {
+  if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &children, &nchildren)) {
+    for (uint i=0; i < nchildren; ++i) {
       if (winIdFound) {
-        if (ignoreId != tqchildren [i]) {
+        if (ignoreId != children [i]) {
           XWindowAttributes atts;
-          XGetWindowAttributes (qt_xdisplay(), tqchildren [i], &atts);
+          XGetWindowAttributes (qt_xdisplay(), children [i], &atts);
           if (atts.map_state == IsViewable)
             region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle);
         }
       }
-      else if (winId == tqchildren [i])
+      else if (winId == children [i])
         winIdFound = true;
 
       // According to tests, my own window ID is either on toplevel or two levels below.
@@ -103,15 +103,15 @@ static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Win
       // then to five recursion levels, and make a full recursive search only if that
       // was unsuccessful.
       else if (level > 1)
-        winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], level-1);
+        winIdFound = obscuredRegion (region, winId, ignoreId, children [i], level-1);
       else if (level == -1)
-        if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 0)))
-          if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 1)))
-            winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], -1);
+        if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 0)))
+          if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 1)))
+            winIdFound = obscuredRegion (region, winId, ignoreId, children [i], -1);
     }
 
-    if (tqchildren != NULL)
-      XFree (tqchildren);
+    if (children != NULL)
+      XFree (children);
   }
 
   return winIdFound;
@@ -255,7 +255,7 @@ void KMagZoomView::drawContents ( TQPainter * p, int clipx, int clipy, int clipw
   if (m_invert) {
     TQImage zoomedImage;
     zoomedImage = zoomedPixmap.convertToImage();
-    zoomedImage.tqinvertPixels (false);
+    zoomedImage.invertPixels (false);
     p->drawImage (TQPoint (clipx-contentsX(), clipy-contentsY()), zoomedImage, zoomedImage.rect(),
                   TQt::ThresholdDither | TQt::ThresholdAlphaDither | TQt::AvoidDither);
   } else {
@@ -493,7 +493,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
       // set the mouse mode to normal
       m_mouseMode = Normal;
 
-      // restore the cursor tqshape
+      // restore the cursor shape
       setCursor(arrowCursor);
 
       // restore the cursor position
@@ -504,7 +504,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
       // set the mouse mode to normal
       m_mouseMode = Normal;
 
-      // restore the cursor tqshape
+      // restore the cursor shape
       setCursor(arrowCursor);
 
       // restore the cursor position
@@ -516,7 +516,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
       // set the mouse mode to normal
       m_mouseMode = Normal;
 
-      // restore the cursor tqshape
+      // restore the cursor shape
       setCursor(arrowCursor);
     }    
     break;
@@ -706,7 +706,7 @@ void KMagZoomView::fitToWindow()
   m_selRect.moveCenter(currCenter);
   m_selRect.update();
 
-  viewport()->tqrepaint(false);
+  viewport()->repaint(false);
 }
 
 void KMagZoomView::setFitToWindow(bool fit)
@@ -751,18 +751,18 @@ void KMagZoomView::grabFrame()
   intersection &= TQRegion (selRect, TQRegion::Rectangle);
 
   // We don't want to overpaint other windows that happen to be on top
-  obscuredRegion (intersection, tqtopLevelWidget()->winId(), m_selRect.winId());
+  obscuredRegion (intersection, topLevelWidget()->winId(), m_selRect.winId());
   intersection.translate (-selRect.x(), -selRect.y());
 
   TQPainter painter (&m_grabbedPixmap, true);
-  TQMemArray<TQRect> rects (intersection.tqrects());
+  TQMemArray<TQRect> rects (intersection.rects());
   for (uint i = 0; i < rects.size(); i++)
     painter.fillRect (rects[i], TQBrush (TQColor (128, 128, 128)));
 
-  // call tqrepaint to display the newly grabbed image
+  // call repaint to display the newly grabbed image
   TQRect newSize = m_zoomMatrix.mapRect (m_grabbedPixmap.rect());
   resizeContents (newSize.width(), newSize.height());
-  viewport()->tqrepaint(false);
+  viewport()->repaint(false);
 }
 
 
@@ -775,7 +775,7 @@ void KMagZoomView::updateMouseView()
   if(m_selRect.left() <= pos.x() && pos.x() <= m_selRect.right() &&
      m_selRect.top() <= pos.y() && pos.y() <= m_selRect.bottom() &&
      m_refreshSwitch)
-    viewport()->tqrepaint(false);
+    viewport()->repaint(false);
 }
 
 /**
@@ -801,7 +801,7 @@ void KMagZoomView::setZoom(float zoom)
 {
   m_zoom = zoom;
   updateMatrix();
-  viewport()->tqrepaint();
+  viewport()->repaint();
 }
 
 /**
@@ -811,7 +811,7 @@ void KMagZoomView::setRotation(int rotation)
 {
   m_rotation = rotation;
   updateMatrix();
-  viewport()->tqrepaint();
+  viewport()->repaint();
 }
 
 /**
@@ -820,7 +820,7 @@ void KMagZoomView::setRotation(int rotation)
 void KMagZoomView::setInvertation(bool invert)
 {
   m_invert = invert;
-  viewport()->tqrepaint();
+  viewport()->repaint();
 }
 
 /**
diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h
index 1f8d9bc..89882b4 100644
--- a/kmag/kmagzoomview.h
+++ b/kmag/kmagzoomview.h
@@ -61,7 +61,7 @@ class KMagZoomView : public TQScrollView
     TQPixmap getPixmap();
 
     /// Returns the state of the refresh switch
-    bool getRefreshtqStatus() const { return m_refreshSwitch; };
+    bool getRefreshStatus() const { return m_refreshSwitch; };
 
     /// Returns teh status of followMouse
     bool getFollowMouse() const { return m_followMouse; };
diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp
index 3df4b68..e269caf 100644
--- a/kmousetool/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool/kmousetool.cpp
@@ -39,7 +39,7 @@
 #include <tqsound.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <ksystemtray.h>
diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui
index d5e22fa..2d7d9fb 100644
--- a/kmousetool/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetool/kmousetoolui.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -49,7 +49,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -65,7 +65,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -207,7 +207,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -239,7 +239,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -276,7 +276,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -300,7 +300,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignJustify|AlignVCenter</set>
                     </property>
                 </widget>
@@ -314,7 +314,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>8</width>
                             <height>8</height>
@@ -341,7 +341,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -365,7 +365,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>241</width>
                             <height>20</height>
diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp
index 3ca0b5c..1fc70a0 100644
--- a/kmouth/configwizard.cpp
+++ b/kmouth/configwizard.cpp
@@ -17,7 +17,7 @@
 
 
 #include "configwizard.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klistview.h>
 #include <klocale.h>
diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h
index fe610a6..b8d791d 100644
--- a/kmouth/kmouth.h
+++ b/kmouth/kmouth.h
@@ -79,7 +79,7 @@ class KMouthApp : public KMainWindow
     void enableMenuEntries(bool existSelectedEntries, bool existDeselectedEntries);
 
   protected:
-    /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+    /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
      * file
      */
     void saveOptions();
diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index a32eb6e..89842a3 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqgrid.h>
@@ -125,11 +125,11 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
    tabCtl = new TQTabWidget (pageGeneral, "general");
 
    behaviourWidget = new PreferencesWidget (tabCtl, "prefPage");
-   behaviourWidget->tqlayout()->setMargin(KDialog::marginHint());
+   behaviourWidget->layout()->setMargin(KDialog::marginHint());
    tabCtl->addTab (behaviourWidget, i18n("&Preferences"));
    
    commandWidget = new TextToSpeechConfigurationWidget (tabCtl, "ttsTab");
-   commandWidget->tqlayout()->setMargin(KDialog::marginHint());
+   commandWidget->layout()->setMargin(KDialog::marginHint());
    tabCtl->addTab (commandWidget, i18n("&Text-to-Speech"));
    
    TQPixmap iconCompletion = KGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp
index 2332ee6..ffa3ff2 100644
--- a/kmouth/phrasebook/phrasebook.cpp
+++ b/kmouth/phrasebook/phrasebook.cpp
@@ -151,7 +151,7 @@ TQCString encodeString (const TQString str) {
    TQCString res = "";
    for (int i = 0; i < (int)str.length(); i++) {
       TQChar ch = str.at(i);
-      ushort uc = ch.tqunicode();
+      ushort uc = ch.unicode();
       TQCString number; number.setNum(uc);
       if ((uc>127) || (uc<32) || (ch=='<') || (ch=='>') || (ch=='&') || (ch==';'))
          res = res + "&#" + number + ";";
@@ -274,8 +274,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
    }
 
    if (KIO::NetAccess::exists(url)) {
-      if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-                                                       "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
+      if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+                                                       "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
          return 0;
       }
    }
@@ -286,8 +286,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
          url.setFileName (url.fileName(false) + ".phrasebook");
       }
       else if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) {
-         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
-                                                           "Do you wish to add <i>.phrasebook</i> to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add"));
+         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
+                                                           "Do you wish to add <i>.phrasebook</i> to the filename?").arg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add"));
          if (filetype == KMessageBox::Cancel) {
             return 0;
          }
@@ -302,8 +302,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
          result = save (url, false);
       }
       else {
-         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. "
-                                                           "Do you wish to save in phrasebook format?").tqarg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text"));
+         int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. "
+                                                           "Do you wish to save in phrasebook format?").arg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text"));
          if (filetype == KMessageBox::Cancel) {
             return 0;
          }
@@ -477,15 +477,15 @@ const char *PhraseBookDrag::format (int i) const {
       return xmlphrasebook.format(i/3);
 }
 
-TQByteArray PhraseBookDrag::tqencodedData (const char* mime) const {
+TQByteArray PhraseBookDrag::encodedData (const char* mime) const {
    TQCString m(mime);
    m = m.lower();
    if (m.contains("xml-phrasebook"))
-      return xmlphrasebook.tqencodedData(mime);
+      return xmlphrasebook.encodedData(mime);
    else if (m.contains("xml"))
-      return xml.tqencodedData(mime);
+      return xml.encodedData(mime);
    else
-      return plain.tqencodedData(mime);
+      return plain.encodedData(mime);
 }
 
 bool PhraseBookDrag::canDecode (const TQMimeSource* e) {
diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h
index 200bbae..25f1d37 100644
--- a/kmouth/phrasebook/phrasebook.h
+++ b/kmouth/phrasebook/phrasebook.h
@@ -157,7 +157,7 @@ public:
    virtual void setBook (PhraseBook *book);
 
    const char *format (int i) const;
-   virtual TQByteArray tqencodedData (const char *) const;
+   virtual TQByteArray encodedData (const char *) const;
 
    static bool canDecode (const TQMimeSource *e);
    static bool decode (const TQMimeSource *e, PhraseBook *book);
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 3cfe25b..50a5b05 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -17,8 +17,8 @@
 
 // include files for QT
 #include <tqapplication.h>
-#include <tqlayout.h>
-#include <tqclipboard.h>
+#include <layout.h>
+#include <clipboard.h>
 #include <tqradiobutton.h>
 #include <tqevent.h>
 #include <tqpainter.h>
@@ -132,7 +132,7 @@ void CheckBookItem::childChange (int numberDiff, int selDiff) {
       ((CheckBookItem*)parent)->childChange (numberDiff, selDiff);
 
    TQString text = i18n(" (%1 of %2 books selected)");
-   text = text.tqarg(selectedBooks).tqarg(numberOfBooks);
+   text = text.arg(selectedBooks).arg(numberOfBooks);
    setText(0, this->text(PhraseBookPrivate::name)+text);
 }
 
@@ -597,7 +597,7 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) {
       {
          TQString s = i18n("In order to use the '%1' key as a shortcut, "
                           "it must be combined with the "
-                          "Win, Alt, Ctrl, and/or Shift keys.").tqarg(TQChar(key.sym()));
+                          "Win, Alt, Ctrl, and/or Shift keys.").arg(TQChar(key.sym()));
          KMessageBox::sorry( this, s, i18n("Invalid Shortcut Key") );
          return;
       }
@@ -667,12 +667,12 @@ void PhraseBookDialog::slotCut () {
 void PhraseBookDialog::slotCopy () {
    PhraseBook book;
    treeView->fillBook (&book, true);
-   TQApplication::tqclipboard()->setData(new PhraseBookDrag(&book));
+   TQApplication::clipboard()->setData(new PhraseBookDrag(&book));
 }
 
 void PhraseBookDialog::slotPaste () {
    PhraseBook book;
-   if (PhraseBookDrag::decode(TQApplication::tqclipboard()->data(), &book)) {
+   if (PhraseBookDrag::decode(TQApplication::clipboard()->data(), &book)) {
       addBook (treeView->currentItem(), &book);
    }
 }
@@ -731,7 +731,7 @@ void PhraseBookDialog::slotImportPhrasebook (const KURL &url) {
       if (book.open (url))
          addBook(treeView->currentItem(), &book);
       else
-         KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() ));
+         KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
    }
 }
 
@@ -741,7 +741,7 @@ void PhraseBookDialog::slotExportPhrasebook () {
    
    KURL url;
    if (book.save (this, i18n("Export Phrase Book"), url) == -1)
-      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() ));
+      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() ));
 }
 
 void PhraseBookDialog::slotPrint()
diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp
index e4adde1..27735c5 100644
--- a/kmouth/phrasebook/phrasetree.cpp
+++ b/kmouth/phrasebook/phrasetree.cpp
@@ -470,7 +470,7 @@ void PhraseTree::_warning (const KKeySequence& cut, TQString sAction, TQString s
        i18n("The '%1' key combination has already been allocated "
        "to %2.\n"
        "Please choose a unique key combination.").
-       tqarg(cut.toString()).tqarg(sAction);
+       arg(cut.toString()).arg(sAction);
 
    KMessageBox::sorry( this, s, sTitle );
 }
@@ -485,7 +485,7 @@ bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) {
       {
          if (warnUser)
             _warning (cut.seq(iSeq),
-                      i18n("the standard \"%1\" action").tqarg(KStdAccel::label(id)),
+                      i18n("the standard \"%1\" action").arg(KStdAccel::label(id)),
                       i18n("Conflict with Standard Application Shortcut"));
          return true;
       }
@@ -501,7 +501,7 @@ bool PhraseTree::isGlobalKeyPresent (const KShortcut& cut, bool warnUser) {
       if (iSeq > -1) {
          if (warnUser)
             _warning (cut.seq(iSeq),
-                      i18n("the global \"%1\" action").tqarg(it.key()),
+                      i18n("the global \"%1\" action").arg(it.key()),
                       i18n("Conflict with Global Shortcuts"));
          return true;
       }
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 3cbd9d4..08fc6b9 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -18,10 +18,10 @@
 // include files for TQt
 #include <tqprinter.h>
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 // include files for KDE
 #include <klistbox.h>
@@ -48,16 +48,16 @@
 PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,name) {
    isInSlot = false;
    setBackgroundMode(PaletteBase);
-   TQVBoxLayout *tqlayout = new TQVBoxLayout (this);
+   TQVBoxLayout *layout = new TQVBoxLayout (this);
 
    listBox = new KListBox (this);
    listBox->setFocusPolicy(TQ_NoFocus);
    listBox->setSelectionMode (TQListBox::Extended);
    TQWhatsThis::add (listBox, i18n("This list contains the history of spoken sentences. You can select sentences and press the speak button for re-speaking."));
-   tqlayout->addWidget(listBox);
+   layout->addWidget(listBox);
 
    TQHBoxLayout *rowLayout = new TQHBoxLayout ();
-   tqlayout->addLayout(rowLayout);
+   layout->addLayout(rowLayout);
 
    completion = new WordCompletion();
 
@@ -271,7 +271,7 @@ void PhraseList::cutListSelection () {
 }
 
 void PhraseList::copyListSelection () {
-   TQApplication::tqclipboard()->setText (getListSelection().join ("\n"));
+   TQApplication::clipboard()->setText (getListSelection().join ("\n"));
 }
 
 void PhraseList::lineEntered (const TQString &phrase) {
@@ -446,7 +446,7 @@ void PhraseList::save () {
 
    KURL url;
    if (book.save (this, i18n("Save As"), url, false) == -1)
-      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() ));
+      KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() ));
 }
 
 void PhraseList::open () {
@@ -472,7 +472,7 @@ void PhraseList::open (KURL url) {
          insertIntoPhraseList (*it, false);
    }
    else
-      KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() ));
+      KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
 }
 
 #include "phraselist.moc"
diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp
index 6e902f3..0574d2b 100644
--- a/kmouth/phraselistitem.cpp
+++ b/kmouth/phraselistitem.cpp
@@ -47,6 +47,6 @@ void PhraseListItem::paint (TQPainter *p) {
    if (drawCursor()) {
       TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox()));
       listBox()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r,
-                                        listBox()->tqcolorGroup());
+                                        listBox()->colorGroup());
    }
 }
diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp
index 81ed650..b682a47 100644
--- a/kmouth/speech.cpp
+++ b/kmouth/speech.cpp
@@ -21,7 +21,7 @@
 #include <tqvaluestack.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfile.h>
 #include <kdebug.h>
 
@@ -225,10 +225,10 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS
 }
 
 void Speech::receivedStdout (KProcess *, char *buffer, int buflen) {
-   kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n";
+   kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
 }
 void Speech::receivedStderr (KProcess *, char *buffer, int buflen) {
-   kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n";
+   kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
 }
 
 void Speech::wroteStdin(KProcess *) {
diff --git a/kmouth/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp
index f7fe16a..cd4b6c7 100644
--- a/kmouth/texttospeechconfigurationwidget.cpp
+++ b/kmouth/texttospeechconfigurationwidget.cpp
@@ -18,9 +18,9 @@
 
 #include "texttospeechconfigurationwidget.h"
 #include <kconfig.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <kcombobox.h>
 #include <klocale.h>
diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp
index f7f9515..c8c32d3 100644
--- a/kmouth/texttospeechsystem.cpp
+++ b/kmouth/texttospeechsystem.cpp
@@ -18,7 +18,7 @@
 
 #include "texttospeechsystem.h"
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqptrlist.h>
 #include <stdlib.h>
 
diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h
index f3ed793..12869aa 100644
--- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h
+++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h
@@ -15,7 +15,7 @@ void CreationSourceDetailsUI::init() {
     TQWhatsThis::add (languageButton, i18n("With this combo box you decide which language should be associated with the new dictionary."));
     
     loadLanguageList(languageButton);
-    languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString());
+    languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString());
     
    connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int)));
 }
@@ -28,7 +28,7 @@ void CreationSourceDetailsUI::languageButton_activated (int) {
         languageButton->setCurrentItem(customLanguage);
      }
      else {
-        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
         languageButton->setCurrentItem(customLanguage);
      }
    }
diff --git a/kmouth/wordcompletion/creationsourceui.ui b/kmouth/wordcompletion/creationsourceui.ui
index 49af73d..0efac9c 100644
--- a/kmouth/wordcompletion/creationsourceui.ui
+++ b/kmouth/wordcompletion/creationsourceui.ui
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 5108845..957c89c 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -15,13 +15,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqwhatsthis.h>
 
 #include <klistview.h>
@@ -221,7 +221,7 @@ TQString DictionaryCreationWizard::createDictionary() {
    TQString dictionaryFile;
    do {
       dictnumber++;
-      filename = TQString("wordcompletion%1.dict").tqarg(dictnumber);
+      filename = TQString("wordcompletion%1.dict").arg(dictnumber);
       dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename);
    }
    while (KStandardDirs::exists(dictionaryFile));
@@ -283,10 +283,10 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name,
 
    TQWidget *contents = new TQWidget(viewport());
    addChild(contents);
-   TQGridLayout *tqlayout = new TQGridLayout (contents);
+   TQGridLayout *layout = new TQGridLayout (contents);
    setResizePolicy (TQScrollView::AutoOneFit);
-   tqlayout->setColStretch (0, 0);
-   tqlayout->setColStretch (1, 1);
+   layout->setColStretch (0, 0);
+   layout->setColStretch (1, 1);
 
    int row = 0;
    TQStringList::Iterator nIt = dictionaryNames.begin();
@@ -295,8 +295,8 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name,
    for (; nIt != dictionaryNames.end(); ++nIt, ++fIt, ++lIt) {
       TQCheckBox *checkbox = new TQCheckBox(*nIt, contents);
       KIntNumInput *numInput = new KIntNumInput(contents);
-      tqlayout->addWidget (checkbox, row, 0);
-      tqlayout->addWidget (numInput, row, 1);
+      layout->addWidget (checkbox, row, 0);
+      layout->addWidget (numInput, row, 1);
       
       checkbox->setChecked (true);
       numInput->setRange (1, 100, 10, true);
diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp
index 51d2066..ffb6715 100644
--- a/kmouth/wordcompletion/klanguagebutton.cpp
+++ b/kmouth/wordcompletion/klanguagebutton.cpp
@@ -132,12 +132,12 @@ void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag,
 void KLanguageButton::insertLanguage( const TQString& path, const TQString& name,
                         const TQString& sub, const TQString &submenu, int index )
 {
-  TQString output = name + TQString::tqfromLatin1( " (" ) + path +
-                   TQString::tqfromLatin1( ")" );
+  TQString output = name + TQString::fromLatin1( " (" ) + path +
+                   TQString::fromLatin1( ")" );
 #if 0
   // Nooooo ! Country != language
   TQPixmap flag( locate( "locale", sub + path +
-                TQString::tqfromLatin1( "/flag.png" ) ) );
+                TQString::fromLatin1( "/flag.png" ) ) );
 #endif
   insertItem( output, path, submenu, index );
 }
@@ -182,8 +182,8 @@ void KLanguageButton::clear()
 {
   if ( i < 0 || i >= count() )
     return;
-  TQString output = name + TQString::tqfromLatin1( " (" ) + tag( i ) +
-                   TQString::tqfromLatin1( ")" );
+  TQString output = name + TQString::fromLatin1( " (" ) + tag( i ) +
+                   TQString::fromLatin1( ")" );
   changeItem( output, i );
 }*/
 
diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
index 19bb721..91f2966 100644
--- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp
+++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
@@ -31,18 +31,18 @@
 
 TQString languageName (TQString languageCode) {
    TQString filename = KGlobal::dirs()->findResource("locale",
-			languageCode + TQString::tqfromLatin1("/entry.desktop"));
+			languageCode + TQString::fromLatin1("/entry.desktop"));
       
    KSimpleConfig entry(filename);
-   entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-   return entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+   entry.setGroup(TQString::fromLatin1("KCM Locale"));
+   return entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 }
 
 void loadLanguageList(KLanguageButton *combo)
 // This function was taken from tdebase/kcontrol/kdm/kdm-appear.cpp
 {
   TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
-			TQString::tqfromLatin1("*/entry.desktop"));
+			TQString::fromLatin1("*/entry.desktop"));
   langlist.sort();
   for ( TQStringList::ConstIterator it = langlist.begin();
 	it != langlist.end(); ++it )
@@ -52,9 +52,9 @@ void loadLanguageList(KLanguageButton *combo)
     TQString nid = fpath.mid(index + 1);
 
     KSimpleConfig entry(*it);
-    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
-    combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString());
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+    combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString());
   }
   
   if (KGlobal::locale())
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index 5e8227e..03bccf7 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -141,7 +141,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>240</height>
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h
index d74137e..6ce5e75 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui.h
+++ b/kmouth/wordcompletion/wordcompletionui.ui.h
@@ -15,7 +15,7 @@ void WordCompletionUI::init() {
     TQWhatsThis::add (languageButton, i18n("With this combo box you select the language associated with the selected dictionary."));
     
     loadLanguageList(languageButton);
-    languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString());
+    languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString());
     
    connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int)));
 }
@@ -28,7 +28,7 @@ void WordCompletionUI::languageButton_activated (int) {
         languageButton->setCurrentItem(customLanguage);
      }
      else {
-        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+        languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
         languageButton->setCurrentItem(customLanguage);
      }
    }
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index 2403faf..c68a967 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
@@ -71,11 +71,11 @@ public:
 
    void setLanguage (TQString languageCode) {
       TQString filename = KGlobal::dirs()->findResource("locale",
-			languageCode + TQString::tqfromLatin1("/entry.desktop"));
+			languageCode + TQString::fromLatin1("/entry.desktop"));
 
       KSimpleConfig entry(filename);
-      entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-      TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+      entry.setGroup(TQString::fromLatin1("KCM Locale"));
+      TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
       setLanguage (name + " (" + languageCode + ")", languageCode);
    }
 
@@ -136,7 +136,7 @@ void WordCompletionWidget::load() {
                                         config->readEntry("Name"),
                                         languageTag);
          if (!languageButton->containsTag(languageTag))
-            languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+            languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
       }
 
    // Clean up disc space
@@ -159,7 +159,7 @@ void WordCompletionWidget::save() {
    while (it.current()) {
       DictionaryListItem *item = dynamic_cast<DictionaryListItem*>(it.current());
       if (item != 0) {
-         config->setGroup(TQString("Dictionary %1").tqarg(number));
+         config->setGroup(TQString("Dictionary %1").arg(number));
          config->writeEntry ("Filename", item->filename());
          config->writeEntry ("Name",     item->text (0));
          config->writeEntry ("Language", item->languageCode());
@@ -200,7 +200,7 @@ void WordCompletionWidget::addDictionary() {
       newDictionaryFiles += filename;
       TQString languageTag = wizard->language();
       if (!languageButton->containsTag(languageTag)) {
-         languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+         languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
       }
       KListViewItem *item = new DictionaryListItem (dictionaryList,
                       filename, wizard->name(), languageTag);
@@ -251,8 +251,8 @@ void WordCompletionWidget::exportDictionary() {
          return;
 
       if (KIO::NetAccess::exists(url, false, this)) {
-         if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-                                                          "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
+         if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+                                                          "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
             return;
          }
       }
diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp
index 11a15a1..2e88852 100644
--- a/kmouth/wordcompletion/wordlist.cpp
+++ b/kmouth/wordcompletion/wordlist.cpp
@@ -228,7 +228,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC
       if (steps != 0 && progress*100/steps > percent) {
          percent = progress*100/steps;
          pdlg->progressBar()->setProgress(percent);
-         tqApp->tqprocessEvents (20);
+         tqApp->processEvents (20);
       }
    }
    return map;
@@ -237,7 +237,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC
 WordMap mergeFiles  (TQMap<TQString,int> files, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Merging dictionaries..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    int progress = 0;
    int steps = files.count();
@@ -269,7 +269,7 @@ WordMap mergeFiles  (TQMap<TQString,int> files, KProgressDialog *pdlg) {
       if (steps != 0 && progress*100/steps > percent) {
          percent = progress*100/steps;
          pdlg->progressBar()->setProgress(percent);
-         tqApp->tqprocessEvents (20);
+         tqApp->processEvents (20);
       }
    }
    
@@ -290,7 +290,7 @@ WordMap mergeFiles  (TQMap<TQString,int> files, KProgressDialog *pdlg) {
 WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Parsing the KDE documentation..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    TQStringList files = KApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
    if ((files.count() == 0) && (language.length() == 5)) {
@@ -304,7 +304,7 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
 WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Parsing file..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    TQStringList files = filename;
 
@@ -314,7 +314,7 @@ WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCod
 WordMap parseDir (TQString directory, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) {
    pdlg->setLabel (i18n("Parsing directory..."));
    pdlg->show();
-   tqApp->tqprocessEvents (20);
+   tqApp->processEvents (20);
    
    TQStringList directories;
    directories += directory;
@@ -504,7 +504,7 @@ WordMap spellCheck  (WordMap map, TQString dictionary, KProgressDialog *pdlg) {
       pdlg->setLabel (i18n("Performing spell check..."));
       pdlg->progressBar()->setTotalSteps(100);
       pdlg->progressBar()->setProgress(0);
-      tqApp->tqprocessEvents (20);
+      tqApp->processEvents (20);
       int progress = 0;
       int steps = 0;
       int percent = 0;
@@ -535,7 +535,7 @@ WordMap spellCheck  (WordMap map, TQString dictionary, KProgressDialog *pdlg) {
             if (steps != 0 && progress*100/steps > percent) {
                percent = progress*100/steps;
                pdlg->progressBar()->setProgress(percent);
-               tqApp->tqprocessEvents (20);
+               tqApp->processEvents (20);
             }
          }
       }
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index 6172a8e..7cd1a02 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>360</width>
             <height>300</height>
@@ -38,7 +38,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -56,7 +56,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -79,7 +79,7 @@
                             <property name="text">
                                 <string>&lt;b&gt;Room&lt;/b&gt;</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -161,7 +161,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -184,7 +184,7 @@
                             <property name="text">
                                 <string>&lt;b&gt;Damp&lt;/b&gt;</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -260,7 +260,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -283,7 +283,7 @@
                             <property name="text">
                                 <string>&lt;b&gt;Wet&lt;/b&gt;</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -359,7 +359,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -382,7 +382,7 @@
                             <property name="text">
                                 <string>&lt;b&gt;Dry&lt;/b&gt;</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -458,7 +458,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -481,7 +481,7 @@
                             <property name="text">
                                 <string>&lt;b&gt;Width&lt;/b&gt;</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -571,7 +571,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -587,7 +587,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>180</width>
                             <height>20</height>
@@ -598,7 +598,7 @@
                     <property name="name">
                         <cstring>OK_Button</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>60</width>
                             <height>0</height>
diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
index bb91885..088d7d3 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
@@ -11,7 +11,7 @@
 //
 
 // QT includes
-// #include <tqtextcodec.h>
+// #include <textcodec.h>
 #include <tqstringlist.h>
 
 // KDE includes
diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
index 94f421a..052ed1f 100644
--- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
+++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
@@ -51,7 +51,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -95,7 +95,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp
index 707ebab..342e43c 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlib.cpp
@@ -81,7 +81,7 @@ int KTTSDLib::getActions()
 }
 
 
-int KTTSDLib::gettqStatus() const
+int KTTSDLib::getStatus() const
 {
     return TTS::AUDIOFILE;
 }
diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h
index d0e902b..d205b79 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.h
+++ b/ksayit/KTTSD_Lib/kttsdlib.h
@@ -93,7 +93,7 @@ public:
     
     void sayText();
     
-    int gettqStatus() const;
+    int getStatus() const;
     
     void stop();
     
diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index 1222c83..be3c4d6 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>100</width>
             <height>200</height>
diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui
index a95a90e..90d8332 100644
--- a/ksayit/src/KSayItView.ui
+++ b/ksayit/src/KSayItView.ui
@@ -23,7 +23,7 @@
             <property name="name">
                 <cstring>TextEdit</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>400</width>
                     <height>200</height>
diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 60a7bde..695c22e 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -11,7 +11,7 @@
 //
 // TQt includes
 #include <tqwidget.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpixmap.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
diff --git a/ksayit/src/docbookgenerator.h b/ksayit/src/docbookgenerator.h
index 109d0c5..392c406 100644
--- a/ksayit/src/docbookgenerator.h
+++ b/ksayit/src/docbookgenerator.h
@@ -13,7 +13,7 @@
 #define DOCBOOKGENERATOR_H
 
 // TQt includes
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes
 
diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp
index 8a5baa1..a48858e 100644
--- a/ksayit/src/docbookparser.cpp
+++ b/ksayit/src/docbookparser.cpp
@@ -13,7 +13,7 @@
 // TQt includes
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 //KDE includes
 #include <kdebug.h>
@@ -58,7 +58,7 @@ TQString DocbookParser::node2raw(TQDomNode node) const
 void DocbookParser::parseBook(const TQDomElement &element, ListViewInterface *item)
 {
     kdDebug(100200) << "+++ entering parseBook()" << endl;
-    item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( item );
           
@@ -89,7 +89,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
     kdDebug(100200) << "+++ entering parseBookInfo()" << endl;
 
     Overview *overview = new Overview(item, NULL, i18n("Overview"));
-    overview->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    overview->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( overview );
     
@@ -122,7 +122,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
             data = node.firstChild().toText();
             if( !data.isNull() ){
                 Date *date = new Date(overview, NULL, i18n("Date"));
-                date->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+                date->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
                 date->setText( 1, data.nodeValue() );
                 date->setValue(KSayItGlobal::RTFDATA, data.nodeValue());
                 date->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue());
@@ -140,7 +140,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
             data = node.firstChild().toText();
             if( !data.isNull() ){
                 ReleaseInfo *relinfo = new ReleaseInfo(overview, NULL, i18n("Release"));
-                relinfo->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+                relinfo->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
                 relinfo->setText( 1, data.nodeValue() );
                 relinfo->setValue(KSayItGlobal::RTFDATA, data.nodeValue());
                 relinfo->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue());
@@ -176,7 +176,7 @@ void DocbookParser::parseAuthorGroup(const TQDomElement &element, ListViewInterf
 
     // item = overview
     AuthorGroup *authorgroup = new AuthorGroup(item, NULL, i18n("Author(s)"));
-    authorgroup->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    authorgroup->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( authorgroup );
 
@@ -203,7 +203,7 @@ void DocbookParser::parseAuthor(const TQDomElement &element, ListViewInterface *
     TQString s_surname = TQString();
 
     Author *author = new Author(item);
-    author->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    author->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
 
     TQDomNode node = element.firstChild();
     while( !node.isNull() ){
@@ -241,7 +241,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa
 
     // item = overview
     KeywordSet *keywordset = new KeywordSet(item, NULL, i18n("Keywords"));
-    keywordset->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    keywordset->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( keywordset );
     
@@ -252,7 +252,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa
             data = node.firstChild().toText();
             if( !data.isNull() ){
                 Keyword *keyword = new Keyword(keywordset);
-                keyword->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+                keyword->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
                 keyword->setText(0, data.nodeValue() );
                 keyword->setValue(KSayItGlobal::RTFDATA,     data.nodeValue() );
                 keyword->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue() );
@@ -275,7 +275,7 @@ void DocbookParser::parseAbstract(const TQDomElement &element, ListViewInterface
     // item = overview
     TQDomText data;
     Abstract *abstract = new Abstract(item, NULL, i18n("Abstract"));
-    abstract->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    abstract->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( abstract );
 
@@ -296,7 +296,7 @@ void DocbookParser::parseChapter(const TQDomElement &element, ListViewInterface
     
     TQDomText data;
     Chapter *chapter = new Chapter(item, NULL, i18n("Chapter"));
-    chapter->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    chapter->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( chapter );
     
@@ -326,7 +326,7 @@ void DocbookParser::parseSect1(const TQDomElement &element, ListViewInterface *i
 
     TQDomText data;
     Sect1 *sect1 = new Sect1(item, NULL, i18n("Section Level 1"));
-    sect1->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    sect1->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( sect1 );
 
@@ -356,7 +356,7 @@ void DocbookParser::parseSect2(const TQDomElement &element, ListViewInterface *i
 
     TQDomText data;
     Sect2 *sect2 = new Sect2(item, NULL, i18n("Section Level 2"));
-    sect2->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    sect2->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( sect2 );
 
@@ -386,7 +386,7 @@ void DocbookParser::parseSect3(const TQDomElement &element, ListViewInterface *i
 
     TQDomText data;
     Sect3 *sect3 = new Sect3(item, NULL, i18n("Section Level 3"));
-    sect3->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    sect3->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( sect3 );
 
@@ -416,7 +416,7 @@ void DocbookParser::parseSect4(const TQDomElement &element, ListViewInterface *i
     
     TQDomText data;
     Sect4 *sect4 = new Sect4(item, NULL, i18n("Section Level 4"));
-    sect4->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    sect4->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( sect4 );
 
@@ -446,7 +446,7 @@ void DocbookParser::parseSect5(const TQDomElement &element, ListViewInterface *i
     
     TQDomText data;
     Sect5 *sect5 = new Sect5(item, NULL, i18n("Section Level 4"));
-    sect5->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    sect5->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( sect5 );
 
@@ -473,7 +473,7 @@ void DocbookParser::parsePara(const TQDomElement &element, ListViewInterface *it
     kdDebug(100200) << "+++ entering parsePara()" << endl;
 
     Para *para = new Para(item, NULL, i18n("Paragraph"));
-    para->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+    para->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
     // register Popup menu
     m_contextmenuhandler->registerPopupMenu( para );
     
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 98b76b1..17e5dc0 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -15,7 +15,7 @@
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqwidget.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqdatetime.h>
 #include <tqcolor.h>
@@ -261,7 +261,7 @@ void DocTreeViewImpl::openFile(const KURL &url)
             docbookparser.parseBook(root , m_rootItem);
             m_idCounter = docbookparser.getIdCounter();  
     } else {
-        err = i18n("The file is of type %1, 'book' expected.").tqarg(root.tagName() );
+        err = i18n("The file is of type %1, 'book' expected.").arg(root.tagName() );
         throw(err);
     }
     
@@ -779,7 +779,7 @@ void DocTreeViewImpl::slotDeleteItem()
     TQListViewItemIterator itr( m_rootItem );
     while ( itr.current() ) {
         item = static_cast<ListViewInterface*>(itr.current());
-        item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );    
+        item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );    
         ++itr;
     }
     
@@ -797,7 +797,7 @@ void DocTreeViewImpl::slotNewBookInfo()
     if ( whoAmI == "RobDocument" ){
         int newIndex = newIndexFirstChild();
         Overview *overview = new Overview( m_currentItem, NULL, i18n("Overview") );
-        overview->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        overview->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         m_contextmenuhandler->registerPopupMenu( overview );
     }
@@ -810,7 +810,7 @@ void DocTreeViewImpl::slotNewChapter()
     if ( whoAmI == "RobDocument" ){
         int newIndex = newIndexLastChild();
         Chapter *chapter = new Chapter( m_currentItem, NULL, i18n("Chapter") );
-        chapter->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        chapter->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newTitle = i18n("New Chapter Title");
         chapter->setText(0, newTitle );
@@ -829,7 +829,7 @@ void DocTreeViewImpl::slotNewKeywordSet()
         // New TreeView item
         int newIndex = newIndexFirstChild();
         KeywordSet *keywordset = new KeywordSet(m_currentItem, NULL, i18n("Keywords"));
-        keywordset->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        keywordset->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
 
         m_contextmenuhandler->registerPopupMenu( keywordset );
     }
@@ -843,7 +843,7 @@ void DocTreeViewImpl::slotNewKeyword()
         // New TreeView item
         int newIndex = newIndexLastChild();
         Keyword *keyword = new Keyword(m_currentItem, NULL, i18n("Keyword"));
-        keyword->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        keyword->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newKeyword = i18n("New Keyword");
         keyword->setText(0, newKeyword );
@@ -863,7 +863,7 @@ void DocTreeViewImpl::slotNewAbstract()
         // New TreeView item
         int newIndex = newIndexLastChild();
         Abstract *abstract = new Abstract(m_currentItem, NULL, i18n("Abstract"));
-        abstract->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        abstract->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
 
         m_contextmenuhandler->registerPopupMenu( abstract );
         
@@ -883,7 +883,7 @@ void DocTreeViewImpl::slotNewAuthorGroup()
         // New TreeView item
         int newIndex = newIndexFirstChild();
         AuthorGroup *authorgroup = new AuthorGroup(m_currentItem, NULL, i18n("Author(s)"));
-        authorgroup->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        authorgroup->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
 
         m_contextmenuhandler->registerPopupMenu( authorgroup );
         
@@ -903,7 +903,7 @@ void DocTreeViewImpl::slotNewAuthor()
         // New TreeView item
         int newIndex = newIndexLastChild();
         Author *author = new Author(m_currentItem);
-        author->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        author->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
     
         author->setText(0, i18n("Author") );
         TQString newAuthor = i18n("Firstname Surname"); 
@@ -924,10 +924,10 @@ void DocTreeViewImpl::slotNewDate()
         // New TreeView item
         int newIndex = newIndexLastChild();
         Date *date = new Date(m_currentItem, NULL, i18n("Date"));
-        date->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         // get current date
         TQString today;
-        today = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(Qt::LocalTime), true);
+        today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
         date->setText( 1, today);
         date->setValue( KSayItGlobal::RAWDATA,     today );
         date->setValue( KSayItGlobal::RTFDATA,     today );
@@ -945,7 +945,7 @@ void DocTreeViewImpl::slotNewReleaseInfo()
         // New TreeView item
         int newIndex = newIndexLastChild();
         ReleaseInfo *relinfo = new ReleaseInfo(m_currentItem, NULL, i18n("Release"));
-        relinfo->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        relinfo->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newRelease = "0.0.0";
         relinfo->setText( 1, newRelease );
@@ -979,7 +979,7 @@ void DocTreeViewImpl::slotNewParagraph()
     // New TreeView item
     int newIndex = newIndexLastChild();
     Para *para = new Para(m_currentItem, NULL, i18n("Paragraph"));
-    para->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+    para->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
 
     m_contextmenuhandler->registerPopupMenu( para );
     
@@ -992,7 +992,7 @@ void DocTreeViewImpl::slotNewSection_1()
     if ( whoAmI == "Chapter" ){
         int newIndex = newIndexLastChild();
         Sect1 *sect1 = new Sect1(m_currentItem, NULL, i18n("Section Level 1"));
-        sect1->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        sect1->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newTitle = i18n("New Section Title");
         sect1->setValue( KSayItGlobal::RTFHEADER,     newTitle );
@@ -1009,7 +1009,7 @@ void DocTreeViewImpl::slotNewSection_2()
     if ( whoAmI == "Sect1" ){
         int newIndex = newIndexLastChild();
         Sect2 *sect2 = new Sect2(m_currentItem, NULL, i18n("Section Level 2"));
-        sect2->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        sect2->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newTitle = i18n("New Section Title");
         sect2->setValue( KSayItGlobal::RTFHEADER,     newTitle );
@@ -1026,7 +1026,7 @@ void DocTreeViewImpl::slotNewSection_3()
     if ( whoAmI == "Sect2" ){
         int newIndex = newIndexLastChild();
         Sect3 *sect3 = new Sect3(m_currentItem, NULL, i18n("Section Level 3"));
-        sect3->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        sect3->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newTitle = i18n("New Section Title");
         sect3->setValue( KSayItGlobal::RTFHEADER,     newTitle );
@@ -1043,7 +1043,7 @@ void DocTreeViewImpl::slotNewSection_4()
     if ( whoAmI == "Sect3" ){
         int newIndex = newIndexLastChild();
         Sect4 *sect4 = new Sect4(m_currentItem, NULL, i18n("Section Level 4"));
-        sect4->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        sect4->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newTitle = i18n("New Section Title");
         sect4->setValue( KSayItGlobal::RTFHEADER,     newTitle );
@@ -1060,7 +1060,7 @@ void DocTreeViewImpl::slotNewSection_5()
     if ( whoAmI == "Sect4" ){
         int newIndex = newIndexLastChild();
         Sect5 *sect5 = new Sect5(m_currentItem, NULL, i18n("Section Level 5"));
-        sect5->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+        sect5->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
         
         TQString newTitle = i18n("New Section Title");
         sect5->setValue( KSayItGlobal::RTFHEADER,     newTitle );
@@ -1086,7 +1086,7 @@ int DocTreeViewImpl::newIndexFirstChild()
         item = static_cast<ListViewInterface*>(it.current());
         itemIndex = (item->text(3)).toInt();
         if ( itemIndex > currentIndex ){
-            item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );;    
+            item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );;    
         }
         ++it;
     }
@@ -1116,7 +1116,7 @@ int DocTreeViewImpl::newIndexLastChild()
         item = static_cast<ListViewInterface*>(it.current());
         itemIndex = (item->text(3)).toInt();
         if ( itemIndex > lastIndex ){
-            item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );    
+            item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );    
         }
         ++it;
     }
diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui
index 77f2cd9..4e9e975 100644
--- a/ksayit/src/fx_setup.ui
+++ b/ksayit/src/fx_setup.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -50,7 +50,7 @@
                             <property name="name">
                                 <cstring>listBox_Available</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>170</height>
@@ -61,7 +61,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -77,7 +77,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
@@ -88,7 +88,7 @@
                             <property name="name">
                                 <cstring>toolButton_add</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>32767</height>
@@ -105,7 +105,7 @@
                             <property name="name">
                                 <cstring>toolButton_remove</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>32767</height>
@@ -128,7 +128,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
@@ -139,7 +139,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -157,7 +157,7 @@
                             <property name="name">
                                 <cstring>listBox_Active</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>170</height>
@@ -173,7 +173,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -189,7 +189,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index cefaba6..101bd86 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -92,7 +92,7 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f,
             TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) );
     
     // init Clipboard
-    cb = TQApplication::tqclipboard();
+    cb = TQApplication::clipboard();
     connect(cb, TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotClipboardChanged()) );
     
     // create SystemTray object
@@ -293,7 +293,7 @@ void KSayItApp::slotChangeBookmarkFilename(const TQString &newname)
     // copy old bookmarkfile to new file
     if ( m_currentBookmarkFile != newbkFile ){
         if ( TQFile::exists(m_currentBookmarkFile) ){
-            TQString command = TQString("cp %1 %2").tqarg(m_currentBookmarkFile).tqarg(newbkFile);
+            TQString command = TQString("cp %1 %2").arg(m_currentBookmarkFile).arg(newbkFile);
             system( command.ascii() );
         }
         // install new BookmarkHandler based on the new file
@@ -322,12 +322,12 @@ void KSayItApp::initView()
 { 
   // create the main widget
   view = new KSayItViewImpl(this);
-  view->setMinimumSize(view->tqsizeHint());
+  view->setMinimumSize(view->sizeHint());
   setCentralWidget(view);
   // connections
   connect( view, TQT_SIGNAL(signalEnableCopyCut(bool)),
     TQT_TQOBJECT(this), TQT_SLOT(slotEnableCopyCut(bool)));
-  connect( view, TQT_SIGNAL(signalShowtqStatus(const TQString &)),
+  connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)),
     TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &)));
   connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)),
     TQT_TQOBJECT(this), TQT_SLOT(slotSetCaption(const TQString &)));
@@ -813,7 +813,7 @@ void KSayItApp::setActions(int actions)
     
     // Get the mask of supported actions from the plugin.
     int mask = m_kttslib->getActions();
-    kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(mask, 0, 2) << endl;
+    kdDebug(100200) << TQString("KSayItApp:PSA: %1").arg(mask, 0, 2) << endl;
     
     // disable actions not supported by the plugin
     int ma = actions & mask;
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index 97d2c95..56949ec 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -26,7 +26,7 @@ using namespace std;
 
 // include files for TQt
 #include <tqstringlist.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 // include files for KDE 
 #include <kapplication.h>
@@ -115,7 +115,7 @@ private slots:
      */    
     void slotTreeViewChanged(const TQString &str);
     
-    /** save general Options like all bar positions and status as well as the tqgeometry to
+    /** save general Options like all bar positions and status as well as the geometry to
      * the configuration file.
      */
     void slotSaveOptions();
diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp
index e3eb5ee..5c1b697 100644
--- a/ksayit/src/ksayitviewimpl.cpp
+++ b/ksayit/src/ksayitviewimpl.cpp
@@ -21,7 +21,7 @@ using namespace std;
 
  // QT includes 
 #include <tqradiobutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 
 // KDE includes
diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h
index 6128fe2..105c0f2 100644
--- a/ksayit/src/ksayitviewimpl.h
+++ b/ksayit/src/ksayitviewimpl.h
@@ -41,7 +41,7 @@ public:
 
 signals:
   void signalSetCaption(const TQString &caption);
-  void signalShowtqStatus(const TQString &status);
+  void signalShowStatus(const TQString &status);
   void signalEnableCopyCut(bool enable);
   
   /** Emitted when the text in the TextEditor view cahnges.
diff --git a/ksayit/src/saxhandler.cpp b/ksayit/src/saxhandler.cpp
index 7e2d6aa..e8035dc 100644
--- a/ksayit/src/saxhandler.cpp
+++ b/ksayit/src/saxhandler.cpp
@@ -127,7 +127,7 @@ bool SaxHandler::characters(const TQString & ch)
 bool SaxHandler::fatalError(const TQXmlParseException &exc)
 {
     TQString err = i18n("Fatal error while parsing XML-Paragraph:\n");
-    err += i18n("%1, Line: %2").tqarg(exc.message()).tqarg(exc.lineNumber());
+    err += i18n("%1, Line: %2").arg(exc.message()).arg(exc.lineNumber());
     KMessageBox::error(0, err, i18n("Fatal error") );
     return false;
 }
@@ -160,7 +160,7 @@ bool SaxHandler::internalEntityDecl(const TQString & name,
 
 bool SaxHandler::skippedEntity(const TQString &name)
 {
-    TQString warn = i18n("Unresolved entity found: %1.\n").tqarg(name);
+    TQString warn = i18n("Unresolved entity found: %1.\n").arg(name);
     warn += i18n("KSayIt does not support DocBook files with external entities. ");
     warn += i18n("Parsing can continue, but the resulting text will contain gaps.");
     
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index 298f32f..7135dbd 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <tqcombobox.h>
 #include <tqcolor.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 // KDE includes
@@ -88,7 +88,7 @@ void VoiceSetupDlg::initFXPage()
     connect( this, TQT_SIGNAL(signalReloadFX()), fxDialog, TQT_SLOT(slotReload()) );
     
     // Disable/enable FX-Setup depending on TTS-libs capability
-    int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE;
+    int status = m_kttslib->getStatus() & TTS::AUDIOFILE;
     if ( status ){
         m_fxPage->setEnabled(true);
     } else {
@@ -105,7 +105,7 @@ void VoiceSetupDlg::slotPageChanged(TQWidget *page)
     if ( page != m_fxPage )
         return;
     
-    int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE;
+    int status = m_kttslib->getStatus() & TTS::AUDIOFILE;
     if ( status ){
         m_fxPage->setEnabled(true);
     } else {
@@ -120,7 +120,7 @@ void VoiceSetupDlg::slotOk()
 {
     kdDebug(100200) << "+++ entering VoiceSetupDlg::slotOK()" << endl;
     
-    int status = m_kttslib->gettqStatus();
+    int status = m_kttslib->getStatus();
     if ( (status & TTS::AUDIOFILE) == 0 ){
         emit signalRemoveAllFX();
     }
diff --git a/kttsd/debian/man/kttsd.1 b/kttsd/debian/man/kttsd.1
index 4b8743b..379d7f0 100644
--- a/kttsd/debian/man/kttsd.1
+++ b/kttsd/debian/man/kttsd.1
@@ -62,8 +62,8 @@ Waits for a WM_NET compatible windowmanager
 .B  --style  <style>
 sets the application GUI style
 .TP
-.B  --tqgeometry  <tqgeometry>
-sets the client tqgeometry of the main widget
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
 .TP
 .B  --nofork  
 Don't run in the background.
@@ -131,7 +131,7 @@ set XIM server
 disable XIM
 .TP
 .B  --reverse  
-mirrors the whole tqlayout of widgets
+mirrors the whole layout of widgets
 .SS 
 
 .SH SEE ALSO
diff --git a/kttsd/debian/man/kttsmgr.1 b/kttsd/debian/man/kttsmgr.1
index c01468f..547ff14 100644
--- a/kttsd/debian/man/kttsmgr.1
+++ b/kttsd/debian/man/kttsmgr.1
@@ -61,8 +61,8 @@ Waits for a WM_NET compatible windowmanager
 .B  --style  <style>
 sets the application GUI style
 .TP
-.B  --tqgeometry  <tqgeometry>
-sets the client tqgeometry of the main widget
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
 .TP
 .B  --nofork  
 Don't run in the background.
@@ -130,7 +130,7 @@ set XIM server
 disable XIM
 .TP
 .B  --reverse  
-mirrors the whole tqlayout of widgets
+mirrors the whole layout of widgets
 .SS 
 
 .SH SEE ALSO
diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp
index f33d771..2752d5b 100644
--- a/kttsd/filters/main.cpp
+++ b/kttsd/filters/main.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 using namespace std;
 
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 812a81d..c3a3703 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqstring.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqradiobutton.h>
@@ -62,11 +62,11 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args
     // kdDebug() << "SbdConf::SbdConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "SbdConfigWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new SbdConfWidget(this, "SbdConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
 
     // Determine if tdeutils Regular Expression Editor is installed.
     m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index e7158dc..1b57c98 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -35,7 +35,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -74,7 +74,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout17</cstring>
+                <cstring>layout17</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -87,7 +87,7 @@
                     <property name="text">
                         <string>&amp;Sentence boundary regular expression:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -118,7 +118,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout17_2</cstring>
+                <cstring>layout17_2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -131,7 +131,7 @@
                     <property name="text">
                         <string>&amp;Replacement sentence boundary:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -168,7 +168,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -181,7 +181,7 @@
                             <property name="text">
                                 <string>&amp;Language is:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -199,7 +199,7 @@
                             <property name="text">
                                 <string>Application &amp;ID contains:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -213,7 +213,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -221,7 +221,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout12</cstring>
+                                <cstring>layout12</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -265,7 +265,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp
index 107e6b3..98eec0d 100644
--- a/kttsd/filters/sbd/sbdproc.cpp
+++ b/kttsd/filters/sbd/sbdproc.cpp
@@ -306,7 +306,7 @@ TQString SbdThread::endSentence()
     return s;
 }
 
-// Parses a node of the SSML tree and recursively parses its tqchildren.
+// Parses a node of the SSML tree and recursively parses its children.
 // Returns the filtered text with each sentence a complete ssml tree.
 TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re )
 {
@@ -441,7 +441,7 @@ TQString SbdThread::parseSsml( const TQString& inputText, const TQString& re )
     // This flag is used to close out a previous sentence.
     m_sentenceStarted = false;
 
-    // Get the root element (speak) and recursively process its tqchildren.
+    // Get the root element (speak) and recursively process its children.
     TQDomElement docElem = doc.documentElement();
     TQDomNode n = docElem.firstChild();
     TQString ssml = parseSsmlNode( docElem, re );
diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h
index 0c1e7aa..d49f72c 100644
--- a/kttsd/filters/sbd/sbdproc.h
+++ b/kttsd/filters/sbd/sbdproc.h
@@ -204,7 +204,7 @@ class SbdThread: public TQObject, public TQThread
         TQString startSentence();
         // Ends a sentence and appends a Tab.
         TQString endSentence();
-        // Parses a node of the SSML tree and recursively parses its tqchildren.
+        // Parses a node of the SSML tree and recursively parses its children.
         // Returns the filtered text with each sentence a complete ssml tree.
         TQString parseSsmlNode( TQDomNode& n, const TQString& re );
 
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index d672bbd..8c61932 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -21,7 +21,7 @@
             <verstretch>255</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -33,7 +33,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -63,7 +63,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -128,7 +128,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -136,7 +136,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -157,7 +157,7 @@
                             <property name="text">
                                 <string>&amp;Replace with:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -179,7 +179,7 @@
                             <property name="text">
                                 <string>&amp;Match:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -190,7 +190,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index 4d4ea72..cad745e 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqstring.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqdom.h>
 #include <tqfile.h>
@@ -67,11 +67,11 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons
     // kdDebug() << "StringReplacerConf::StringReplacerConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "StringReplacerConfigWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new StringReplacerConfWidget(this, "StringReplacerConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
     m_widget->substLView->setSortColumn(-1);
 
     connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index 73c5954..d18b541 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -23,7 +23,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -36,7 +36,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -73,7 +73,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -86,7 +86,7 @@
                             <property name="text">
                                 <string>Lan&amp;guage is:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
                             <property name="text">
                                 <string>Application &amp;ID contains:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -118,7 +118,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -126,7 +126,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout12</cstring>
+                                <cstring>layout12</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -170,7 +170,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -243,7 +243,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout24</cstring>
+                <cstring>layout24</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -303,7 +303,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout23</cstring>
+                        <cstring>layout23</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -427,7 +427,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h
index 0fffbc9..f3efb90 100644
--- a/kttsd/filters/stringreplacer/stringreplacerproc.h
+++ b/kttsd/filters/stringreplacer/stringreplacerproc.h
@@ -27,7 +27,7 @@
 
 // TQt includes.
 #include <tqobject.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvaluelist.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index 2e539f1..805e7df 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -24,7 +24,7 @@
 // TQt includes.
 #include <tqstring.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 #include <klocale.h>
@@ -55,11 +55,11 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const
     // kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "TalkerChooserConfigWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
 
     // Determine if tdeutils Regular Expression Editor is installed.
     m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index 1969489..a6a2dfa 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -23,7 +23,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -36,7 +36,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -73,7 +73,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -86,7 +86,7 @@
                             <property name="text">
                                 <string>Te&amp;xt contains:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
                             <property name="text">
                                 <string>Application &amp;ID contains:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -118,7 +118,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -126,7 +126,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout12</cstring>
+                                <cstring>layout12</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -167,7 +167,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout19_2</cstring>
+                <cstring>layout19_2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -228,7 +228,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
index c143f21..41a24d2 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
@@ -23,7 +23,7 @@
 
 // TQt includes.
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 #include <klocale.h>
@@ -49,11 +49,11 @@ XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, cons
     // kdDebug() << "XmlTransformerConf::XmlTransformerConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "XmlTransformerConfWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new XmlTransformerConfWidget(this, "XmlTransformerConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
 
     // Set up defaults.
     defaults();
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index 63a83c3..471446b 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -22,7 +22,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -72,7 +72,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -90,7 +90,7 @@
                     <property name="text">
                         <string>&amp;XSLT file:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -107,7 +107,7 @@
                     <property name="text">
                         <string>xsltproc &amp;executable:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -135,7 +135,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -169,7 +169,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -182,7 +182,7 @@
                             <property name="text">
                                 <string>&amp;Root element is:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -200,7 +200,7 @@
                             <property name="text">
                                 <string>or DOC&amp;TYPE is:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -217,7 +217,7 @@
                             <property name="text">
                                 <string>and Application &amp;ID contains:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
index dcd9e74..8fa9e4b 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
@@ -373,13 +373,13 @@ void XmlTransformerProc::slotProcessExited(KProcess*)
 
 void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/)
 {
-    // TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    // TQString buf = TQString::fromLatin1(buffer, buflen);
     // kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl;
 }
 
 void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl;
 }
 
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index 4769c21..ae48c61 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>351</width>
                             <height>21</height>
@@ -94,7 +94,7 @@
                     <property name="text">
                         <string>&amp;Synthesizer:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>25</width>
                             <height>20</height>
@@ -132,7 +132,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>25</width>
                             <height>20</height>
@@ -185,7 +185,7 @@
                     <property name="text">
                         <string>Show All</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -199,7 +199,7 @@
                     <property name="text">
                         <string>&amp;Language:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index c81feea..79a18c0 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -28,7 +28,7 @@
 #include <tqtabwidget.h>
 #include <tqcheckbox.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqslider.h>
 #include <tqlabel.h>
@@ -119,10 +119,10 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &)
     m_suppressConfigChanged = false;
 
     // Add the KTTS Manager widget
-    TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0);
+    TQGridLayout *layout = new TQGridLayout(this, 0, 0);
     m_kttsmgrw = new KCMKttsMgrWidget(this, "kttsmgrw");
     // m_kttsmgrw = new KCMKttsMgrWidget(this);
-    tqlayout->addWidget(m_kttsmgrw, 0, 0);
+    layout->addWidget(m_kttsmgrw, 0, 0);
 
     // Give buttons icons.
     // Talkers tab.
@@ -1100,7 +1100,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name)
 
     // Find the plugin.
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
-        TQString("DesktopEntryName == '%1'").tqarg(name));
+        TQString("DesktopEntryName == '%1'").arg(name));
 
     if (offers.count() == 1)
     {
@@ -1144,7 +1144,7 @@ KttsFilterConf* KCMKttsMgr::loadFilterPlugin(const TQString& plugInName)
 
     // Find the plugin.
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
-        TQString("DesktopEntryName == '%1'").tqarg(plugInName));
+        TQString("DesktopEntryName == '%1'").arg(plugInName));
 
     if (offers.count() == 1)
     {
@@ -2093,7 +2093,7 @@ void KCMKttsMgr::configureFilter()
         true,
         true);
     m_configDlg->setInitialSize(TQSize(600, 450), false);
-    m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->tqminimumSizeHint());
+    m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->minimumSizeHint());
     m_loadedFilterPlugIn->show();
     m_configDlg->setMainWidget(m_loadedFilterPlugIn);
     m_configDlg->setHelp("configure-filter", "kttsd");
@@ -2221,7 +2221,7 @@ TQString KCMKttsMgr::FilterDesktopEntryNameToName(const TQString& desktopEntryNa
 {
     if (desktopEntryName.isEmpty()) return TQString();
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
-        TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+        TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
 
     if (offers.count() == 1)
         return offers[0]->name();
@@ -2533,7 +2533,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem(
     else
     {
         if (event == "default")
-            eventName = i18n("All other %1 events").tqarg(eventSrcName);
+            eventName = i18n("All other %1 events").arg(eventSrcName);
         else
             eventName = NotifyEvent::getEventName(eventSrc, event);
     }
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index b5c7a6b..766a1a2 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.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>
@@ -92,7 +92,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout5</cstring>
+                            <cstring>layout5</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -108,7 +108,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -133,7 +133,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout5_2</cstring>
+                            <cstring>layout5_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -149,7 +149,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -286,7 +286,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="1">
                         <property name="name">
-                            <cstring>tqlayout9</cstring>
+                            <cstring>layout9</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -407,7 +407,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -495,7 +495,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout21</cstring>
+                                    <cstring>layout21</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -535,7 +535,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout28</cstring>
+                                    <cstring>layout28</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -576,7 +576,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>152</width>
                                                 <height>20</height>
@@ -690,7 +690,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout19_2</cstring>
+                                    <cstring>layout19_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -753,7 +753,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout17</cstring>
+                            <cstring>layout17</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -780,7 +780,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -818,7 +818,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -848,7 +848,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9_2</cstring>
+                                    <cstring>layout9_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -975,7 +975,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -988,7 +988,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>tqlayout18</cstring>
+                            <cstring>layout18</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1018,7 +1018,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout16</cstring>
+                                    <cstring>layout16</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1053,7 +1053,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>11</height>
@@ -1079,7 +1079,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout15</cstring>
+                            <cstring>layout15</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -1229,7 +1229,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>180</height>
@@ -1251,7 +1251,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1291,7 +1291,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout13</cstring>
+                            <cstring>layout13</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1391,7 +1391,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -1408,7 +1408,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>90</width>
                                 <height>20</height>
@@ -1439,7 +1439,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout8</cstring>
+                                    <cstring>layout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1482,7 +1482,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout8_2_2</cstring>
+                                    <cstring>layout8_2_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1582,7 +1582,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
-                                    <cstring>tqlayout21</cstring>
+                                    <cstring>layout21</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1613,7 +1613,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout8_2</cstring>
+                                            <cstring>layout8_2</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 44226b7..0d9fe60 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -61,10 +61,10 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ
         if ( !relativePath.isEmpty() )
         {
             KConfig* config = new KConfig(relativePath, true, false, "data");
-            config->setGroup( TQString::tqfromLatin1("!Global!") );
-            TQString icon = config->readEntry(TQString::tqfromLatin1("IconName"),
-                TQString::tqfromLatin1("misc"));
-            TQString description = config->readEntry( TQString::tqfromLatin1("Comment"),
+            config->setGroup( TQString::fromLatin1("!Global!") );
+            TQString icon = config->readEntry(TQString::fromLatin1("IconName"),
+                TQString::fromLatin1("misc"));
+            TQString description = config->readEntry( TQString::fromLatin1("Comment"),
                 i18n("No description available") );
             delete config;
             int index = relativePath.find( '/' );
@@ -89,7 +89,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
     eventsListView->clear();
     TQListViewItem* item = 0;
     TQString eventSrc = m_eventSrcNames[index];
-    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
     TQStringList eventNames = config->groupList();
     uint eventNamesCount = eventNames.count();
@@ -99,8 +99,8 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
         if ( eventName != "!Global!" )
         {
             config->setGroup( eventName );
-            TQString eventDesc = config->readEntry( TQString::tqfromLatin1( "Comment" ),
-                config->readEntry( TQString::tqfromLatin1( "Name" )));
+            TQString eventDesc = config->readEntry( TQString::fromLatin1( "Comment" ),
+                config->readEntry( TQString::fromLatin1( "Name" )));
             if ( !item )
                 item = new KListViewItem( eventsListView, eventDesc, eventName );
             else
@@ -110,7 +110,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
     delete config;
     eventsListView->sort();
     item = eventsListView->lastChild();
-    TQString eventDesc = i18n("All other %1 events").tqarg(eventSrcComboBox->currentText());
+    TQString eventDesc = i18n("All other %1 events").arg(eventSrcComboBox->currentText());
     if ( !item )
         item = new KListViewItem( eventsListView, eventDesc, "default" );
     else
diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp
index 5e4065a..91fff38 100644
--- a/kttsd/kttsd/filtermgr.cpp
+++ b/kttsd/kttsd/filtermgr.cpp
@@ -352,7 +352,7 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName)
 
     // Find the plugin.
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
-        TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+        TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
 
     if (offers.count() == 1)
     {
diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp
index de4320c..6363426 100644
--- a/kttsd/kttsd/kttsd.cpp
+++ b/kttsd/kttsd/kttsd.cpp
@@ -20,9 +20,9 @@
 
 // TQt includes.
 #include <tqcstring.h>
-#include <tqclipboard.h>
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
+#include <clipboard.h>
+#include <textstream.h>
+#include <textcodec.h>
 #include <tqfile.h>
 
 // KDE includes.
@@ -790,7 +790,7 @@ uint KTTSD::moveRelTextSentence(const int n, const uint jobNum /*=0*/)
 void KTTSD::speakClipboard()
 {
     // Get the clipboard object.
-    TQClipboard *cb = kapp->tqclipboard();
+    TQClipboard *cb = kapp->clipboard();
 
     // Copy text from the clipboard.
     TQString text = cb->text();
diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp
index fce3b32..4d4ee3e 100644
--- a/kttsd/kttsd/speaker.cpp
+++ b/kttsd/kttsd/speaker.cpp
@@ -1316,7 +1316,7 @@ uttIterator Speaker::deleteUtterance(uttIterator it)
                 TQCString jobStr;
                 jobStr.sprintf("%08i", it->sentence->jobNum);
                 TQString dest = m_speechData->keepAudioPath + "/kttsd-" +
-                    TQString("%1-%2").tqarg(jobStr.data()).tqarg(seqStr.data()) + ".wav";
+                    TQString("%1-%2").arg(jobStr.data()).arg(seqStr.data()) + ".wav";
                 TQFile::remove(dest);
                 TQDir d;
                 d.rename(it->audioUrl, dest);
@@ -1541,7 +1541,7 @@ Player* Speaker::createPlayerObject()
             }
     }
     KTrader::OfferList offers = KTrader::self()->query(
-            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName));
+            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
 
     if(offers.count() == 1)
     {
diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp
index 694b355..76c7bc3 100644
--- a/kttsd/kttsd/ssmlconvert.cpp
+++ b/kttsd/kttsd/ssmlconvert.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes.
 #include <tdeversion.h>
diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp
index 8d6264b..a6e5a9c 100644
--- a/kttsd/kttsd/talkermgr.cpp
+++ b/kttsd/kttsd/talkermgr.cpp
@@ -107,7 +107,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
 
             // Find the KTTSD SynthPlugin.
             KTrader::OfferList offers = KTrader::self()->query(
-                "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+                "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
 
             if(offers.count() > 1){
                 ++bad;
@@ -134,7 +134,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
                         } else {
                             // Synchronous plugins are run in a separate thread.
                             // Init will start the thread and it will immediately go to sleep.
-                            TQString threadedPlugInName = TQString::tqfromLatin1("threaded") + desktopEntryName;
+                            TQString threadedPlugInName = TQString::fromLatin1("threaded") + desktopEntryName;
                             ThreadedPlugIn* speechThread = new ThreadedPlugIn(speech,
                                     this, threadedPlugInName.latin1());
                             speechThread->init(config, "Talker_" + talkerCode);
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 2d6477e..7ed6ab2 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -20,7 +20,7 @@
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpushbutton.h>
 #include <tqobjectlist.h>
 #include <tqwhatsthis.h>
@@ -163,7 +163,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
     hbox3->setSpacing(6);
 
     // Do not let button box stretch vertically.
-    m_buttonBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+    m_buttonBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 
     // All the buttons with "job_" at start of their names will be enabled/disabled when a job is
     // selected in the Job List View.
@@ -274,7 +274,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
 
     // Create a label for current sentence.
     TQLabel* currentSentenceLabel = new TQLabel(sentenceVBox);
-    currentSentenceLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+    currentSentenceLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
     currentSentenceLabel->setText(i18n("Current Sentence"));
 
     // Create a box to contain the current sentence.
@@ -506,7 +506,7 @@ void KttsJobMgrPart::slot_job_change_talker()
 void KttsJobMgrPart::slot_speak_clipboard()
 {
     // Get the clipboard object.
-    TQClipboard *cb = kapp->tqclipboard();
+    TQClipboard *cb = kapp->clipboard();
 
 
     // Copy text from the clipboard.
@@ -518,7 +518,7 @@ void KttsJobMgrPart::slot_speak_clipboard()
         {
             if (supportsMarkup(NULL, KSpeech::mtHtml))
             {
-                TQByteArray d = data->tqencodedData("text/html");
+                TQByteArray d = data->encodedData("text/html");
                 text = TQString(d);
             }
         }
@@ -526,7 +526,7 @@ void KttsJobMgrPart::slot_speak_clipboard()
         {
             if (supportsMarkup(NULL, KSpeech::mtSsml))
             {
-                TQByteArray d = data->tqencodedData("text/ssml");
+                TQByteArray d = data->encodedData("text/ssml");
                 text = TQString(d);
             }
         }
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index da9001b..f633a11 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -148,14 +148,14 @@ KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent)
 
     KttsMgrTray* kttsMgrTray = dynamic_cast<KttsMgrTray*>(parentWidget());
 
-    TQRect r(kttsMgrTray->tqgeometry());
+    TQRect r(kttsMgrTray->geometry());
     if ( !r.isValid() )
         return;
 
     TQString status = "<qt><b>KTTSMgr</b> - ";
     status += i18n("<qt>Text-to-Speech Manager");
     status += "<br/><br/>";
-    status += kttsMgrTray->gettqStatus();
+    status += kttsMgrTray->getStatus();
     status += "</qt>";
 
     tip(r, status);
@@ -257,7 +257,7 @@ TQString KttsMgrTray::stateToStr(int state)
     }
 }
 
-TQString KttsMgrTray::gettqStatus()
+TQString KttsMgrTray::getStatus()
 {
     if (!isKttsdRunning()) return i18n("Text-to-Speech System is not running");
     uint jobCount = getTextJobCount();
@@ -273,7 +273,7 @@ TQString KttsMgrTray::gettqStatus()
             int sentenceCount = getTextCount(job);
             uint seq = moveRelTextSentence(0, job);
             status += i18n(", current job %1 at sentence %2 of %3 sentences"
-                ).tqarg(stateToStr(jobState)).tqarg(seq).tqarg(sentenceCount);
+                ).arg(stateToStr(jobState)).arg(seq).arg(sentenceCount);
         }
     }
     return status;
diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h
index a2a99df..92245da 100644
--- a/kttsd/kttsmgr/kttsmgr.h
+++ b/kttsd/kttsmgr/kttsmgr.h
@@ -55,7 +55,7 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee
         ~KttsMgrTray();
 
         void setExitWhenFinishedSpeaking();
-        TQString gettqStatus();
+        TQString getStatus();
 
     protected:
         // ASYNC textStarted(const TQCString& appId, uint jobNum);
diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp
index a226675..bd2fbd1 100644
--- a/kttsd/libkttsd/notify.cpp
+++ b/kttsd/libkttsd/notify.cpp
@@ -148,9 +148,9 @@ static void notifypresent_init()
  */
 /*static*/ TQString NotifyEvent::getEventSrcName(const TQString& eventSrc, TQString& iconName)
 {
-    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
-    config->setGroup( TQString::tqfromLatin1( "!Global!" ) );
+    config->setGroup( TQString::fromLatin1( "!Global!" ) );
     TQString appDesc = config->readEntry( "Comment", i18n("No description available") );
     iconName = config->readEntry( "IconName" );
     delete config;
@@ -163,13 +163,13 @@ static void notifypresent_init()
 /*static*/ TQString NotifyEvent::getEventName(const TQString& eventSrc, const TQString& event)
 {
     TQString eventName;
-    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
     if ( config->hasGroup( event ) )
     {
         config->setGroup( event );
-        eventName = config->readEntry( TQString::tqfromLatin1( "Comment" ),
-            config->readEntry( TQString::tqfromLatin1( "Name" )));
+        eventName = config->readEntry( TQString::fromLatin1( "Comment" ),
+            config->readEntry( TQString::fromLatin1( "Name" )));
     }
     delete config;
     return eventName;
diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp
index bcd79fd..317113f 100644
--- a/kttsd/libkttsd/pluginproc.cpp
+++ b/kttsd/libkttsd/pluginproc.cpp
@@ -17,7 +17,7 @@
 
 // TQt includes. 
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 // KDE includes.
 #include <kdebug.h>
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index 6a0541b..be55d45 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -77,7 +77,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -93,7 +93,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -127,7 +127,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="0">
                                     <property name="name">
-                                        <cstring>tqlayout11_2</cstring>
+                                        <cstring>layout11_2</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -140,7 +140,7 @@
                                             <property name="text">
                                                 <string>&amp;Synthesizer:</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>WordBreak|AlignVCenter|AlignLeft</set>
                                             </property>
                                             <property name="buddy" stdset="0">
@@ -178,7 +178,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="2">
                                     <property name="name">
-                                        <cstring>tqlayout12</cstring>
+                                        <cstring>layout12</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -243,7 +243,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="1" column="0">
                                     <property name="name">
-                                        <cstring>tqlayout14</cstring>
+                                        <cstring>layout14</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -291,7 +291,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="1" column="2">
                                     <property name="name">
-                                        <cstring>tqlayout13</cstring>
+                                        <cstring>layout13</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -339,7 +339,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
                                     <property name="name">
-                                        <cstring>tqlayout10</cstring>
+                                        <cstring>layout10</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -426,7 +426,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -442,7 +442,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp
index 6af8baf..91ae8fe 100644
--- a/kttsd/libkttsd/stretcher.cpp
+++ b/kttsd/libkttsd/stretcher.cpp
@@ -61,7 +61,7 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
     if (m_stretchProc) return false;
     m_outFilename = outFilename;
     m_stretchProc = new KProcess;
-    TQString stretchStr = TQString("%1").tqarg(stretchFactor, 0, 'f', 3);
+    TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3);
     *m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr;
     connect(m_stretchProc, TQT_SIGNAL(processExited(KProcess*)),
         this, TQT_SLOT(slotProcessExited(KProcess*)));
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index 53be627..c0d26ed 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -507,7 +507,7 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 {
     if (desktopEntryName.isEmpty()) return TQString();
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
-    TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+    TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
 
     if (offers.count() == 1)
         return offers[0]->name();
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index f83a7e4..06d97cf 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -162,7 +162,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
         }
     }
     KTrader::OfferList offers = KTrader::self()->query(
-            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName));
+            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
 
     if(offers.count() == 1)
     {
diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp
index 531dd16..23edec2 100644
--- a/kttsd/players/alsaplayer/alsaplayer.cpp
+++ b/kttsd/players/alsaplayer/alsaplayer.cpp
@@ -432,10 +432,10 @@ TQStringList AlsaPlayer::getPluginList( const TQCString& /*classname*/ )
                 infoName += snd_pcm_info_get_name(pcminfo);
                 infoName += ")";
                 if (0 == devCnt) {
-                    TQString pcmName = TQString("default:%1").tqarg(card);
+                    TQString pcmName = TQString("default:%1").arg(card);
                     result.append(pcmName + infoName);
                 }
-                TQString pcmName = TQString("plughw:%1,%2").tqarg(card).tqarg(device);
+                TQString pcmName = TQString("plughw:%1,%2").arg(card).arg(device);
                 result.append(pcmName + infoName);
             }
             snd_ctl_close(handle);
@@ -1496,7 +1496,7 @@ void AlsaPlayer::header(int /*rtype*/, const char* /*name*/)
     else if (hwdata.channels == 2)
         channels = "Stereo";
     else
-        channels = TQString("Channels %1").tqarg(hwdata.channels);
+        channels = TQString("Channels %1").arg(hwdata.channels);
     DBG("Format: %s, Rate %d Hz, %s",
         snd_pcm_format_description(hwdata.format),
         hwdata.rate,
diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp
index bfd62d0..efc1916 100644
--- a/kttsd/players/gstplayer/gstreamerplayer.cpp
+++ b/kttsd/players/gstplayer/gstreamerplayer.cpp
@@ -189,12 +189,12 @@ bool GStreamerPlayer::requireVersion(uint major, uint minor, uint micro)
     }
 
     gst_version(&gmajor, &gminor, &gmicro);
-    // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl;
+    // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl;
     if (gmajor > major) return true;
     if (gminor > minor) return true;
     if (gmicro >= micro) return true;
-    kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl;
-    kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").tqarg(major).tqarg(minor).tqarg(micro) << endl;
+    kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl;
+    kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").arg(major).arg(minor).arg(micro) << endl;
     return false;
 }
 
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 9045f14..9cbba40 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -16,11 +16,11 @@
  ***************************************************************************/
 
 // TQt includes.
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqfile.h>
 #include <tqapplication.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 // KDE includes.
 #include <kdialog.h>
@@ -48,11 +48,11 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList
     m_commandProc = 0;
     m_progressDlg = 0;
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "CommandConfigWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new CommandConfWidget(this, "CommandConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
 
     // Build codec list and fill combobox.
     m_codecList = PlugInProc::buildCodecList();
@@ -127,12 +127,12 @@ TQString CommandConf::getTalkerCode()
                 "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                 "<prosody volume=\"%4\" rate=\"%5\" />"
                 "<kttsd synthesizer=\"%6\" />")
-                .tqarg(m_languageCode)
-                .tqarg("fixed")
-                .tqarg("neutral")
-                .tqarg("medium")
-                .tqarg("medium")
-                .tqarg("Command");
+                .arg(m_languageCode)
+                .arg("fixed")
+                .arg("neutral")
+                .arg("medium")
+                .arg("medium")
+                .arg("Command");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 8db709c..75ce080 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -74,7 +74,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="5" column="0">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -101,7 +101,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>201</width>
                                     <height>20</height>
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -187,7 +187,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp
index d1eb223..ddc8a8c 100644
--- a/kttsd/plugins/command/commandproc.cpp
+++ b/kttsd/plugins/command/commandproc.cpp
@@ -21,7 +21,7 @@
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqvaluestack.h>
 
 // KDE includes.
@@ -382,13 +382,13 @@ void CommandProc::slotProcessExited(KProcess*)
 
 void CommandProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "CommandProc::slotReceivedStdout: Received output from Command: " << buf << endl;
 }
 
 void CommandProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "CommandProc::slotReceivedStderr: Received error from Command: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp
index a755ac8..6ad86e5 100644
--- a/kttsd/plugins/epos/eposconf.cpp
+++ b/kttsd/plugins/epos/eposconf.cpp
@@ -27,8 +27,8 @@
 // TQt includes.
 #include <tqfile.h>
 #include <tqapplication.h>
-#include <tqtextcodec.h>
-#include <tqlayout.h>
+#include <textcodec.h>
+#include <layout.h>
 #include <tqslider.h>
 
 // KDE includes.
@@ -55,11 +55,11 @@ EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*ar
     m_eposProc = 0;
     m_progressDlg = 0;
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "EposConfigWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new EposConfWidget(this, "EposConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
 
     // Build codec list and fill combobox.
     m_codecList = PlugInProc::buildCodecList();
@@ -194,12 +194,12 @@ TQString EposConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .tqarg(m_languageCode)
-                    .tqarg("fixed")
-                    .tqarg("neutral")
-                    .tqarg("medium")
-                    .tqarg(rate)
-                    .tqarg("Epos TTS Synthesis System");
+                    .arg(m_languageCode)
+                    .arg("fixed")
+                    .arg("neutral")
+                    .arg("medium")
+                    .arg(rate)
+                    .arg("Epos TTS Synthesis System");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index 1c5c0d8..c66a081 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -67,7 +67,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -112,7 +112,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout14</cstring>
+                                <cstring>layout14</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -174,7 +174,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout15</cstring>
+                                <cstring>layout15</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -246,7 +246,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout16</cstring>
+                                <cstring>layout16</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -316,7 +316,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -324,7 +324,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -345,7 +345,7 @@
                                     <property name="text">
                                         <string>Epos server executable path:</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -370,7 +370,7 @@
                                     <property name="text">
                                         <string>Epos client executable path:</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -384,7 +384,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout12</cstring>
+                                <cstring>layout12</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -445,7 +445,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout14</cstring>
+                                <cstring>layout14</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -453,7 +453,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget" row="0" column="1">
                                     <property name="name">
-                                        <cstring>tqlayout13</cstring>
+                                        <cstring>layout13</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -479,7 +479,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="0">
                                     <property name="name">
-                                        <cstring>tqlayout12</cstring>
+                                        <cstring>layout12</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -500,7 +500,7 @@
                                             <property name="text">
                                                 <string>Epos server:</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter|AlignLeft</set>
                                             </property>
                                             <property name="buddy" stdset="0">
@@ -525,7 +525,7 @@
                                             <property name="text">
                                                 <string>Epos client:</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter|AlignLeft</set>
                                             </property>
                                             <property name="buddy" stdset="0">
@@ -543,7 +543,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -559,7 +559,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>410</width>
                                     <height>20</height>
diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp
index 670a1c4..ab26e92 100644
--- a/kttsd/plugins/epos/eposproc.cpp
+++ b/kttsd/plugins/epos/eposproc.cpp
@@ -28,7 +28,7 @@
 // TQt includes.
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfile.h>
 
 // KDE includes.
@@ -210,7 +210,7 @@ void EposProc::synth(
     *m_eposProc << eposClientExePath;
     // Language.
     if (!eposLanguage.isEmpty())
-        *m_eposProc << TQString("--language=%1").tqarg(eposLanguage);
+        *m_eposProc << TQString("--language=%1").arg(eposLanguage);
     // Rate (speed).
     // Map 50% to 200% onto 0 to 1000.
     // slider = alpha * (log(percent)-log(50))
@@ -221,10 +221,10 @@ void EposProc::synth(
     slider = slider - 500;
     // Map -500 to 500 onto 45 to -45 then shift to 130 to 40 (85 midpoint).
     float stretchValue = (-float(slider) * 45.0 / 500.0) + 85.0;
-    TQString timeMsg = TQString("--init_t=%1").tqarg(stretchValue, 0, 'f', 3);
+    TQString timeMsg = TQString("--init_t=%1").arg(stretchValue, 0, 'f', 3);
     *m_eposProc << timeMsg;
     // Pitch.  Map 50% to 200% onto 50 to 200.  easy.
-    TQString pitchMsg = TQString("--init_f=%1").tqarg(pitch);
+    TQString pitchMsg = TQString("--init_f=%1").arg(pitch);
     *m_eposProc << pitchMsg;
     // Output file.
     if (!suggestedFilename.isEmpty()) 
@@ -326,13 +326,13 @@ void EposProc::slotProcessExited(KProcess*)
 
 void EposProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "EposProc::slotReceivedStdout: Received output from Epos: " << buf << endl;
 }
 
 void EposProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "EposProc::slotReceivedStderr: Received error from Epos: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp
index f2126b0..ebe2c3f 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -25,7 +25,7 @@
 #include <math.h>
 
 // TQt includes.
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -33,7 +33,7 @@
 #include <tqdir.h>
 #include <tqslider.h>
 #include <tqdom.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 // KDE includes.
 #include <kdialog.h>
@@ -65,11 +65,11 @@ FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQSt
     m_progressDlg = 0;
     m_supportsSSML = FestivalIntProc::ssUnknown;
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "FestivalIntConfigWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new FestivalIntConfWidget(this, "FestivalIntConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
 
     m_widget->festivalPath->setMode(KFile::File | KFile::ExistingOnly);
     m_widget->festivalPath->setFilter("*");
@@ -229,12 +229,12 @@ TQString FestivalIntConf::getTalkerCode()
             "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
             "<prosody volume=\"%4\" rate=\"%5\" />"
             "<kttsd synthesizer=\"%6\" />")
-            .tqarg(voiceTemp.languageCode)
-            .tqarg(voiceTemp.code)
-            .tqarg(voiceTemp.gender)
-            .tqarg(volume)
-            .tqarg(rate)
-            .tqarg("Festival Interactive");
+            .arg(voiceTemp.languageCode)
+            .arg(voiceTemp.code)
+            .arg(voiceTemp.gender)
+            .arg(volume)
+            .arg(rate)
+            .arg("Festival Interactive");
     return normalTalkerCode;
 }
 
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index 470ec7d..76a570f 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -94,7 +94,7 @@
                             <property name="text">
                                 <string>&amp;Festival executable:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -143,7 +143,7 @@
                             <property name="text">
                                 <string>&amp;Select voice:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -182,7 +182,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -190,7 +190,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -266,7 +266,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -369,7 +369,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -471,7 +471,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -498,7 +498,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>101</width>
                                     <height>20</height>
@@ -520,7 +520,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp
index 6e3a9f3..a6de02e 100644
--- a/kttsd/plugins/festivalint/festivalintproc.cpp
+++ b/kttsd/plugins/festivalint/festivalintproc.cpp
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqthread.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 // KDE includes.
 #include <kdebug.h>
@@ -268,11 +268,11 @@ void FestivalIntProc::synth(
             slider = slider - 500;
             // Map -500 to 500 onto 0.15 to -0.15.
             float stretchValue = -float(slider) * 0.15 / 500.0;
-            timeMsg = TQString("(set! hts_duration_stretch %1)").tqarg(
+            timeMsg = TQString("(set! hts_duration_stretch %1)").arg(
                     stretchValue, 0, 'f', 3);
         }
         else
-            timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").tqarg(
+            timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").arg(
                 1.0/(float(time)/100.0), 0, 'f', 2);
         sendToFestival(timeMsg);
         m_runningTime = time;
@@ -292,7 +292,7 @@ void FestivalIntProc::synth(
         }
         TQString pitchMsg = TQString(
             "(set! int_lr_params '((target_f0_mean %1) (target_f0_std 14)"
-            "(model_f0_mean 170) (model_f0_std 34)))").tqarg(pitchValue, 0, 10);
+            "(model_f0_mean 170) (model_f0_std 34)))").arg(pitchValue, 0, 10);
         sendToFestival(pitchMsg);
         m_runningPitch = pitch;
     }
@@ -500,7 +500,7 @@ void FestivalIntProc::slotProcessExited(KProcess*)
 
 void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     // kdDebug() << "FestivalIntProc::slotReceivedStdout: Received from Festival: " << buf << endl;
     bool promptSeen = (buf.contains("festival>") > 0);
     bool emitQueryVoicesFinished = false;
@@ -569,7 +569,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 
 void FestivalIntProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "FestivalIntProc::slotReceivedStderr: Received error from Festival: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp
index 076fcb0..a205511 100644
--- a/kttsd/plugins/flite/fliteconf.cpp
+++ b/kttsd/plugins/flite/fliteconf.cpp
@@ -22,7 +22,7 @@
  ******************************************************************************/
 
 // TQt includes.
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfile.h>
 #include <tqapplication.h>
 
@@ -49,11 +49,11 @@ FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*
     m_fliteProc = 0;
     m_progressDlg = 0;
     
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "FliteConfigWidgetLayout");
-    tqlayout->tqsetAlignment (TQt::AlignTop);
+    layout->setAlignment (TQt::AlignTop);
     m_widget = new FliteConfWidget(this, "FliteConfigWidget");
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
     
     defaults();
     
@@ -115,12 +115,12 @@ TQString FliteConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .tqarg(m_languageCode)
-                    .tqarg("fixed")
-                    .tqarg("neutral")
-                    .tqarg("medium")
-                    .tqarg("medium")
-                    .tqarg("Festival Lite (flite)");
+                    .arg(m_languageCode)
+                    .arg("fixed")
+                    .arg("neutral")
+                    .arg("medium")
+                    .arg("medium")
+                    .arg("Festival Lite (flite)");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index 21d2471..8efcbb1 100644
--- a/kttsd/plugins/flite/fliteconfwidget.ui
+++ b/kttsd/plugins/flite/fliteconfwidget.ui
@@ -41,7 +41,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
@@ -111,7 +111,7 @@
                             <property name="text">
                                 <string>&amp;Flite executable path:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>221</width>
                             <height>20</height>
diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp
index 238cf26..3f0df60 100644
--- a/kttsd/plugins/flite/fliteproc.cpp
+++ b/kttsd/plugins/flite/fliteproc.cpp
@@ -218,13 +218,13 @@ void FliteProc::slotProcessExited(KProcess*)
 
 void FliteProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "FliteProc::slotReceivedStdout: Received output from Flite: " << buf << endl;
 }
 
 void FliteProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::tqfromLatin1(buffer, buflen);
+    TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "FliteProc::slotReceivedStderr: Received error from Flite: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp
index 87f12b4..cdded33 100644
--- a/kttsd/plugins/freetts/freettsconf.cpp
+++ b/kttsd/plugins/freetts/freettsconf.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // TQt includes. 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -47,11 +47,11 @@ FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList
 	m_freettsProc = 0;
         m_progressDlg = 0;
 	
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
 								KDialog::spacingHint(), "FreeTTSConfigWidgetLayout");
-	tqlayout->tqsetAlignment (TQt::AlignTop);
+	layout->setAlignment (TQt::AlignTop);
 	m_widget = new FreeTTSConfWidget(this, "FreeTTSConfigWidget");
-	tqlayout->addWidget(m_widget);
+	layout->addWidget(m_widget);
 		
 	defaults();
 	
@@ -119,12 +119,12 @@ TQString FreeTTSConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .tqarg(m_languageCode)
-                    .tqarg("fixed")
-                    .tqarg("neutral")
-                    .tqarg("medium")
-                    .tqarg("medium")
-                    .tqarg("FreeTTS");
+                    .arg(m_languageCode)
+                    .arg("fixed")
+                    .arg("neutral")
+                    .arg("medium")
+                    .arg("medium")
+                    .arg("FreeTTS");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index 0fd8f62..e93f3ba 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -38,7 +38,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -108,7 +108,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -148,7 +148,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -164,7 +164,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>410</width>
                                     <height>20</height>
diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp
index e99cd73..c7b2200 100644
--- a/kttsd/plugins/freetts/freettsproc.cpp
+++ b/kttsd/plugins/freetts/freettsproc.cpp
@@ -206,12 +206,12 @@ void FreeTTSProc::slotProcessExited(KProcess*) {
 }
 
 void FreeTTSProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) {
-	TQString buf = TQString::tqfromLatin1(buffer, buflen);
+	TQString buf = TQString::fromLatin1(buffer, buflen);
 	kdDebug() << "FreeTTSProc::slotReceivedStdout: Received output from FreeTTS: " << buf << endl;
 }
 
 void FreeTTSProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) {
-	TQString buf = TQString::tqfromLatin1(buffer, buflen);
+	TQString buf = TQString::fromLatin1(buffer, buflen);
 	kdDebug() << "FreeTTSProc::slotReceivedStderr: Received error from FreeTTS: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index 798455c..3a577de 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 // TQt includes. 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqstring.h>
@@ -92,15 +92,15 @@ class HadifixConfPrivate {
             TQString name = TQFileInfo(*it).fileName();
             gender = HadifixProc::determineGender(defaultMbrolaExec, *it);
             if (gender == HadifixProc::MaleGender)
-                configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").tqarg(name));
+                configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").arg(name));
             else if (gender == HadifixProc::FemaleGender)
-                configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
+                configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
             else {
                if (name == "de1")
-                   configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
+                   configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
                else {
-                   configWidget->addVoice(*it, true,  i18n("Unknown voice \"%1\"").tqarg(name));
-                   configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").tqarg(name));
+                   configWidget->addVoice(*it, true,  i18n("Unknown voice \"%1\"").arg(name));
+                   configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").arg(name));
                }
             }
          }
@@ -206,8 +206,8 @@ class HadifixConfPrivate {
 HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList &) : 
    PlugInConf( parent, name ){
    // kdDebug() << "HadifixConf::HadifixConf: Running" << endl;
-   TQVBoxLayout *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
-   tqlayout->tqsetAlignment (TQt::AlignTop); 
+   TQVBoxLayout *layout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
+   layout->setAlignment (TQt::AlignTop); 
 
    d = new HadifixConfPrivate();
    d->configWidget = new HadifixConfigUI (this, "configWidget");
@@ -224,7 +224,7 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList
    d->initializeCharacterCodes();
    d->initializeVoices();
    d->setDefaults();
-   tqlayout->addWidget (d->configWidget);
+   layout->addWidget (d->configWidget);
 }
 
 /** Destructor */
@@ -284,12 +284,12 @@ TQString HadifixConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .tqarg(d->languageCode)
-                    .tqarg(voiceCode)
-                    .tqarg(gender)
-                    .tqarg(volume)
-                    .tqarg(rate)
-                    .tqarg("Hadifix");
+                    .arg(d->languageCode)
+                    .arg(voiceCode)
+                    .arg(gender)
+                    .arg(volume)
+                    .arg(rate)
+                    .arg("Hadifix");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index a280945..8a686c2 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -470,7 +470,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -525,7 +525,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>240</width>
                             <height>20</height>
diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp
index 4c3f85f..64a4200 100644
--- a/kttsd/plugins/hadifix/hadifixproc.cpp
+++ b/kttsd/plugins/hadifix/hadifixproc.cpp
@@ -18,7 +18,7 @@
  
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
@@ -184,9 +184,9 @@ void HadifixProc::synth(TQString text,
 
    TQString mbrolaCommand = d->hadifixProc->quote(mbrola);
    mbrolaCommand += " -e"; //Ignore fatal errors on unkown diphone
-   mbrolaCommand += TQString(" -v %1").tqarg(volume/100.0); // volume ratio
-   mbrolaCommand += TQString(" -f %1").tqarg(pitch/100.0);  // freqency ratio
-   mbrolaCommand += TQString(" -t %1").tqarg(1/(time/100.0));   // time ratio
+   mbrolaCommand += TQString(" -v %1").arg(volume/100.0); // volume ratio
+   mbrolaCommand += TQString(" -f %1").arg(pitch/100.0);  // freqency ratio
+   mbrolaCommand += TQString(" -t %1").arg(1/(time/100.0));   // time ratio
    mbrolaCommand += " " + d->hadifixProc->quote(voice);
    mbrolaCommand += " - " + d->hadifixProc->quote(waveFilename);
 
@@ -389,11 +389,11 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString
 }
 
 void HadifixProc::receivedStdout (KProcess *, char *buffer, int buflen) {
-   stdOut += TQString::tqfromLatin1(buffer, buflen);
+   stdOut += TQString::fromLatin1(buffer, buflen);
 }
 
 void HadifixProc::receivedStderr (KProcess *, char *buffer, int buflen) {
-   stdErr += TQString::tqfromLatin1(buffer, buflen);
+   stdErr += TQString::fromLatin1(buffer, buflen);
 }
 
 /**
diff --git a/kttsd/plugins/hadifix/voicefileui.ui.h b/kttsd/plugins/hadifix/voicefileui.ui.h
index dfd177d..1d0033e 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui.h
+++ b/kttsd/plugins/hadifix/voicefileui.ui.h
@@ -24,12 +24,12 @@ void VoiceFileWidget::genderButton_clicked()
     }
     else if (gender == HadifixProc::NoGender) {
        KMessageBox::sorry (this,
-                    i18n("The gender of the voice file %1 could not be detected.").tqarg(voiceFileURL->url()),
+                    i18n("The gender of the voice file %1 could not be detected.").arg(voiceFileURL->url()),
                     i18n("Trying to Determine the Gender - Hadifix Plug In"));
     }
     else {
        KMessageBox::detailedSorry (this,
-                    i18n("The file %1 does not seem to be a voice file.").tqarg(voiceFileURL->url()),
+                    i18n("The file %1 does not seem to be a voice file.").arg(voiceFileURL->url()),
                     details, i18n("Trying to Determine the Gender - Hadifix Plug In"));
     }
 }