Rename old tq methods that no longer need a unique name

(cherry picked from commit a90eb215f53c95d81f95b32255098066d90556d9)

24 files changed, 98 insertions, 98 deletions

diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/apps/ktorrent/addpeerwidgetbase.ui
index 3ae532a..6aee5e0 100644
--- a/apps/ktorrent/addpeerwidgetbase.ui
+++ b/apps/ktorrent/addpeerwidgetbase.ui
@@ -77,7 +77,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/apps/ktorrent/advancedpref.ui b/apps/ktorrent/advancedpref.ui
index a144aa6..0b8f00a 100644
--- a/apps/ktorrent/advancedpref.ui
+++ b/apps/ktorrent/advancedpref.ui
@@ -108,7 +108,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>148</width>
                                     <height>20</height>
@@ -223,7 +223,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>111</width>
                                     <height>20</height>
@@ -283,7 +283,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>111</width>
                                     <height>20</height>
@@ -405,7 +405,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -459,7 +459,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -553,7 +553,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>383</width>
                                     <height>20</height>
@@ -601,7 +601,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>81</width>
                                     <height>20</height>
@@ -622,7 +622,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/apps/ktorrent/downloadpref.ui b/apps/ktorrent/downloadpref.ui
index 6315cba..47f1f4c 100644
--- a/apps/ktorrent/downloadpref.ui
+++ b/apps/ktorrent/downloadpref.ui
@@ -69,7 +69,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>40</width>
                                                     <height>20</height>
@@ -246,7 +246,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>10</width>
                                                     <height>20</height>
@@ -273,7 +273,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>191</width>
                                             <height>20</height>
@@ -290,7 +290,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>207</width>
                                             <height>20</height>
@@ -380,7 +380,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -594,7 +594,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>208</width>
                                     <height>20</height>
@@ -611,7 +611,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>208</width>
                                     <height>20</height>
@@ -628,7 +628,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>208</width>
                                     <height>20</height>
@@ -697,7 +697,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index 5f0e33d..98d927a 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -217,9 +217,9 @@ void FileSelectDlg::updateSizeLabels()
 	lblRequired->setText(kt::BytesToString(bytes_to_download));
 
 	if (bytes_to_download > bytes_free)
-		lbltqStatus->setText("<font color=\"#ff0000\">" + kt::BytesToString(-1*(long long)(bytes_free - bytes_to_download)) + i18n(" short!"));
+		lblStatus->setText("<font color=\"#ff0000\">" + kt::BytesToString(-1*(long long)(bytes_free - bytes_to_download)) + i18n(" short!"));
 	else
-		lbltqStatus->setText(kt::BytesToString(bytes_free - bytes_to_download));
+		lblStatus->setText(kt::BytesToString(bytes_free - bytes_to_download));
 }
 
 void FileSelectDlg::treeItemChanged()
diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui
index 152c057..f289025 100644
--- a/apps/ktorrent/fileselectdlgbase.ui
+++ b/apps/ktorrent/fileselectdlgbase.ui
@@ -207,7 +207,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>135</height>
@@ -237,7 +237,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -298,7 +298,7 @@
                         </widget>
                         <widget class="TQLabel">
                             <property name="name">
-                                <cstring>lbltqStatus</cstring>
+                                <cstring>lblStatus</cstring>
                             </property>
                         </widget>
                     </vbox>
@@ -315,7 +315,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>220</width>
                     <height>20</height>
diff --git a/apps/ktorrent/generalpref.ui b/apps/ktorrent/generalpref.ui
index 33eb8f3..a1ba5e9 100644
--- a/apps/ktorrent/generalpref.ui
+++ b/apps/ktorrent/generalpref.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -142,7 +142,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
index c02218d..dea4bc2 100644
--- a/apps/ktorrent/ipfilterwidgetbase.ui
+++ b/apps/ktorrent/ipfilterwidgetbase.ui
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -144,7 +144,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -192,7 +192,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -234,7 +234,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>30</height>
diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
index 1156b88..048692b 100644
--- a/apps/ktorrent/ktorrentviewitem.cpp
+++ b/apps/ktorrent/ktorrentviewitem.cpp
@@ -30,7 +30,7 @@
 using namespace bt;
 using namespace kt;
 /*
-static TQString StatusToString(TorrentInterface* tc,TorrenttqStatus s)
+static TQString StatusToString(TorrentInterface* tc,TorrentStatus s)
 {
 	switch (s)
 	{
@@ -55,7 +55,7 @@ static TQString StatusToString(TorrentInterface* tc,TorrenttqStatus s)
 }
 */
 
