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

52 files changed, 329 insertions, 329 deletions

diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index 57cf2cc..c18c061 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -95,7 +95,7 @@ void AdBlock::initLabel()
     KIconLoader *loader = instance()->iconLoader();
 
     m_label->setFixedHeight(loader->currentSize(KIcon::Small));
-    m_label->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     m_label->setUseCursor(false);
     m_label->setPixmap(loader->loadIcon("filter", KIcon::Small));
 
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index 57bddf3..3c2716f 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -45,7 +45,7 @@
 #include <tqobjectlist.h>
 #include <tqpixmap.h>
 #include <tqstringlist.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
@@ -156,7 +156,7 @@ void KonqFeedIcon::addFeedIcon()
 
     // from khtmlpart's ualabel
     m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
-    m_feedIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     m_feedIcon->setUseCursor(false);
     //FIXME hackish
     m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png")));
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 48b4fd8..714ed52 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -98,7 +98,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
         {
             item = itemList.first();
             m_name = itemList.first()->name();
-            action = new KAction( i18n( "Compress as %1" ).tqarg( m_name + m_ext ), 0, this,
+            action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
                                     TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
         }
         else
@@ -143,7 +143,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
             {
                 TQString targetName = itemList.first()->name();
                 stripExtension( targetName );
-                action = new KAction( i18n( "Extract to %1" ).tqarg( targetName ), 0, this,
+                action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
                                         TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
             }
             else
@@ -473,7 +473,7 @@ void ArkMenu::slotCompressAs( int pos )
         int i=1;
         while ( KIO::NetAccess::exists(target, true, 0 ) )
         {
-            target = m_dir + i18n("Archive %1").tqarg(i) + m_extensionList[ pos ];
+            target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ];
             i++;
         }
     }
@@ -517,7 +517,7 @@ void ArkMenu::slotCompressAsDefault()
         int i=1;
         while ( KIO::NetAccess::exists(name, true, 0 ) )
         {
-            name = m_dir + i18n("Archive %1").tqarg(i) + m_ext;
+            name = m_dir + i18n("Archive %1").arg(i) + m_ext;
             i++;
         }
     }
diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui
index c0abc0e..9ecf581 100644
--- a/konq-plugins/domtreeviewer/attributeeditdialog.ui
+++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -89,7 +89,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp
index 8951451..7ab20b4 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.cpp
+++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp
@@ -59,14 +59,14 @@ void DOMListViewItem::init()
   clos = false;
 }
 
-void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
+void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
 {
   TQColorGroup _cg( cg );
   TQColor c = _cg.text();
 
   p->setFont(m_font);
   _cg.setColor( TQColorGroup::Text, m_color );
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
   _cg.setColor( TQColorGroup::Text, c );
 }
 
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h
index 3ba7378..f6f74f6 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.h
+++ b/konq-plugins/domtreeviewer/domlistviewitem.h
@@ -33,7 +33,7 @@ class DOMListViewItem : public TQListViewItem
    virtual ~DOMListViewItem();
  
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-			  int column, int width, int tqalignment );  
+			  int column, int width, int alignment );  
 
   void setColor( const TQColor &color) { m_color = color; }
 
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index a072409..0bbb918 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -53,7 +53,7 @@ static const char * const dom_error_msgs[] = {
 TQString domtreeviewer::domErrorMessage(int dom_err)
 {
   if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0])
-    return i18n("Unknown Exception %1").tqarg(dom_err);
+    return i18n("Unknown Exception %1").arg(dom_err);
   else
     return i18n(dom_error_msgs[dom_err]);
 }
@@ -401,8 +401,8 @@ void ChangeCDataCommand::apply()
   if (!shouldReapply()) {
     oldValue = cdata.data();
     has_newlines =
-    	TQConstString(value.tqunicode(), value.length()).string().contains('\n')
-	|| TQConstString(oldValue.tqunicode(), oldValue.length()).string().contains('\n');
+    	TQConstString(value.unicode(), value.length()).string().contains('\n')
+	|| TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n');
   }
   cdata.setData(value);
   addChangedNode(cdata);
diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h
index 6361fd7..eed0822 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.h
+++ b/konq-plugins/domtreeviewer/domtreecommands.h
@@ -305,7 +305,7 @@ class InsertNodeCommand : public ManipulateNodeCommand
 public:
   /**
    * Prepare insertion command, inserting \c node into \c parent, just 
-   * before \c after. If \c after is 0, append it to the list of tqchildren.
+   * before \c after. If \c after is 0, append it to the list of children.
    */
   InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~InsertNodeCommand();
@@ -331,7 +331,7 @@ class RemoveNodeCommand : public ManipulateNodeCommand
 public:
   /**
    * Prepare insertion command, inserting \c node into \c parent, just 
-   * before \c after. If \c after is 0, append it to the list of tqchildren.
+   * before \c after. If \c after is 0, append it to the list of children.
    */
   RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~RemoveNodeCommand();
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 615f056..4089c22 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -36,9 +36,9 @@
 #include <tqfont.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqwidgetstack.h>
 
@@ -124,7 +124,7 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part)
     // nothing here yet
   }
 
-  parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") );
+  parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") );
 
   TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed()));
 }
@@ -343,7 +343,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeN
    * think it's worth it.
    */
 
-  TQColor namedColor(tqpalette().active().text());
+  TQColor namedColor(palette().active().text());
   TQString tagName = nodeName.upper();
   if ( tagName == "HTML" ) {
     namedColor = "#0000ff";
@@ -530,7 +530,7 @@ void DOMTreeView::slotSaveClicked()
 
     if (file.exists()) {
       const TQString title = i18n( "File Exists" );
-      const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).tqarg(url.url());
+      const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url());
       if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) {
 	return;
       }
@@ -545,12 +545,12 @@ void DOMTreeView::slotSaveClicked()
       delete m_textStream;
     } else {
       const TQString title = i18n( "Unable to Open File" );
-      const TQString text = i18n( "Unable to open \n %1 \n for writing" ).tqarg(url.path());
+      const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path());
       KMessageBox::sorry( this, text, title );
     }
   } else {
     const TQString title = i18n( "Invalid URL" );
-    const TQString text = i18n( "This URL \n %1 \n is not valid." ).tqarg(url.url());
+    const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url());
     KMessageBox::sorry( this, text, title );
   }
 }
@@ -973,7 +973,7 @@ public:
 
 protected:
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-			  int column, int width, int tqalignment )
+			  int column, int width, int alignment )
   {
     bool updates_enabled = listView()->isUpdatesEnabled();
     listView()->setUpdatesEnabled(false);
@@ -993,7 +993,7 @@ protected:
 
     TQColorGroup _cg( cg );
     _cg.setColor( TQColorGroup::Text, c );
-    super::paintCell( p, _cg, column, width, tqalignment );
+    super::paintCell( p, _cg, column, width, alignment );
 
     if (text_changed) setText(column, oldText);
     listView()->setUpdatesEnabled(updates_enabled);
diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h
index 6ff1634..43c389c 100644
--- a/konq-plugins/domtreeviewer/domtreeview.h
+++ b/konq-plugins/domtreeviewer/domtreeview.h
@@ -169,7 +169,7 @@ class DOMTreeView : public DOMTreeViewBase
     // == DOM Node Info panel ======================================
 
     public:
-        // Keep in sync with the widget stack tqchildren
+        // Keep in sync with the widget stack children
         enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel };
     
     public slots:
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 0d3a204..4b79c2d 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -12,7 +12,7 @@
             <height>508</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>600</width>
             <height>380</height>
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>10</width>
                             <height>20</height>
@@ -135,7 +135,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -173,7 +173,7 @@
                     <property name="name">
                         <cstring>groupBox1</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>400</height>
@@ -188,7 +188,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -400,7 +400,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout3</cstring>
+                                            <cstring>layout3</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -424,7 +424,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>81</width>
                                                         <height>20</height>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 11b6a1d..a13e288 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -72,7 +72,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
 
     // message window dialog
     msgdlg = new MessageDialog(0, "MessageDialog");
-    msgdlg->messagePane->setPaletteBackgroundColor(tqpalette().active().base());
+    msgdlg->messagePane->setPaletteBackgroundColor(palette().active().base());
 // msgdlg->show();
 
     // then, setup our actions
