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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

8 files changed, 52 insertions, 52 deletions

diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 0d7cf9aa..3b483cd4 100644
--- a/src/newui/button.cpp
+++ b/src/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);
-    setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-    resize(sizeHint());
+    tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    resize(tqsizeHint());
     fixDimensions(Ideal::Bottom);
 
     TQToolTip::add(this, m_realText);
@@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
 
     KConfig *config = kapp->config();
     config->setGroup("UI");
-    TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
+    TQString accel = config->readEntry(TQString("button_%1").tqarg(text), "");
     if (!accel.isEmpty())
-        setRealText(TQString("&%1 %2").arg(accel).arg(m_realText));
+        setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText));
 }
 
 Button::~Button()
@@ -80,11 +80,11 @@ Button::~Button()
         TQString text = m_realText;
         if (text.contains(r2))
             text.remove(r2);
-        config->writeEntry(TQString("button_%1").arg(text), r.cap(1));
+        config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1));
     }
     else
     {
-        config->writeEntry(TQString("button_%1").arg(m_realText), "");
+        config->writeEntry(TQString("button_%1").tqarg(m_realText), "");
     }
 }
 
@@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p)
     pm.fill(eraseColor());
     TQPainter p2(&pm);
 
-    tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
+    tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags);
 
-    tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
+    tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this,
                         TQRect(0,0,pm.width(),pm.height()),
-                        colorGroup(), flags, TQStyleOption());
+                        tqcolorGroup(), flags, TQStyleOption());
 
     switch (m_place)
     {
@@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top))
             {
                 setFixedWidth(height());
-                setMinimumHeight(sizeHint().width());
+                setMinimumHeight(tqsizeHint().width());
                 setMaximumHeight(32767);
             }
             break;
@@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right))
             {
                 setFixedHeight(width());
-                setMinimumWidth(sizeHint().height());
+                setMinimumWidth(tqsizeHint().height());
                 setMaximumWidth(32767);
             }
             break;
     }
 }
 
-TQSize Button::sizeHint() const
+TQSize Button::tqsizeHint() const
 {
-    return sizeHint(text());
+    return tqsizeHint(text());
 }
 
-TQSize Button::sizeHint(const TQString &text) const
+TQSize Button::tqsizeHint(const TQString &text) const
 {
     constPolish();
     int w = 0, h = 0;
@@ -211,7 +211,7 @@ TQSize Button::sizeHint(const TQString &text) const
         h = TQMAX( h, ih );
     }
     if ( isMenuButton() )
-        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
         w += pm->width();
@@ -220,7 +220,7 @@ TQSize Button::sizeHint(const TQString &text) const
         TQString s( text );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::fromLatin1("XXXX");
+            s = TQString::tqfromLatin1("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(sizeHint().width());
-             resize(sizeHint().height(), sizeHint().width());
+             setMinimumHeight(tqsizeHint().width());
+             resize(tqsizeHint().height(), tqsizeHint().width());
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            resize(sizeHint().width(), sizeHint().height());
+            resize(tqsizeHint().width(), tqsizeHint().height());
             break;
     }
 }
@@ -319,7 +319,7 @@ void Button::assignAccel()
     if (ok)
     {
         TQString text = realTextWithoutAccel();
-        text = TQString("&%1 %2").arg(num).arg(text);
+        text = TQString("&%1 %2").tqarg(num).tqarg(text);
         setRealText(text);
     }
 }
diff --git a/src/newui/button.h b/src/newui/button.h
index 96948267..34ce4e3a 100644
--- a/src/newui/button.h
+++ b/src/newui/button.h
@@ -54,8 +54,8 @@ public:
     /**Sets the mode of a button.*/
     void setMode(Ideal::ButtonMode mode);
 
-    TQSize sizeHint() const;
-    TQSize sizeHint(const TQString &text) const;
+    TQSize tqsizeHint() const;
+    TQSize tqsizeHint(const TQString &text) const;
 
     /**Updates size of a widget. Used after squeezing button's text.*/
     void updateSize();
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index 2f193ad8..ddd4249b 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "buttonbar.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
@@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci
 {
 }
 
-TQSize ButtonLayout::minimumSize() const
+TQSize ButtonLayout::tqminimumSize() const
 {
-    TQSize size = TQBoxLayout::minimumSize();
+    TQSize size = TQBoxLayout::tqminimumSize();
 
     if (!m_buttonBar->autoResize())
         return size;
@@ -54,7 +54,7 @@ TQSize ButtonLayout::minimumSize() const
         case Ideal::Bottom:
             return TQSize(0,size.height());
     }
-    return TQBoxLayout::minimumSize();
+    return TQBoxLayout::tqminimumSize();
 }
 
 
@@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
     {
         case Ideal::Left:
         case Ideal::Right:
-            setFixedWidth(sizeHint().width());
-            setMinimumHeight(sizeHint().height());
+            setFixedWidth(tqsizeHint().width());
+            setMinimumHeight(tqsizeHint().height());
             setMaximumHeight(32767);
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            setFixedHeight(sizeHint().height());
-            setMinimumWidth(sizeHint().width());
+            setFixedHeight(tqsizeHint().height());
+            setMinimumWidth(tqsizeHint().width());
             setMaximumWidth(32767);
             break;
     }