-static TQColor StatusToColor(TorrenttqStatus s,const TQColorGroup & cg)
+static TQColor StatusToColor(TorrentStatus s,const TQColorGroup & cg)
 {
 	TQColor green(40,205,40);
 	TQColor yellow(255,174,0);
diff --git a/apps/ktorrent/leaktrace.cpp b/apps/ktorrent/leaktrace.cpp
index ae41d3f..f3bdb5f 100644
--- a/apps/ktorrent/leaktrace.cpp
+++ b/apps/ktorrent/leaktrace.cpp
@@ -91,7 +91,7 @@ static void WriteLeakReport()
 	fclose(report);
 }
 
-static void PrinttqStatus()
+static void PrintStatus()
 {
 	if (mtree.count == 0)
 	{
@@ -124,7 +124,7 @@ static void RegisterAlloc(void* ptr,Uint32 size)
 		for (Uint32 b = 0;b < SOME_PRIME;b++)
 			mtree.buckets[b] = 0;
 		mtree.num_buckets = SOME_PRIME;
-		atexit(PrinttqStatus);
+		atexit(PrintStatus);
 	}
 	
 	// hash the address
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index a68aeab..199e0ce 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
     setToggleButton(true);
     setFocusPolicy(TQ_NoFocus);
     setDescription(m_description);
-    tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-    resize(tqsizeHint());
+    setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    resize(sizeHint());
     fixDimensions(Ideal::Bottom);
 
     TQToolTip::add(this, m_realText);
@@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p)
     pm.fill(eraseColor());
     TQPainter p2(&pm);
 
-    tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags);
+    tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
 
-    tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this,
+    tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
                         TQRect(0,0,pm.width(),pm.height()),
-                        tqcolorGroup(), flags, TQStyleOption());
+                        colorGroup(), flags, TQStyleOption());
 
     switch (m_place)
     {
@@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top))
             {
                 setFixedWidth(height());
-                setMinimumHeight(tqsizeHint().width());
+                setMinimumHeight(sizeHint().width());
                 setMaximumHeight(32767);
             }
             break;
@@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right))
             {
                 setFixedHeight(width());
-                setMinimumWidth(tqsizeHint().height());
+                setMinimumWidth(sizeHint().height());
                 setMaximumWidth(32767);
             }
             break;
     }
 }
 
-TQSize Button::tqsizeHint() const
+TQSize Button::sizeHint() const
 {
-    return tqsizeHint(text());
+    return sizeHint(text());
 }
 
-TQSize Button::tqsizeHint(const TQString &text) const
+TQSize Button::sizeHint(const TQString &text) const
 {
     constPolish();
     int w = 0, h = 0;
@@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
         h = TQMAX( h, ih );
     }
     if ( isMenuButton() )
-        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
         w += pm->width();
@@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
         TQString s( text );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::tqfromLatin1("XXXX");
+            s = TQString::fromLatin1("XXXX");
         TQFontMetrics fm = fontMetrics();
         TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
@@ -239,12 +239,12 @@ void Button::updateSize()
     {
         case Ideal::Left:
         case Ideal::Right:
-             setMinimumHeight(tqsizeHint().width());
-             resize(tqsizeHint().height(), tqsizeHint().width());
+             setMinimumHeight(sizeHint().width());
+             resize(sizeHint().height(), sizeHint().width());
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            resize(tqsizeHint().width(), tqsizeHint().height());
+            resize(sizeHint().width(), sizeHint().height());
             break;
     }
 }