@@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event)
 
 void DOMTreeWindow::addMessage(int msg_id, const TQString &msg)
 {
-  TQDateTime t(TQDateTime::tqcurrentDateTime());
+  TQDateTime t(TQDateTime::currentDateTime());
   TQString fullmsg = t.toString();
   fullmsg += ":";
 
diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui
index d703eeb..cd2829b 100644
--- a/konq-plugins/domtreeviewer/elementeditdialog.ui
+++ b/konq-plugins/domtreeviewer/elementeditdialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -104,7 +104,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>60</width>
                             <height>20</height>
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui
index c6d20bc..830b1cd 100644
--- a/konq-plugins/domtreeviewer/messagedialog.ui
+++ b/konq-plugins/domtreeviewer/messagedialog.ui
@@ -41,7 +41,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -68,7 +68,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>300</width>
                             <height>20</height>
diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui
index b68a31e..767f505 100644
--- a/konq-plugins/domtreeviewer/texteditdialog.ui
+++ b/konq-plugins/domtreeviewer/texteditdialog.ui
@@ -60,7 +60,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</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>60</width>
                             <height>20</height>
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 830bb3d..931c43f 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -94,12 +94,12 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name)
     double s;
     TQString str;
     for (i=1;i<=ccount;i++) {
-      str = TQString("Dir%1").tqarg(i);
+      str = TQString("Dir%1").arg(i);
       if (!cconfig.hasKey(str)) continue;
       str = cconfig.readPathEntry(str);
-      s = cconfig.readDoubleNumEntry(TQString("Size%1").tqarg(i), 0.0);
-      f = cconfig.readNumEntry(TQString("Files%1").tqarg(i), 0);
-      d = cconfig.readNumEntry(TQString("Dirs%1").tqarg(i), 0);
+      s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0);
+      f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0);
+      d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0);
       if (s==0.0 || f==0 || d==0) continue;
       setDirMetric(str, s, f, d);
     }
@@ -147,7 +147,7 @@ void FSView::setPath(TQString p)
 
   b->setPeer(d);
 
-  setCaption(TQString("%1 - FSView").tqarg(_path));
+  setCaption(TQString("%1 - FSView").arg(_path));
   requestUpdate(b);
 }
 
@@ -286,7 +286,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p)
   popup.insertItem(i18n("Refresh"), 5);
   popup.setItemEnabled(5, !_sm.scanRunning());
 
-  if (i) popup.insertItem(i18n("Refresh '%1'").tqarg(i->text(0)), 4);
+  if (i) popup.insertItem(i18n("Refresh '%1'").arg(i->text(0)), 4);
   popup.insertSeparator();
   addDepthStopItems(dpopup, 1001, i);
   popup.insertItem(i18n("Stop at Depth"), dpopup, 1000);
@@ -331,10 +331,10 @@ void FSView::saveMetric(KConfigGroup* g)
   TQMap<TQString, MetricEntry>::iterator it;
   int c = 1;
   for (it=_dirMetric.begin();it!=_dirMetric.end();++it) {
-    g->writePathEntry(TQString("Dir%1").tqarg(c), it.key());
-    g->writeEntry(TQString("Size%1").tqarg(c), (*it).size);
-    g->writeEntry(TQString("Files%1").tqarg(c), (*it).fileCount);
-    g->writeEntry(TQString("Dirs%1").tqarg(c), (*it).dirCount);
+    g->writePathEntry(TQString("Dir%1").arg(c), it.key());
+    g->writeEntry(TQString("Size%1").arg(c), (*it).size);
+    g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount);
+    g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount);
     c++;
   }
   g->writeEntry("Count", c-1);
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 547335b..493a0e1 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -20,7 +20,7 @@
  * The KPart embedding the FSView widget
  */
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
@@ -74,7 +74,7 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir)
     emitPercent(percent, 100);
     slotInfoMessage(this, i18n("Read 1 folder, in %1",
                                "Read %n folders, in %1",
-                               dirs ).tqarg(cDir));
+                               dirs ).arg(cDir));
   }
   else
     slotInfoMessage(this, i18n("1 folder", "%n folders",  dirs));
@@ -344,7 +344,7 @@ void FSViewBrowserExtension::trash()
 void FSViewBrowserExtension::copySelection( bool move )
 {
   KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move );
-  TQApplication::tqclipboard()->setData( urlData );
+  TQApplication::clipboard()->setData( urlData );
 }
 
 void FSViewBrowserExtension::editMimeType()
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp
index d4875c2..6f5073c 100644
--- a/konq-plugins/fsview/inode.cpp
+++ b/konq-plugins/fsview/inode.cpp
@@ -168,7 +168,7 @@ void Inode::destroyed(ScanDir* d)
 {
   if (_dirPeer == d) _dirPeer = 0;
 
-  // remove tqchildren
+  // remove children
   clear();
 }
 
@@ -179,15 +179,15 @@ void Inode::destroyed(ScanFile* f)
 
 
 
-TreeMapItemList* Inode::tqchildren()
+TreeMapItemList* Inode::children()
 {
   if (!_dirPeer) return 0;
 
-  if (!_tqchildren) {
+  if (!_children) {
     if (!_dirPeer->scanStarted()) return 0;
 
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
 
     setSorting(-1);
 
@@ -215,7 +215,7 @@ TreeMapItemList* Inode::tqchildren()
     _resortNeeded = false;
   }
 
-  return _tqchildren;
+  return _children;
 }  
 
 
@@ -284,7 +284,7 @@ TQColor Inode::backColor() const
   if (id>0) n = TQString::number(id);
 
   if (n.isEmpty())
-    return widget()->tqcolorGroup().button();
+    return widget()->colorGroup().button();
   
   const char* str = n.ascii();
   int h = 0, s = 100;
@@ -325,21 +325,21 @@ TQString Inode::text(int i) const
     double s = size();
 
     if (s < 1000)
-      text = TQString("%1 B").tqarg((int)(s+.5));
+      text = TQString("%1 B").arg((int)(s+.5));
     else if (s < 10 * 1024)
-      text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.005,2));
+      text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2));
     else if (s < 100 * 1024)
-      text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.05,1));
+      text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1));
     else if (s < 1000 * 1024)
-      text = TQString("%1 kB").tqarg((int)(s/1024+.5));
+      text = TQString("%1 kB").arg((int)(s/1024+.5));
     else if (s < 10 * 1024 * 1024)
-      text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2));
+      text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2));
     else if (s < 100 * 1024 * 1024)
-      text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1));
+      text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1));
     else if (s < 1000 * 1024 * 1024)
-      text = TQString("%1 MB").tqarg((int)(s/1024/1024+.5));
+      text = TQString("%1 MB").arg((int)(s/1024/1024+.5));
     else
-      text =  TQString("%1 GB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2));
+      text =  TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2));
 
     if (_sizeEstimation>0) text += "+";
     return text;
@@ -354,10 +354,10 @@ TQString Inode::text(int i) const
 
     if (f>0) {
       while (f>1000) {
-        text = TQString("%1 %2").tqarg(TQString::number(f).right(3)).tqarg(text);
+        text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text);
         f /= 1000;
       }
-      text = TQString("%1 %2").tqarg(TQString::number(f)).tqarg(text);
+      text = TQString("%1 %2").arg(TQString::number(f)).arg(text);
       if (_fileCountEstimation>0) text += "+";
     }
     return text;
diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h
index d21a689..eb1e3dd 100644
--- a/konq-plugins/fsview/inode.h
+++ b/konq-plugins/fsview/inode.h
@@ -53,7 +53,7 @@ public:
 
   void setPeer(ScanDir*);
 
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
 
   double value() const;
   double size() const;
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index fc83601..cab9809 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -756,7 +756,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
   _parent = parent;
 
   _sum = 0;
-  _tqchildren = 0;
+  _children = 0;
   _widget = 0;
   _index = -1;
   _depth = -1; // not set
@@ -789,7 +789,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
   setText(0, text1);
 
   _sum = 0;
-  _tqchildren = 0;
+  _children = 0;
   _widget = 0;
   _index = -1;
   _depth = -1; // not set