@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
     {
         case Ideal::Left:
         case Ideal::Right:
-            preferredDimension = l->TQBoxLayout::minimumSize().height();
+            preferredDimension = l->TQBoxLayout::tqminimumSize().height();
             actualDimension = size().height();
             oldDimension = ev->oldSize().height();
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            preferredDimension = l->TQBoxLayout::minimumSize().width();
+            preferredDimension = l->TQBoxLayout::tqminimumSize().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)->sizeHint((*it)->realText()).width();
+        size += (*it)->tqsizeHint((*it)->realText()).width();
     }
     return size;
 }
diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h
index 9eb18e30..ce4ad23b 100644
--- a/src/newui/buttonbar.h
+++ b/src/newui/buttonbar.h
@@ -25,21 +25,21 @@
 
 #include "comdefs.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 namespace Ideal {
 
 class Button;
 class ButtonBar;
 
-/**@short A layout for a ButtonBar class.
+/**@short A tqlayout for a ButtonBar class.
 
-Overrides minimumSize method to allow shrinking button bar buttons.*/
+Overrides tqminimumSize 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 minimumSize() const;
+    virtual TQSize tqminimumSize() const;
 
 private:
     ButtonBar *m_buttonBar;
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 07d3da2a..9ce444eb 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -20,7 +20,7 @@
 #include "ddockwindow.h"
 
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstyle.h>
 #include <tqwidgetstack.h>
 #include <tqimage.h>
@@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v)
 {
     //write dock width to the config file
     KConfig *config = kapp->config();
-    TQString group = TQString("%1").arg(m_name);
+    TQString group = TQString("%1").tqarg(m_name);
     config->setGroup(group);
 
     if (m_visible)
@@ -115,13 +115,13 @@ void DDockWindow::setVisible(bool v)
     v ? m_widgetStack->show() : m_widgetStack->hide();
     m_visible = v;
 
-    m_internalLayout->invalidate();
+    m_internalLayout->tqinvalidate();
     if (!m_visible)
     {
         if (m_position == DDockWindow::Bottom)
-            setFixedExtentHeight(m_internalLayout->sizeHint().height());
+            setFixedExtentHeight(m_internalLayout->tqsizeHint().height());
         else
-            setFixedExtentWidth(m_internalLayout->sizeHint().width());
+            setFixedExtentWidth(m_internalLayout->tqsizeHint().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->sizeHint().height());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height());
             setFixedExtentHeight(size);
         }
         else
         {
-            size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().width());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width());
             setFixedExtentWidth(size);
         }
     }
@@ -148,7 +148,7 @@ void DDockWindow::loadSettings()
 void DDockWindow::saveSettings()
 {
     KConfig *config = kapp->config();
-    TQString group = TQString("%1").arg(m_name);
+    TQString group = TQString("%1").tqarg(m_name);
     int invisibleWidth = 0;
     config->setGroup(group);
     if (config->hasKey("ViewWidth"))
@@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
         //if the widget was selected last time the dock is deleted
         //we need to show it
         KConfig *config = kapp->config();
-        TQString group = TQString("%1").arg(m_name);
+        TQString group = TQString("%1").tqarg(m_name);
         config->setGroup(group);
         if (config->readEntry("ViewLastWidget") == title)
         {
@@ -338,7 +338,7 @@ bool DDockWindow::isActive()
 {
     if (m_toggledButton)
     {
-        TQWidget *w = tqApp->focusWidget();
+        TQWidget *w = tqApp->tqfocusWidget();
         if (!w)
             return false;
         TQWidget *toolWidget = m_widgets[m_toggledButton];
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 45894178..4c787886 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -184,8 +184,8 @@ DTabWidget *DMainWindow::splitVertical()
 
 void DMainWindow::invalidateActiveTabWidget()
 {
-/*    TQWidget *focused = m_central->focusWidget();
-    kdDebug(9000) << "invalidate: " << focused << endl;
+/*    TQWidget *focused = m_central->tqfocusWidget();
+    kdDebug(9000) << "tqinvalidate: " << focused << endl;
     if (focused == 0)
         return;
     if (!m_widgets.contains(focused))
diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp
index 26fd4a71..8b382fb7 100644
--- a/src/newui/docksplitter.cpp
+++ b/src/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]->minimumSizeHint());
+    m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint());
 
     if (isRowEmpty(row))
     {
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index c3a0c7d1..64b60ee7 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -85,7 +85,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index)
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
     KTabWidget::insertTab(child, label, index);
-    if (index != -1) tabBar()->repaint();
+    if (index != -1) tabBar()->tqrepaint();
 }
 
 void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, 
@@ -94,7 +94,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
     KTabWidget::insertTab(child, iconset, label, index);
-    if (index != -1) tabBar()->repaint();
+    if (index != -1) tabBar()->tqrepaint();
 }
 
 /*void DTabWidget::updateHistory(TQWidget *w)