diff --git a/apps/ktorrent/newui/button.h b/apps/ktorrent/newui/button.h
index 86e27c2..b26f94f 100644
--- a/apps/ktorrent/newui/button.h
+++ b/apps/ktorrent/newui/button.h
@@ -54,8 +54,8 @@ public:
     /**Sets the mode of a button.*/
     void setMode(Ideal::ButtonMode mode);
 
-    TQSize tqsizeHint() const;
-    TQSize tqsizeHint(const TQString &text) const;
+    TQSize sizeHint() const;
+    TQSize sizeHint(const TQString &text) const;
 
     /**Updates size of a widget. Used after squeezing button's text.*/
     void updateSize();
diff --git a/apps/ktorrent/newui/buttonbar.cpp b/apps/ktorrent/newui/buttonbar.cpp
index 80da533..071b779 100644
--- a/apps/ktorrent/newui/buttonbar.cpp
+++ b/apps/ktorrent/newui/buttonbar.cpp
@@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci
 {
 }
 
-TQSize ButtonLayout::tqminimumSize() const
+TQSize ButtonLayout::minimumSize() const
 {
-    TQSize size = TQBoxLayout::tqminimumSize();
+    TQSize size = TQBoxLayout::minimumSize();
 
     if (!m_buttonBar->autoResize())
         return size;
@@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const
         case Ideal::Bottom:
             return TQSize(0,size.height());
     }
-    return TQBoxLayout::tqminimumSize();
+    return TQBoxLayout::minimumSize();
 }
 
 
@@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
     {
         case Ideal::Left:
         case Ideal::Right:
-            setFixedWidth(tqsizeHint().width());
-            setMinimumHeight(tqsizeHint().height());
+            setFixedWidth(sizeHint().width());
+            setMinimumHeight(sizeHint().height());
             setMaximumHeight(32767);
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            setFixedHeight(tqsizeHint().height());
-            setMinimumWidth(tqsizeHint().width());
+            setFixedHeight(sizeHint().height());
+            setMinimumWidth(sizeHint().width());
             setMaximumWidth(32767);
             break;
     }
@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
     {
         case Ideal::Left:
         case Ideal::Right:
-            preferredDimension = l->TQBoxLayout::tqminimumSize().height();
+            preferredDimension = l->TQBoxLayout::minimumSize().height();
             actualDimension = size().height();
             oldDimension = ev->oldSize().height();
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            preferredDimension = l->TQBoxLayout::tqminimumSize().width();
+            preferredDimension = l->TQBoxLayout::minimumSize().width();
             actualDimension = size().width();
             oldDimension = ev->oldSize().width();
             break;
@@ -285,7 +285,7 @@ int ButtonBar::originalDimension()
     int size = 0;
     for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
     {
-        size += (*it)->tqsizeHint((*it)->realText()).width();
+        size += (*it)->sizeHint((*it)->realText()).width();
     }
     return size;
 }
diff --git a/apps/ktorrent/newui/buttonbar.h b/apps/ktorrent/newui/buttonbar.h
index 5f11d97..f7db748 100644
--- a/apps/ktorrent/newui/buttonbar.h
+++ b/apps/ktorrent/newui/buttonbar.h
@@ -34,12 +34,12 @@ class ButtonBar;
 
 /**@short A tqlayout for a ButtonBar class.
 
-Overrides tqminimumSize method to allow shrinking button bar buttons.*/
+Overrides minimumSize method to allow shrinking button bar buttons.*/
 class ButtonLayout: public TQBoxLayout{
 public:
     ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
 
-    virtual TQSize tqminimumSize() const;
+    virtual TQSize minimumSize() const;
 
 private:
     ButtonBar *m_buttonBar;
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index 6fd9b88..1409522 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -119,9 +119,9 @@ void DDockWindow::setVisible(bool v)
     if (!m_visible)
     {
         if (m_position == DDockWindow::Bottom)
-            setFixedExtentHeight(m_internalLayout->tqsizeHint().height());
+            setFixedExtentHeight(m_internalLayout->sizeHint().height());
         else
-            setFixedExtentWidth(m_internalLayout->tqsizeHint().width());
+            setFixedExtentWidth(m_internalLayout->sizeHint().width());
         emit hidden();
     }
     else
@@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v)
         int size = 0;
         if (m_position == DDockWindow::Bottom)
         {
-            size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().height());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().height());
             setFixedExtentHeight(size);
         }
         else
         {
-            size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().width());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().width());
             setFixedExtentWidth(size);
         }
     }