@@ -801,7 +801,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
 
 TreeMapItem::~TreeMapItem()
 {
-  if (_tqchildren) delete _tqchildren;
+  if (_children) delete _children;
   if (_freeRects) delete _freeRects;
 
   // finally, notify widget about deletion
@@ -842,18 +842,18 @@ void TreeMapItem::redraw()
 
 void TreeMapItem::clear()
 {
-  if (_tqchildren) {
+  if (_children) {
     // delete selected items below this item from selection
     if (_widget) _widget->clearSelection(this);
 
-    delete _tqchildren;
-    _tqchildren = 0;
+    delete _children;
+    _children = 0;
   }
 }
 
 
-// invalidates current tqchildren and forces redraw
-// this is only usefull when tqchildren are created on demand in items()
+// invalidates current children and forces redraw
+// this is only usefull when children are created on demand in items()
 void TreeMapItem::refresh()
 {
   clear();
@@ -887,9 +887,9 @@ int TreeMapItem::depth() const
 
 bool TreeMapItem::initialized()
 {
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
     return false;
   }
   return true;
@@ -899,16 +899,16 @@ void TreeMapItem::addItem(TreeMapItem* i)
 {
   if (!i) return;
 
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
   }
   i->setParent(this);
 
   if (sorting(0) == -1)
-    _tqchildren->append(i); // preserve insertion order
+    _children->append(i); // preserve insertion order
   else
-    _tqchildren->inSort(i);
+    _children->inSort(i);
 }
 
 
@@ -974,17 +974,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending)
     _sortAscending = ascending;
     _sortTextNo = textNo;
 
-    if (_tqchildren && _sortTextNo != -1) _tqchildren->sort();
+    if (_children && _sortTextNo != -1) _children->sort();
 }
 
 void TreeMapItem::resort(bool recursive)
 {
-  if (!_tqchildren) return;
+  if (!_children) return;
 
-  if (_sortTextNo != -1) _tqchildren->sort();
+  if (_sortTextNo != -1) _children->sort();
 
   if (recursive)
-    for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next())
+    for (TreeMapItem* i=_children->first(); i; i=_children->next())
       i->resort(recursive);
 }
 
@@ -1002,13 +1002,13 @@ int TreeMapItem::rtti() const
   return 0;
 }
 
-TreeMapItemList* TreeMapItem::tqchildren()
+TreeMapItemList* TreeMapItem::children()
 {
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
   }
-  return _tqchildren;
+  return _children;
 }
 
 void TreeMapItem::clearItemRect()
@@ -1252,7 +1252,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d)
 
 TQString TreeMapWidget::defaultFieldType(int f) const
 {
-  return i18n("Text %1").tqarg(f+1);
+  return i18n("Text %1").arg(f+1);
 }
 
 TQString TreeMapWidget::defaultFieldStop(int) const
@@ -1482,7 +1482,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
   if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl;
 
   while (1) {
-    TreeMapItemList* list = p->tqchildren();
+    TreeMapItemList* list = p->children();
     if (!list)
       i = 0;
     else {
@@ -1491,11 +1491,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
 
         if (DEBUG_DRAWING)
 	    kdDebug(90100) << "  Checking " << i->path(0).join("/") << " ("
-		      << i->tqitemRect().x() << "/" << i->tqitemRect().y()
-		      << "-" << i->tqitemRect().width() 
-		      << "x" << i->tqitemRect().height() << ")" << endl;
+		      << i->itemRect().x() << "/" << i->itemRect().y()
+		      << "-" << i->itemRect().width() 
+		      << "x" << i->itemRect().height() << ")" << endl;
 
-        if (i->tqitemRect().contains(x, y)) {
+        if (i->itemRect().contains(x, y)) {
 
 	    if (DEBUG_DRAWING) kdDebug(90100) << "  .. Got. Index " << idx << endl;
 
@@ -1513,7 +1513,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
         if (DEBUG_DRAWING)
 	    kdDebug(90100) << "item(" << x << "," << y << "): Got " 
 		      << p->path(0).join("/") << " (Size " 
-		      << p->tqitemRect().width() << "x" << p->tqitemRect().height()
+		      << p->itemRect().width() << "x" << p->itemRect().height()
 		      << ", Val " << p->value() << ")" << endl;
       }
 
@@ -1542,16 +1542,16 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
 {
   if (i) {
     /* Must have a visible area */
-    while(i && ((i->tqitemRect().width() <1) ||
-                (i->tqitemRect().height() <1))) {
+    while(i && ((i->itemRect().width() <1) ||
+                (i->itemRect().height() <1))) {
       TreeMapItem* p = i->parent();
       if (!p) break;
-      int idx = p->tqchildren()->findRef(i);
+      int idx = p->children()->findRef(i);
       idx--;
       if (idx<0)
         i = p;
       else
-        i = p->tqchildren()->at(idx);
+        i = p->children()->at(idx);
     }
   }
   return i;
@@ -1745,7 +1745,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
     i2 = i2->parent();
   if (!i2) return changed;
 
-  TreeMapItemList* list = commonParent->tqchildren();
+  TreeMapItemList* list = commonParent->children();
   if (!list) return changed;
 
   TreeMapItem* i = list->first();
@@ -1768,11 +1768,11 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
 {
   //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
 
-  if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
+  if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
     e->accept();
 
   if ( e->reason() == TQContextMenuEvent::Keyboard ) {
-    TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect();
+    TQRect r = (_current) ? _current->itemRect() : _base->itemRect();
     TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2);
     emit contextMenuRequested(_current, p);
   }
@@ -1936,14 +1936,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 int nextVisible(TreeMapItem* i)
 {
   TreeMapItem* p = i->parent();
-  if (!p || p->tqitemRect().isEmpty()) return -1;
+  if (!p || p->itemRect().isEmpty()) return -1;
 
-  int idx = p->tqchildren()->findRef(i);
+  int idx = p->children()->findRef(i);
   if (idx<0) return -1;
 
-  while (idx < (int)p->tqchildren()->count()-1) {
+  while (idx < (int)p->children()->count()-1) {
     idx++;
-    TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+    TQRect r = p->children()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -1954,14 +1954,14 @@ int nextVisible(TreeMapItem* i)
 int prevVisible(TreeMapItem* i)
 {
   TreeMapItem* p = i->parent();
-  if (!p || p->tqitemRect().isEmpty()) return -1;
+  if (!p || p->itemRect().isEmpty()) return -1;
 
-  int idx = p->tqchildren()->findRef(i);
+  int idx = p->children()->findRef(i);
   if (idx<0) return -1;
 
   while (idx > 0) {
     idx--;
-    TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+    TQRect r = p->children()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -2042,24 +2042,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
     int newIdx = goBack ? nextVisible(_current) : prevVisible(_current);
     if (p && newIdx>=0) {
       p->setIndex(newIdx);
-      setCurrent(p->tqchildren()->at(newIdx), true);
+      setCurrent(p->children()->at(newIdx), true);
     }
   }
   else if (e->key() == Key_Right) {
     int newIdx = goBack ? prevVisible(_current) : nextVisible(_current);
     if (p && newIdx>=0) {
       p->setIndex(newIdx);
-      setCurrent(p->tqchildren()->at(newIdx), true);
+      setCurrent(p->children()->at(newIdx), true);
     }
   }
   else if (e->key() == Key_Down) {
-    if (_current->tqchildren() && _current->tqchildren()->count()>0) {
+    if (_current->children() && _current->children()->count()>0) {
       int newIdx = _current->index();
       if (newIdx<0)
-        newIdx = goBack ? (_current->tqchildren()->count()-1) : 0;
-      if (newIdx>=(int)_current->tqchildren()->count())
-        newIdx = _current->tqchildren()->count()-1;
-      newItem = visibleItem(_current->tqchildren()->at(newIdx));
+        newIdx = goBack ? (_current->children()->count()-1) : 0;
+      if (newIdx>=(int)_current->children()->count())
+        newIdx = _current->children()->count()-1;
+      newItem = visibleItem(_current->children()->at(newIdx));
       setCurrent(newItem, true);
     }
   }
@@ -2136,7 +2136,7 @@ void TreeMapWidget::drawTreeMap()
     }
     else {
       // only subitem
-      if (!_needsRefresh->tqitemRect().isValid()) return;
+      if (!_needsRefresh->itemRect().isValid()) return;
     }
 
     // reset cached font object; it could have been changed
@@ -2154,7 +2154,7 @@ void TreeMapWidget::drawTreeMap()
     TQPainter p(this);
     tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
                            TQRect(0, 0, TQWidget::width(), TQWidget::height()),
-                           tqcolorGroup() );
+                           colorGroup() );
   }
 }
 
@@ -2198,7 +2198,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
 
   bool isCurrent = _current && item->isChildOf(_current);
 
-  RectDrawing d(item->tqitemRect());
+  RectDrawing d(item->itemRect());
   item->setSelected(isSelected);
   item->setCurrent(isCurrent);
   item->setShaded(_shading);
@@ -2232,25 +2232,25 @@ void TreeMapWidget::drawItems(TQPainter* p,
 {
     if (DEBUG_DRAWING)
 	kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", "
-		  << item->tqitemRect().x() << "/" << item->tqitemRect().y()
-		  << "-" << item->tqitemRect().width() << "x"
-		  << item->tqitemRect().height() << "), Val " << item->value()
+		  << item->itemRect().x() << "/" << item->itemRect().y()
+		  << "-" << item->itemRect().width() << "x"
+		  << item->itemRect().height() << "), Val " << item->value()
 		  << ", Sum " << item->sum() << endl;
 
   drawItem(p, item);
   item->clearFreeRects();
 
-  TQRect origRect = item->tqitemRect();
+  TQRect origRect = item->itemRect();
   int bw = item->borderWidth();
   TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
                   origRect.width()-2*bw, origRect.height()-2*bw);
 
-  TreeMapItemList* list = item->tqchildren();
+  TreeMapItemList* list = item->children();
   TreeMapItem* i;
 
   bool stopDrawing = false;
 
-  // only subdivide if there are tqchildren
+  // only subdivide if there are children
   if (!list || list->count()==0)
     stopDrawing = true;
 
@@ -2283,12 +2283,12 @@ void TreeMapWidget::drawItems(TQPainter* p,
 
   if (stopDrawing) {
     if (list) {
-      // tqinvalidate rects
+      // invalidate rects
       for (i=list->first();i;i=list->next())
         i->clearItemRect();
     }
     // tooltip apears on whole item rect
-    item->addFreeRect(item->tqitemRect());
+    item->addFreeRect(item->itemRect());
 
     // if we have space for text...
     if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return;
@@ -2399,7 +2399,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
       r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height());
     }
 
-    // set selfRect (not occupied by tqchildren) for tooltip
+    // set selfRect (not occupied by children) for tooltip
     item->addFreeRect(sr);
 
     if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR "
@@ -2537,7 +2537,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
       kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl;
 }
 
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
 void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
 {
   p->setBrush(TQt::Dense4Pattern);
@@ -2546,7 +2546,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
   i->addFreeRect(r);
 }
 
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
 void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
                              TreeMapItemListIterator it, int len, bool goBack)
 {
@@ -2845,10 +2845,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
   popup->insertItem(i18n("Border"), bpopup, id+1);
   bpopup->insertItem(i18n("Correct Borders Only"), id+2);
   bpopup->insertSeparator();
-  bpopup->insertItem(i18n("Width %1").tqarg(0), id+3);
-  bpopup->insertItem(i18n("Width %1").tqarg(1), id+4);
-  bpopup->insertItem(i18n("Width %1").tqarg(2), id+5);
-  bpopup->insertItem(i18n("Width %1").tqarg(3), id+6);
+  bpopup->insertItem(i18n("Width %1").arg(0), id+3);
+  bpopup->insertItem(i18n("Width %1").arg(1), id+4);
+  bpopup->insertItem(i18n("Width %1").arg(2), id+5);
+  bpopup->insertItem(i18n("Width %1").arg(3), id+6);
   bpopup->setItemChecked(id+2, skipIncorrectBorder());
   bpopup->setItemChecked(id+3, borderWidth()==0);
   bpopup->setItemChecked(id+4, borderWidth()==1);
@@ -2955,7 +2955,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
   connect(popup, TQT_SIGNAL(activated(int)),
           this, TQT_SLOT(fieldStopActivated(int)));
 
-  popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id);
+  popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
   popup->setItemChecked(id, fieldStop(0).isEmpty());
   _menuItem = i;
   bool foundFieldStop = false;
@@ -3014,7 +3014,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
     int area = i->width() * i->height();
     popup->insertSeparator();
     popup->insertItem(i18n("Area of '%1' (%2)")
-                       .tqarg(i->text(0)).tqarg(area), id+1);
+                       .arg(i->text(0)).arg(area), id+1);
     if (area == minimalArea()) {
       popup->setItemChecked(id+1, true);
       foundArea = true;
@@ -3040,9 +3040,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
     }
 
     popup->insertItem(i18n("Double Area Limit (to %1)")
-                       .tqarg(minimalArea()*2), id+5);
+                       .arg(minimalArea()*2), id+5);
     popup->insertItem(i18n("Halve Area Limit (to %1)")
-                       .tqarg(minimalArea()/2), id+6);
+                       .arg(minimalArea()/2), id+6);
   }
 }
 
@@ -3079,7 +3079,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
     int d = i->depth();
     popup->insertSeparator();
     popup->insertItem(i18n("Depth of '%1' (%2)")
-                       .tqarg(i->text(0)).tqarg(d), id+1);
+                       .arg(i->text(0)).arg(d), id+1);
     if (d == maxDrawingDepth()) {
       popup->setItemChecked(id+1, true);
       foundDepth = true;
@@ -3089,7 +3089,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
   popup->insertSeparator();
   int depth = 2, count;
   for (count=0;count<3;count++) {
-    popup->insertItem(i18n("Depth %1").tqarg(depth), id+4+count);
+    popup->insertItem(i18n("Depth %1").arg(depth), id+4+count);
     if (depth == maxDrawingDepth()) {
       popup->setItemChecked(id+4+count, true);
       foundDepth = true;
@@ -3100,14 +3100,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
   if (maxDrawingDepth()>1) {
     popup->insertSeparator();
     if (!foundDepth) {
-      popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10);
+      popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10);
       popup->setItemChecked(id+10, true);
     }
 
     popup->insertItem(i18n("Decrement (to %1)")
-                       .tqarg(maxDrawingDepth()-1), id+2);
+                       .arg(maxDrawingDepth()-1), id+2);
     popup->insertItem(i18n("Increment (to %1)")
-                       .tqarg(maxDrawingDepth()+1), id+3);
+                       .arg(maxDrawingDepth()+1), id+3);
   }
 }
 
@@ -3130,13 +3130,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
   int f, fCount = _attr.size();
   config->writeEntry(prefix+"FieldCount", fCount);
   for (f=0;f<fCount;f++) {
-    config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f),
                        _attr[f].visible);
-    config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldForced%1").arg(f),
                        _attr[f].forced);
-    config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldStop%1").arg(f),
                        _attr[f].stop);
-    config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f),
                        fieldPositionString(f));
   }
 }
@@ -3180,18 +3180,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
 
   int f;
   for (f=0;f<num;f++) {
-    str = TQString(prefix+"FieldVisible%1").tqarg(f);
+    str = TQString(prefix+"FieldVisible%1").arg(f);
     if (config->hasKey(str))
       setFieldVisible(f, config->readBoolEntry(str));
 
-    str = TQString(prefix+"FieldForced%1").tqarg(f);
+    str = TQString(prefix+"FieldForced%1").arg(f);
     if (config->hasKey(str))
       setFieldForced(f, config->readBoolEntry(str));
 
-    str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f));
+    str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f));
     setFieldStop(f, str);
 
-    str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f));
+    str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f));
     if (!str.isEmpty()) setFieldPosition(f, str);
   }
 }
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 0aa5a9d..9bacedc 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -215,7 +215,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator;
  *
  * If you want more flexibility, reimplement TreeMapItem and
  * override the corresponding methods. For dynamic creation of child