@@ -338,7 +338,7 @@ bool DDockWindow::isActive()
 {
     if (m_toggledButton)
     {
-        TQWidget *w = tqApp->tqfocusWidget();
+        TQWidget *w = tqApp->focusWidget();
         if (!w)
             return false;
         TQWidget *toolWidget = m_widgets[m_toggledButton];
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
index 7ccc689..cfa7ee1 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/apps/ktorrent/newui/dmainwindow.cpp
@@ -189,7 +189,7 @@ DTabWidget *DMainWindow::splitVertical()
 
 void DMainWindow::invalidateActiveTabWidget()
 {
-/*    TQWidget *focused = m_central->tqfocusWidget();
+/*    TQWidget *focused = m_central->focusWidget();
     kdDebug(9000) << "tqinvalidate: " << focused << endl;
     if (focused == 0)
         return;
diff --git a/apps/ktorrent/newui/docksplitter.cpp b/apps/ktorrent/newui/docksplitter.cpp
index 14d321e..bb6a68d 100644
--- a/apps/ktorrent/newui/docksplitter.cpp
+++ b/apps/ktorrent/newui/docksplitter.cpp
@@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
         w->hide();
     }
 
-    m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint());
+    m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint());
 
     if (isRowEmpty(row))
     {
diff --git a/apps/ktorrent/pastedlgbase.ui b/apps/ktorrent/pastedlgbase.ui
index 6762dfe..700d12d 100644
--- a/apps/ktorrent/pastedlgbase.ui
+++ b/apps/ktorrent/pastedlgbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -64,7 +64,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>400</width>
                             <height>0</height>
@@ -91,7 +91,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>297</width>
                             <height>20</height>
diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
index 508789b..80c6440 100644
--- a/apps/ktorrent/queuedialog.cpp
+++ b/apps/ktorrent/queuedialog.cpp
@@ -123,7 +123,7 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam
 	for( ; it != qman->end(); ++it)
 	{
 		TorrentInterface* tc = *it;
-		TorrenttqStatus ts = tc->getStats().status;
+		TorrentStatus ts = tc->getStats().status;
 		
 		if(ts == kt::SEEDING || ts == kt::DOWNLOAD_COMPLETE || 
 			ts == kt::SEEDING_COMPLETE || tc->getStats().completed)
@@ -288,7 +288,7 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item)
 {
 	if(!item)
 	{
-		dltqStatus->clear();
+		dlStatus->clear();
 		dlTracker->clear();
 		dlRatio->clear();
 		dlDHT->clear();
@@ -298,7 +298,7 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item)
 	const TorrentInterface* tc = ((QueueItem*)item)->getTC();
 	TorrentStats s = tc->getStats();
 	
-	dltqStatus->setText(tc->statusToString());
+	dlStatus->setText(tc->statusToString());
 	dlTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
 	dlRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
 	dlBytes->setText(BytesToString(s.bytes_left_to_download));
@@ -309,7 +309,7 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item)
 {
 	if(!item)
 	{
-		ultqStatus->clear();
+		ulStatus->clear();
 		ulTracker->clear();
 		ulRatio->clear();
 		ulDHT->clear();
@@ -319,7 +319,7 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item)
 	const TorrentInterface* tc = ((QueueItem*)item)->getTC();
 	TorrentStats s = tc->getStats();
 	
-	ultqStatus->setText(tc->statusToString());
+	ulStatus->setText(tc->statusToString());
 	ulTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
 	ulRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
 	ulBytes->setText(BytesToString(s.bytes_uploaded));
diff --git a/apps/ktorrent/queuedlg.ui b/apps/ktorrent/queuedlg.ui
index 8517b57..7e4769f 100644
--- a/apps/ktorrent/queuedlg.ui
+++ b/apps/ktorrent/queuedlg.ui
@@ -129,7 +129,7 @@
                                     </property>
                                     <widget class="TQLabel">
                                         <property name="name">
-                                            <cstring>dltqStatus</cstring>
+                                            <cstring>dlStatus</cstring>
                                         </property>
                                         <property name="text">
                                             <string></string>
@@ -345,7 +345,7 @@
                                     </property>
                                     <widget class="TQLabel">
                                         <property name="name">
-                                            <cstring>ultqStatus</cstring>
+                                            <cstring>ulStatus</cstring>
                                         </property>
                                         <property name="text">
                                             <string></string>
@@ -416,7 +416,7 @@
                             <property name="sizeType">
                                 <enum>Preferred</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -452,7 +452,7 @@
                             <property name="sizeType">
                                 <enum>Preferred</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -471,7 +471,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -504,7 +504,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -540,7 +540,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -573,7 +573,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/apps/ktorrent/scandlgbase.ui b/apps/ktorrent/scandlgbase.ui
index 89ffb9f..2538680 100644
--- a/apps/ktorrent/scandlgbase.ui
+++ b/apps/ktorrent/scandlgbase.ui
@@ -84,7 +84,7 @@
                             <property name="name">
                                 <cstring>m_chunks_found</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
@@ -104,7 +104,7 @@
                             <property name="name">
                                 <cstring>m_chunks_failed</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
@@ -164,7 +164,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>181</width>
                             <height>20</height>
diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/apps/ktorrent/speedlimitsdlgbase.ui
index f4313e2..17dc49c 100644
--- a/apps/ktorrent/speedlimitsdlgbase.ui
+++ b/apps/ktorrent/speedlimitsdlgbase.ui
@@ -141,7 +141,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
index 78e7494..fdffb62 100644
--- a/apps/ktorrent/torrentcreatordlgbase.ui
+++ b/apps/ktorrent/torrentcreatordlgbase.ui
@@ -148,7 +148,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -233,7 +233,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -372,7 +372,7 @@
                     <property name="sizeType">
                         <enum>Maximum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -422,7 +422,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
diff --git a/apps/ktorrent/trayhoverpopup.cpp b/apps/ktorrent/trayhoverpopup.cpp
index 7df590f..5cce261 100644
--- a/apps/ktorrent/trayhoverpopup.cpp
+++ b/apps/ktorrent/trayhoverpopup.cpp
@@ -114,7 +114,7 @@ void TrayHoverPopup::create()
 		hb->setSpacing(KDialog::spacingHint());
 		TQLabel* pix_lbl = new TQLabel(hb,"title_icon");
 		pix_lbl->setPixmap(pix);
-		pix_lbl->tqsetAlignment(AlignLeft);
+		pix_lbl->setAlignment(AlignLeft);
 	}
 	 
 	
@@ -122,13 +122,13 @@ void TrayHoverPopup::create()
 	TQFont fnt = title->font();
 	fnt.setBold( true );
 	title->setFont( fnt );
-	title->tqsetAlignment( TQt::AlignHCenter );
+	title->setAlignment( TQt::AlignHCenter );
 	if ( hb )
 		hb->setStretchFactor(title, 10 ); // enforce centering
 
 	// text will be filled later
 	text = new TQLabel( "Dummy", vb, "msg_label" );
-				text->tqsetAlignment( AlignLeft );
+				text->setAlignment( AlignLeft );
 	setView(vb);
 }
 	
diff --git a/apps/ktupnptest/mainwidget.ui b/apps/ktupnptest/mainwidget.ui
index 0aacede..e46bbd1 100644
--- a/apps/ktupnptest/mainwidget.ui
+++ b/apps/ktupnptest/mainwidget.ui
@@ -39,7 +39,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>61</width>
                             <height>20</height>