- * items on demand, reimplement tqchildren().
+ * items on demand, reimplement children().
  */
 class TreeMapItem: public StoredDrawParams
 {
@@ -250,7 +250,7 @@ public:
   // force a redraw of this item
   void redraw();
 
-  // delete all tqchildren
+  // delete all children
   void clear();
 
   // force new child generation & refresh
@@ -290,7 +290,7 @@ public:
    */
   void setItemRect(const TQRect& r) { _rect = r; }
   void clearItemRect();
-  const TQRect& tqitemRect() const { return _rect; }
+  const TQRect& itemRect() const { return _rect; }
   int width() const { return _rect.width(); }
   int height() const { return _rect.height(); }
 
@@ -343,7 +343,7 @@ public:
    * For value() sorting, use <textNo> = -2
    *
    * For fast sorting, set this to -1 before child insertions and call
-   * again after inserting all tqchildren.
+   * again after inserting all children.
    */
   void setSorting(int textNo, bool ascending = true);
 
@@ -351,18 +351,18 @@ public:
    * Resort according to the already set sorting.
    *
    * This has to be done if the sorting base changes (e.g. text or values
-   * change). If this is only true for the tqchildren of this item, you can
+   * change). If this is only true for the children of this item, you can
    * set the recursive parameter to false.
    */
   void resort(bool recursive = true);
 
   virtual SplitMode splitMode() const;
   virtual int rtti() const;
-  // not const as this can create tqchildren on demand
-  virtual TreeMapItemList* tqchildren();
+  // not const as this can create children on demand
+  virtual TreeMapItemList* children();
 
 protected:
-  TreeMapItemList* _tqchildren;
+  TreeMapItemList* _children;
   double _sum, _value;
 
 private:
@@ -372,7 +372,7 @@ private:
   int _sortTextNo;
   bool _sortAscending;
 
-  // temporary tqlayout
+  // temporary layout
   TQRect _rect;
   TQPtrList<TQRect>* _freeRects;
   int _depth;
@@ -436,7 +436,7 @@ public:
   /**
    * Selects or unselects an item.
    * In multiselection mode, the constrain that a selected item
-   * has no selected tqchildren or parents stays true.
+   * has no selected children or parents stays true.
    */
   void setSelected(TreeMapItem*, bool selected = true);
 
@@ -452,7 +452,7 @@ public:
   void setMarked(int markNo = 1, bool redraw = true);
 
   /**
-   * Clear selection of all selected items which are tqchildren of
+   * Clear selection of all selected items which are children of
    * parent. When parent == 0, clears whole selection
    * Returns true if selection changed.
    */
@@ -464,7 +464,7 @@ public:
    * Range means for a hierarchical widget:
    * - select/unselect i1 and i2 according selected
    * - search common parent of i1 and i2, and select/unselect the
-   *   range of direct tqchildren between but excluding the child
+   *   range of direct children between but excluding the child
    *   leading to i1 and the child leading to i2.
    */
   void setRangeSelection(TreeMapItem* i1,
@@ -517,7 +517,7 @@ public:
   void setVisibleWidth(int width, bool reuseSpace = false);
 
   /**
-   * If a tqchildren value() is almost the parents sum(),
+   * If a children value() is almost the parents sum(),
    * it can happen that the border to be drawn for visibilty of
    * nesting relations takes to much space, and the
    * parent/child size relation can not be mapped to a correct
@@ -629,7 +629,7 @@ public:
   virtual TQString tipString(TreeMapItem* i) const;
 
   /**
-   * Redraws an item with all tqchildren.
+   * Redraws an item with all children.
    * This takes changed values(), sums(), colors() and text() into account.
    */
   void redraw(TreeMapItem*);
diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py
index ea65c6e..60fce74 100755
--- a/konq-plugins/imagerotation/exif.py
+++ b/konq-plugins/imagerotation/exif.py
@@ -240,7 +240,7 @@ GPS_TAGS={
     0x0006: ('GPSAltitude', ),
     0x0007: ('GPSTimeStamp', ),
     0x0008: ('GPSSatellites', ),
-    0x0009: ('GPStqStatus', ),
+    0x0009: ('GPSStatus', ),
     0x000A: ('GPSMeasureMode', ),
     0x000B: ('GPSDOP', ),
     0x000C: ('GPSSpeedRef', ),
@@ -811,7 +811,7 @@ class EXIF_header:
                                       repr(self.tags[ifd_name+' '+tag_name]))
 
     # extract uncompressed TIFF thumbnail (like pulling teeth)
-    # we take advantage of the pre-existing tqlayout in the thumbnail IFD as
+    # we take advantage of the pre-existing layout in the thumbnail IFD as
     # much as possible
     def extract_TIFF_thumbnail(self, thumb_ifd):
         entries=self.s2n(thumb_ifd, 2)
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 671b90e..d3bbba6 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
@@ -60,7 +60,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name
 
 void KIGPDialog::slotDefault()
 {
-    m_title->setText(i18n("Image Gallery for %1").tqarg(m_path));
+    m_title->setText(i18n("Image Gallery for %1").arg(m_path));
     m_imagesPerRow->setValue(4);
     m_imageName->setChecked(true);
     m_imageSize->setChecked(false);
@@ -96,7 +96,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
     label = new TQLabel( i18n("&Page title:"), page);
     vlay->addWidget(label);
 
-    m_title = new TQLineEdit(i18n("Image Gallery for %1").tqarg(path), page);
+    m_title = new TQLineEdit(i18n("Image Gallery for %1").arg(path), page);
     vlay->addWidget( m_title );
     label->setBuddy(m_title);
 
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 981eeb8..cd5337f 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -19,15 +19,15 @@ Boston, MA 02110-1301, USA.
 */
 
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqfont.h>
 #include <tqdatetime.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqprogressdialog.h>
-#include <tqtextcodec.h>
-#include <tqstylesheet.h>
+#include <textcodec.h>
+#include <stylesheet.h>
 
 #include <kaction.h>
 #include <kglobal.h>
@@ -105,7 +105,7 @@ bool KImGalleryPlugin::createDirectory(TQDir thumb_dir, TQString imgGalleryDir,
     if (!thumb_dir.exists()) {
         thumb_dir.setPath( imgGalleryDir);
         if (!(thumb_dir.mkdir(dirName, false))) {
-            KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").tqarg(thumb_dir.path()));
+            KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").arg(thumb_dir.path()));
             return false;
         } else {
             thumb_dir.setPath( imgGalleryDir + "/" + dirName + "/" );
@@ -163,11 +163,11 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
 {
     int numOfImages = imageDir.count();
     const TQString imgGalleryDir = url.directory();
-    const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
+    const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
 
     stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl;
-    stream << i18n("<i>Number of images</i>: %1").tqarg(numOfImages) << "<br/>" << endl;
-    stream << i18n("<i>Created on</i>: %1").tqarg(today) << "</p>" << endl;
+    stream << i18n("<i>Number of images</i>: %1").arg(numOfImages) << "<br/>" << endl;
+    stream << i18n("<i>Created on</i>: %1").arg(today) << "</p>" << endl;
 
     stream << "<hr/>" << endl;
 
@@ -205,10 +205,10 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
                 const TQString imgPath("thumbs/" + imgName + extension(imageFormat));
                 stream << "<img src=\"" << imgPath << "\" width=\"" << m_imgWidth << "\" ";
                 stream << "height=\"" << m_imgHeight << "\" alt=\"" << imgPath << "\"/>";
-                m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").tqarg(imgName) );
+                m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").arg(imgName) );
             } else {
                 kdDebug(90170) << "Creating thumbnail for " << imgName << " failed" << endl;
-                m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").tqarg(imgName) );
+                m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").arg(imgName) );
             }
             stream << "</a>" << endl;
 
@@ -266,7 +266,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
             if (!subDir.exists()) {
                 subDir.setPath( url.directory() );
                 if (!(subDir.mkdir(currentDir, false))) {
-                    KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").tqarg(subDir.path()));
+                    KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").arg(subDir.path()));
                     continue;
                 } else {
                     subDir.setPath( url.directory() + "/" + currentDir );
@@ -293,12 +293,12 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
     kdDebug(90170) << "imgGalleryDir: " << imgGalleryDir << endl;
 
     // Create the "thumbs" subdirectory if necessary
-    TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
+    TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/"));
     if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false)
         return false;
 
     // Create the "images" subdirectory if necessary
-    TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/"));
+    TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/"));
     if (m_copyFiles) {
         if (createDirectory(images_dir, imgGalleryDir, "images") == false)
             return false;
@@ -320,7 +320,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
         return !m_cancelled;
 
     } else {
-        KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").tqarg(url.path(+1)));
+        KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").arg(url.path(+1)));
         return false;
     }
 }
@@ -344,8 +344,8 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const TQString& s
     }
 
     const TQString imgGalleryDir = url.directory();
-    TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
-    TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/"));
+    TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/"));
+    TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/"));
     TQDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP",
                    TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable);
     TQFile file( url.path() );
@@ -415,7 +415,7 @@ void KImGalleryPlugin::loadCommentFile()
         kdDebug(90170) << "File closed." << endl;
         delete m_textStream;
     } else {
-        KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").tqarg(m_configDlg->getCommentFile()));
+        KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").arg(m_configDlg->getCommentFile()));
         m_useCommentFile = false;
     }
 }
@@ -424,18 +424,18 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
                                     const TQString& imgGalleryDir, const TQString& imageFormat)
 {
     TQImage img;
-    const TQString pixPath = sourceDirName + TQString::tqfromLatin1("/") + imgName;
+    const TQString pixPath = sourceDirName + TQString::fromLatin1("/") + imgName;
 
     if (m_copyFiles) {
         KURL srcURL = KURL::fromPathOrURL(pixPath);
         //kdDebug(90170) << "srcURL: " << srcURL << endl;
-        KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName);
+        KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName);
         //kdDebug(90170) << "destURL: " << destURL << endl;
         KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
     }
 
     const TQString imgNameFormat = imgName + extension(imageFormat);
-    const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/");
+    const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/");
     int extent = m_configDlg->getThumbnailSize();
 
     // this code is stolen from tdebase/kioslave/thumbnail/imagecreator.cpp
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index 27459ee..45c43c0 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -14,7 +14,7 @@
 
 #include "kcmkuick.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfile.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
index 1869438..5d2a239 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
+++ b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
@@ -100,7 +100,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -171,7 +171,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index b9fa89d..030ac98 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -42,11 +42,11 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
       src( _src ),
       action( 0 )
 {
-    tqchildren.setAutoDelete( true );
+    children.setAutoDelete( true );
     initIconMap( );
     connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) );
     connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) );
-    tqchildren.clear(); // just in case
+    children.clear(); // just in case
 
     TQFileInfo fileInfo(path);
     if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
@@ -55,7 +55,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
 KDirMenu::~KDirMenu( ) {
     delete action;
     clear( );
-    tqchildren.clear( );
+    children.clear( );
 }
 void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
     static const TQIconSet folder = SmallIconSet("folder");
@@ -80,7 +80,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
     }
     else
         insertItem( folder, escapedPath.replace( "&", "&&" ), submenu );
-    tqchildren.append( submenu );
+    children.append( submenu );
     connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)),
             this, TQT_SLOT(slotFileSelected(const TQString &)));
 }
diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h
index 979fdf6..f4bd6bf 100644
--- a/konq-plugins/kuick/kdirmenu.h
+++ b/konq-plugins/kuick/kdirmenu.h
@@ -48,7 +48,7 @@ private:
     TQString name;
     KURL src;
     KAction *action;
-    TQPtrList<KDirMenu> tqchildren;
+    TQPtrList<KDirMenu> children;
     void initIconMap( );
 public slots:
     void slotAboutToShow( );
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index 341cc2e..cb1b3ce 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -33,7 +33,7 @@
 #include <kurllabel.h>
 
 #include <tqcursor.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
@@ -275,7 +275,7 @@ void KonqMFIcon::addMFIcon() {
 
 	m_mfIcon = new KURLLabel(m_statusBarEx->statusBar());
 	m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
-	m_mfIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+	m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
 	m_mfIcon->setUseCursor(false);
 	//FIXME hackish
 	m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png")));
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index 60eb724..6616e0e 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -133,8 +133,8 @@ void MinitoolsPlugin::endFolderCallback() {
 }
 
 TQString MinitoolsPlugin::minitoolsFilename(bool local) {
-  return local ? locateLocal("data", TQString::tqfromLatin1("konqueror/minitools.xml"))
-               : locateLocal("data", TQString::tqfromLatin1("konqueror/minitools-global.xml"));
+  return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml"))
+               : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml"));
 }
 
 void MinitoolsPlugin::slotEditBookmarks() {
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 9483f53..4f62c05 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -394,7 +394,7 @@ void RelLinksPlugin::guessRelations()
 
 		TQString href=rx.cap(1)+ nval_str + rx.cap(3);
 		KURL ref( m_part->url(), href );
-		TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL());
+		TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
 		DOM::Element e= m_part->document().createElement("link");
 		e.setAttribute("href",href);
 		element_map["next"][0] = e;
@@ -408,7 +408,7 @@ void RelLinksPlugin::guessRelations()
 				nval_str.prepend(zeros.left(lenval-nval_str.length()));
 			TQString href=rx.cap(1)+ nval_str + rx.cap(3);
 			KURL ref( m_part->url(), href );
-			TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL());
+			TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
 			e= m_part->document().createElement("link");
 			e.setAttribute("href",href);
 			element_map["prev"][0] = e;
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index 0d5305f..5f74987 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -61,7 +61,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqregexp.h>
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index a820d87..4da4d30 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -273,7 +273,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
 		TQStringList list;
 		list << "kurisearchfilter" << "kuriikwsfilter";
 
-		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine));
+		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
                 if (service) {
 		    const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
 		    data.setData( searchProviderPrefix + search );
@@ -281,7 +281,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
 
 		if(!service || !KURIFilter::self()->filterURI(data, list))
 		{
-			data.setData( TQString::tqfromLatin1( "google" ) + delimiter() + search );
+			data.setData( TQString::fromLatin1( "google" ) + delimiter() + search );
 			KURIFilter::self()->filterURI( data, list );
 		}
 
@@ -329,7 +329,7 @@ void SearchBarPlugin::setIcon()
 		TQStringList list;
 		list << "kurisearchfilter" << "kuriikwsfilter";
 
-		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine));
+		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
                 if (service) {
 		    const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
 		    data.setData( searchProviderPrefix + "some keyword" );
@@ -353,7 +353,7 @@ void SearchBarPlugin::setIcon()
 			m_searchIcon = SmallIcon("google");
 			providername = "Google";
 		}
-		hinttext = i18n("%1 Search").tqarg(providername);;
+		hinttext = i18n("%1 Search").arg(providername);;
 	}
 	static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext);
 
@@ -364,7 +364,7 @@ void SearchBarPlugin::setIcon()
 	p.drawPixmap(0, 2, m_searchIcon);
 	TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
 	m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, 
-	    arrowmap.height()-6, 6, 5), m_searchCombo->tqcolorGroup(), arrowFlags, TQStyleOption() );
+	    arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() );
 	p.end();
 	m_searchIcon = arrowmap;
 
@@ -389,7 +389,7 @@ void SearchBarPlugin::showSelectionMenu()
 		for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it )
 		{
 			i++;
-			service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(*it));
+			service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it));
 			if(!service)
 			{
 				continue;
@@ -590,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText)
 
 void SearchBarCombo::mousePressEvent(TQMouseEvent *e)
 {
-	int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
+	int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
 
 	if(e->x() > x0 + 2 && e->x() < lineEdit()->x())
 	{
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 3f3b03a..612be03 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -302,7 +302,7 @@ void MainWidget::slotRenameTag()
     if ( tag )
     {
         TQString oldName = tag->name();
-        TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).tqarg( oldName ) );
+        TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) );
         if ( !newName.isEmpty() )
         {
             KURL url( "http://del.icio.us/api/tags/rename" );
@@ -334,7 +334,7 @@ void MainWidget::slotDeleteBookmark()
     BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( lvBookmarks->currentItem() );
     if ( bookmark )
     {
-        int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).tqarg( bookmark->desc() ),
+        int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).arg( bookmark->desc() ),
                                                          i18n( "Delete Bookmark" ), KStdGuiItem::del() );
 
         if ( result == KMessageBox::Continue )
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
index 4f07e62..14dc7b4 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -71,7 +71,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -88,7 +88,7 @@
                     <property name="name">
                         <cstring>Pause</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -105,7 +105,7 @@
                     <property name="name">
                         <cstring>Stop</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -128,7 +128,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -190,7 +190,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -215,7 +215,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -266,7 +266,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -291,7 +291,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -310,7 +310,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
index 9027637..4acfca0 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -71,7 +71,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -88,7 +88,7 @@
                     <property name="name">
                         <cstring>Pause</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -105,7 +105,7 @@
                     <property name="name">
                         <cstring>Stop</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -128,7 +128,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -190,7 +190,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -215,7 +215,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -266,7 +266,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -291,7 +291,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -310,7 +310,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 2585c7b..7d0f9bb 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -58,7 +58,7 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
 
 ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
 {
-  topWidgetName = parent->tqtopLevelWidget()->name();
+  topWidgetName = parent->topLevelWidget()->name();
   config = new KConfig("metabarrc");
   iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
 
@@ -78,7 +78,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   TQWidget *general = new TQWidget;
   
   TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general);
-  entries_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   
   TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group);
   max_entries = new KIntSpinBox(entries_group);
@@ -98,7 +98,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   
   
   TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general);
-  appearance_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   
   animate = new TQCheckBox(i18n("Animate resize"), appearance_group);
   animate->setChecked(config->readBoolEntry("AnimateResize", false));
@@ -110,13 +110,13 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   showframe->setChecked(config->readBoolEntry("ShowFrame", true));
   
   TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general);
-  theme_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   
   themes = new KComboBox(theme_group);
-  themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
+  themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
   
   install_theme = new KPushButton(i18n("Install New Theme..."), theme_group);
-  install_theme->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+  install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
   connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme()));
   
   loadThemes();
@@ -144,7 +144,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown()));
     
   link_list = new KListView(links);
-  link_list->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+  link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
   link_list->setSorting(-1);
   link_list->setItemsMovable(TRUE);
   link_list->addColumn(i18n("Name"));
@@ -161,7 +161,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   tab->addTab(actionPage, i18n("Actions"));
   tab->addTab(links, i18n("Links"));
   
-  //tqlayout  
+  //layout  
   TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5);
   general_layout->addWidget(entries_group, 0, 0);
   general_layout->addWidget(appearance_group, 0, 1);
@@ -320,7 +320,7 @@ void ConfigDialog::createLink()
   TQLineEdit *url = new TQLineEdit("file:/", main);
   
   KIconButton *icon = new KIconButton(main);
-  icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+  icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
   icon->setIconType(KIcon::Small, KIcon::Any);
   icon->setStrictIconSize(true);
   icon->setIcon("folder");
@@ -330,19 +330,19 @@ void ConfigDialog::createLink()
   bottom_layout->addWidget(ok);
   bottom_layout->addWidget(cancel);
   
-  TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
-  tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
-  tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-  tqlayout->addWidget(name, 0, 2);
-  tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-  tqlayout->addWidget(url, 1, 2);
+  TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
+  layout->addMultiCellWidget(icon, 0, 1, 0, 0);
+  layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+  layout->addWidget(name, 0, 2);
+  layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+  layout->addWidget(url, 1, 2);
 
   TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-  main_layout->addLayout(tqlayout);
+  main_layout->addLayout(layout);
   main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
   main_layout->addLayout(bottom_layout);
   
-  main->resize(300, main->tqsizeHint().height());
+  main->resize(300, main->sizeHint().height());
   
   if(main->exec() == TQDialog::Accepted){
     TQString name_str = name->text();
@@ -403,7 +403,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
     TQLineEdit *url = new TQLineEdit(linkList[item]->url, main);
     
     KIconButton *icon = new KIconButton(main);
-    icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     icon->setIconType(KIcon::Small, KIcon::Any);
     icon->setStrictIconSize(true);
     icon->setIcon(linkList[item]->icon);
@@ -413,19 +413,19 @@ void ConfigDialog::editLink(TQListViewItem *item)
     bottom_layout->addWidget(ok);
     bottom_layout->addWidget(cancel);
     
-    TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
-    tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
-    tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-    tqlayout->addWidget(name, 0, 2);
-    tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-    tqlayout->addWidget(url, 1, 2);
+    TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
+    layout->addMultiCellWidget(icon, 0, 1, 0, 0);
+    layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+    layout->addWidget(name, 0, 2);
+    layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+    layout->addWidget(url, 1, 2);
     
     TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-    main_layout->addLayout(tqlayout);
+    main_layout->addLayout(layout);
     main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     main_layout->addLayout(bottom_layout);
     
-    main->resize(300, main->tqsizeHint().height());
+    main->resize(300, main->sizeHint().height());
     
     if(main->exec() == TQDialog::Accepted){
       TQString name_str = name->text();
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 3f2f7c9..b199b58 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -104,7 +104,7 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
       }
     }
     else{
-      DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8()));
+      DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8()));
 
       if(!action.isNull()){
         if(action.call("enabled()")){
@@ -156,7 +156,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
         KDesktopFile desktop(url.path(), TRUE);
         
         if(desktop.hasApplicationType ()){                    
-          MetabarWidget::addEntry(innerHTML, i18n("Run %1").tqarg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
+          MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
           
           m_functions->show("open");
         }
@@ -364,12 +364,12 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
   buffer.open(IO_WriteOnly);
   pix.save(&buffer, "PNG");
   
-  TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());  
+  TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());  
   bool media = item->mimetype().startsWith("video/");
 
   DOM::DOMString innerHTML;
   
-  innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").tqarg(pix.height() + 15);
+  innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15);
   
   if(media){
     innerHTML += " href=\"preview:///\"";
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index aa09cd3..bbfb9e2 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -107,7 +107,7 @@ bool HTTPPlugin::handleRequest(const KURL &url)
       KURL url("http://www.google.com/search");
       url.addQueryItem("q", keyword);
       
-      DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->tqtopLevelWidget()->name());
+      DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
       DCOPReply reply = ref.call("openURL", url.url());
     }
     
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index f7bc152..1aaf9e8 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -81,7 +81,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList tqchildren = node.childNodes();
+    DOM::NodeList children = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
       }
     }
     else{
-      style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
     }
   }
 }
@@ -117,7 +117,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList tqchildren = node.childNodes();
+    DOM::NodeList children = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
         }
       }
       else{
-        style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
+        style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
       }
     }
   }
@@ -176,7 +176,7 @@ void MetabarFunctions::animate()
       }
       
       int change = currentHeight < height ? changeValue : -changeValue;
-      style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY);
       doc.updateRendering();
     }
   }
@@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
 int MetabarFunctions::getHeight(DOM::HTMLElement &element)
 {
   int height = 0;
-  DOM::NodeList tqchildren = element.childNodes();
-  for(uint i = 0; i < tqchildren.length(); i++){
-    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i));
+  DOM::NodeList children = element.childNodes();
+  for(uint i = 0; i < children.length(); i++){
+    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i));
     DOM::CSSStyleDeclaration style = node.style();
     
     DOM::DOMString css_height = style.getPropertyValue("height");
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 0439c98..a8c2b69 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -27,10 +27,10 @@
 #include "httpplugin.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvaluelist.h>
 #include <tqurl.h>
 #include <tqbuffer.h>
@@ -94,7 +94,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   html->setCaretVisible(false);
   html->setDNDEnabled(false);
   html->setJavaEnabled(false);
-  html->view()->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+  html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
   html->view()->hide();
   
   connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &)));
@@ -114,11 +114,11 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   plugins.insert("http", httpPlugin);
   plugins.insert("https", httpPlugin);
   
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
-  tqlayout->addWidget(html->view());
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
+  layout->addWidget(html->view());
   
   popup = new KPopupMenu(0);
-  KAction *configAction = new KAction(i18n("Configure %1...").tqarg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+  KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
   configAction->plug(popup);
   
   KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
@@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check)
 
 TQString MetabarWidget::getCurrentURL()
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
   DCOPReply reply = ref.call("currentURL()");
     
   if (reply.isValid()) {
@@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL()
 
 void MetabarWidget::openURL(const TQString &url)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
   DCOPReply reply = ref.call("openURL", url);
 }
 
 void MetabarWidget::openTab(const TQString &url)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+  DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
   DCOPReply reply = ref.call("newTab", url);
 }
 
 void MetabarWidget::callAction(const TQString &action)
 {
-  DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->name()).append("/action/").append(action)).utf8());
+  DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8());
   if(ref.call("enabled()")){
     ref.call("activate()");
   }
@@ -289,7 +289,7 @@ void MetabarWidget::loadCompleted()
       if(node.hasAttribute("image")){
         TQString icon = node.getAttribute("image").string();
         TQString url = getIconPath(icon);
-        TQString style = TQString("background-image: url(%1);").tqarg(url);
+        TQString style = TQString("background-image: url(%1);").arg(url);
         
         node.setAttribute("style", style);
       }
@@ -308,7 +308,7 @@ void MetabarWidget::loadCompleted()
   }
 
   config->setGroup("General");
-  TQString file = locate("data", TQString("metabar/themes/%1/default.css").tqarg(config->readEntry("Theme", "default")));
+  TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default")));
   if(file.isNull()){
     file = locate("data", TQString("metabar/themes/default/default.css"));
   }
@@ -393,7 +393,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
         skip = true; //needed to prevent some weired reload
       
         DOM::DOMString innerHTML;
-        innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").tqarg(image.width(), image.height());
+        innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height());
         innerHTML += "<object class=\"preview\" type=\"";
         innerHTML += item->mimetype();
         innerHTML += "\" data=\"";
@@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
     }
     
     if(element.id().string().startsWith("hidden")){
-      TQString style = TQString("background-image: url(%1);").tqarg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
+      TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
       element.setInnerText( showMore ? i18n("More") : i18n("Less") );
       element.setAttribute("style", style);
     }
@@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
   buffer.open(IO_WriteOnly);
   icon.save(&buffer, "PNG");
   
-  return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+  return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
 }
 
 void MetabarWidget::slotShowSharingDialog()
@@ -584,7 +584,7 @@ void MetabarWidget::setTheme()
   loadComplete = false;
 
   config->setGroup("General");
-  TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").tqarg(config->readEntry("Theme", "default")));
+  TQString file = locate("data", TQString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default")));
   
   html->openURL(KURL(file));
 }
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 333aab5..8daf5ba 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
     TQBuffer buffer(data);
     buffer.open(IO_WriteOnly);
     pix.save(&buffer, "PNG");
-    TQString icondata = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+    TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
     
     icon.setSrc(icondata);
   }
@@ -81,7 +81,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
       name.setInnerText(m_items.getFirst()->name());
     }
     else{
-      name.setInnerText(i18n("%1 Elements").tqarg(m_items.count()));
+      name.setInnerText(i18n("%1 Elements").arg(m_items.count()));
     }
   }
   
@@ -105,7 +105,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
         }
       }
 
-      type.setInnerText(i18n("%1 Folders, %2 Files").tqarg(dirs).tqarg(files));
+      type.setInnerText(i18n("%1 Folders, %2 Files").arg(dirs).arg(files));
     }
 
     
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 99e8fb4..d74e39f 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -22,7 +22,7 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsizepolicy.h>
 #include <dcopref.h>
 #include <kiconloader.h>
@@ -45,7 +45,7 @@ namespace KSB_News {
     topLayout->addStretch();
 
     KPushButton *btn = new KPushButton(i18n("&Configure"), this);
-    btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+    btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
     connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked()));
     topLayout->addWidget(btn, 0, TQt::AlignHCenter);
 
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index 56a7c52..a5c1261 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -54,7 +54,7 @@ namespace KSB_News {
         int textWidth = fm.width(text);
         int widgetSpace = visibleWidth();
         if ((textWidth > widgetSpace) || (contentsX() > 0))
-          tip(tqitemRect(item), text);
+          tip(itemRect(item), text);
       }
     }
   }
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 6bc6d1a..924dcf0 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -26,7 +26,7 @@
 */
 
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollview.h>
 #include <tqptrdict.h>
 #include <tqsizepolicy.h>
@@ -53,7 +53,7 @@ namespace KSB_News {
   NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name,
                                      TQPixmap appIcon) : TQWidget(parent, name) {
     currentPage = 0;
-    tqlayout = new TQVBoxLayout(this);
+    layout = new TQVBoxLayout(this);
 
     pagesheader.setAutoDelete(TRUE);
     pages.setAutoDelete(TRUE);
@@ -115,7 +115,7 @@ namespace KSB_News {
     button->setText(KStringHandler::rPixelSqueeze(nsp->title(),
                                                   button->fontMetrics(),
                                                   button->width() - 4 ));
-    button->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+    button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
                                       TQSizePolicy::Preferred));
     connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked()));
     TQToolTip::add(button, nsp->title());
@@ -132,8 +132,8 @@ namespace KSB_News {
     pagesheader.insert(nsp, button);
     pages.insert(nsp, sv);
 
-    tqlayout->addWidget(button);
-    tqlayout->addWidget(sv);
+    layout->addWidget(button);
+    layout->addWidget(sv);
     button->show();
     if (pages.count() == 1) {
       currentPage = sv;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 08f0f22..e6ab6a7 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -74,7 +74,7 @@ namespace KSB_News {
   private:
     TQPtrDict<TQWidget> pages;
     TQPtrDict<TQWidget> pagesheader;
-    TQVBoxLayout *tqlayout;
+    TQVBoxLayout *layout;
     TQWidget *currentPage;
     KPopupMenu *popup, *helpmenu;
     KAboutData *m_aboutdata;
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index d376d73..a9efc26 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda
 
 
 #define UA_PTOS(x) (*it)->property(x).toString()
-#define TQFL1(x) TQString::tqfromLatin1(x)
+#define TQFL1(x) TQString::fromLatin1(x)
 
 
 UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
@@ -135,21 +135,21 @@ void UAChangerPlugin::parseDescFiles()
       continue; // Ignore dups!
 
     m_lstIdentity << tmp;
-    tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-SYSNAME")).tqarg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
+    tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
 
     if ( tmp.stripWhiteSpace().isEmpty() )
     {
       if(tag == "NN" || tag == "IE" || tag == "MOZ")
-         tmp = i18n("Version %1").tqarg(UA_PTOS("X-KDE-UA-VERSION"));
+         tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION"));
       else
-         tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION"));
+         tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION"));
     }
     else
     {
       if(tag == "NN" || tag == "IE" || tag == "MOZ")
-         tmp = i18n("Version %1 on %2").tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
+         tmp = i18n("Version %1 on %2").arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
       else
-        tmp = i18n("%1 %2 on %3").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
+        tmp = i18n("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
     }
 
     m_lstAlias << tmp;
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index fe61ae3..f669308 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -184,7 +184,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
           	i18n("<qt>The selected URL cannot be verified because it contains "
           	     "a password. Sending this URL to <b>%1</b> would put the security "
           	     "of <b>%2</b> at risk.</qt>")
-          	     .tqarg(validatorUrl.host()).tqarg(partUrl.host()));
+          	     .arg(validatorUrl.host()).arg(partUrl.host()));
           return;
         }
       // Set entered URL as a parameter
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index 864de55..069426b 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <kconfig.h>
 
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index b72ca42..d172dc1 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kactivelabel.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqiodevice.h>
 #include <klistview.h>
 #include <kio/job.h>
@@ -88,7 +88,7 @@ void ArchiveDialog::archive()
 
    } else {
      const TQString title = i18n( "Unable to Open Web-Archive" );
-     const TQString text = i18n( "Unable to open \n %1 \n for writing." ).tqarg(m_tarBall->fileName());
+     const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
      KMessageBox::sorry( 0L, text, title );
    }
 }
@@ -207,7 +207,7 @@ static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName)
    }
    catch (...)
    {
-     // No tqchildren, stop recursion here
+     // No children, stop recursion here
      child = DOM::Node();
    }
 
@@ -346,7 +346,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
    }
    catch (...)
    {
-     // No tqchildren, stop recursion here
+     // No children, stop recursion here
      child = DOM::Node();
    }
 
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index 571b39d..743c591 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 85d43ee..c76f56c 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -94,7 +94,7 @@ void PluginWebArchiver::slotSaveToArchive()
 
   if (!(url.isValid())) {
     const TQString title = i18n( "Invalid URL" );
-    const TQString text = i18n( "The URL\n%1\nis not valid." ).tqarg(url.prettyURL());
+    const TQString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL());
     KMessageBox::sorry(part->widget(), text, title );
     return;
   }
@@ -102,7 +102,7 @@ void PluginWebArchiver::slotSaveToArchive()
   const TQFile file(url.path());
   if (file.exists()) {
     const TQString title = i18n( "File Exists" );
-    const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).tqarg(url.prettyURL());
+    const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL());
     if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) {
       return;
     }