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

This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.

7 files changed, 37 insertions, 37 deletions

diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp
index 3588c1dd..7bf4f477 100644
--- a/twin-styles/riscos/Button.cpp
+++ b/twin-styles/riscos/Button.cpp
@@ -48,19 +48,19 @@ Button::~Button()
   // Empty.
 }
 
-void Button::setAlignment(Alignment a)
+void Button::tqsetAlignment(Alignment a)
 {
    alignment_ = a;
-   repaint();
+   tqrepaint();
 }
 
 void Button::setActive(bool b)
 {
    active_ = b;
-   repaint();
+   tqrepaint();
 }
 
-Button::Alignment Button::alignment() const
+Button::Alignment Button::tqalignment() const
 {
    return alignment_;
 }
@@ -69,7 +69,7 @@ void Button::mousePressEvent(TQMouseEvent *e)
 {
    down_ = true;
    lastButton_ = e->button();
-   repaint();
+   tqrepaint();
 
    TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
                   (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton,
@@ -81,7 +81,7 @@ void Button::mouseReleaseEvent(TQMouseEvent *e)
 {
    down_ = false;
    lastButton_ = e->button();
-   repaint();
+   tqrepaint();
    TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
                   (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton,
                   e->state());
@@ -133,7 +133,7 @@ void Button::setPixmap(const TQPixmap &p)
          iPixmap_.setMask(*p.mask());
       }
    }
-   repaint();
+   tqrepaint();
 }
 
 void Button::paintEvent(TQPaintEvent *)
diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h
index f2efb1aa..0c7c66c5 100644
--- a/twin-styles/riscos/Button.h
+++ b/twin-styles/riscos/Button.h
@@ -46,9 +46,9 @@ class Button : public TQWidget
              const ButtonState realizeButton = Qt::LeftButton);
       virtual ~Button();
 
-      void setAlignment(Alignment);
+      void tqsetAlignment(Alignment);
 
-      Alignment alignment() const;
+      Alignment tqalignment() const;
 
    protected slots:
 
diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index 2ad3b6c9..837bec9c 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-styles/riscos/Manager.cpp
@@ -27,7 +27,7 @@
 #include <tqapplication.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 
 #include <netwm.h>
@@ -134,22 +134,22 @@ void Manager::resize(const TQSize &s)
    widget()->resize(s);
 }
 
-TQSize Manager::minimumSize() const
+TQSize Manager::tqminimumSize() const
 {
-   return widget()->minimumSize();
+   return widget()->tqminimumSize();
 }
 
 void Manager::activeChange()
 {
    updateTitleBuffer();
-   widget()->repaint();
+   widget()->tqrepaint();
    emit(activeChanged(isActive()));
 }
 
 void Manager::captionChange()
 {
    updateTitleBuffer();
-   widget()->repaint();
+   widget()->tqrepaint();
 }
 
 void Manager::iconChange()
@@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e)
 
    // Title bar.
 
-   TQRect tr = titleSpacer_->geometry();
+   TQRect tr = titleSpacer_->tqgeometry();
    bitBlt(widget(), tr.topLeft(), &titleBuf_);
 
    // Resize bar.
@@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*)
 {
    updateButtonVisibility();
    updateTitleBuffer();
-   widget()->repaint();
+   widget()->tqrepaint();
 }
 
 void Manager::updateButtonVisibility()
@@ -282,7 +282,7 @@ void Manager::updateButtonVisibility()
          break;
    }
 
-   layout()->activate();
+   tqlayout()->activate();
 #endif
 }
 
@@ -292,7 +292,7 @@ void Manager::updateTitleBuffer()
 
    Static * s = Static::instance();
 
-   TQRect tr = titleSpacer_->geometry();
+   TQRect tr = titleSpacer_->tqgeometry();
 
    if (tr.width() == 0 || tr.height() == 0)
       titleBuf_.resize(8, 8);
@@ -352,13 +352,13 @@ KDecoration::Position Manager::mousePosition(const TQPoint& p) const
 
 void Manager::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-   if (e->button() == Qt::LeftButton && titleSpacer_->geometry().contains(e->pos()))
+   if (e->button() == Qt::LeftButton && titleSpacer_->tqgeometry().contains(e->pos()))
       titlebarDblClickOperation();
 }
 
 void Manager::wheelEvent(TQWheelEvent *e)
 {
-    if (isSetShade() || titleLayout_->geometry().contains(e->pos()) )
+    if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) )
         titlebarMouseWheelOperation( e->delta());
 }
 
@@ -678,7 +678,7 @@ void Manager::createTitle()
 
    for (TQPtrListIterator<Button> it(leftButtonList_); it.current(); ++it)
    {
-      it.current()->setAlignment(Button::Left);
+      it.current()->tqsetAlignment(Button::Left);
       titleLayout_->addWidget(it.current());
    }
 
@@ -689,7 +689,7 @@ void Manager::createTitle()
 
    for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it)
    {
-      it.current()->setAlignment(Button::Right);
+      it.current()->tqsetAlignment(Button::Right);
       titleLayout_->addWidget(it.current());
    }
 }
diff --git a/twin-styles/riscos/Manager.h b/twin-styles/riscos/Manager.h
index 75810c91..5668a7fc 100644
--- a/twin-styles/riscos/Manager.h
+++ b/twin-styles/riscos/Manager.h
@@ -56,7 +56,7 @@ class Manager : public KDecoration
       void reset(unsigned long changed);
       void borders(int&, int&, int&, int&) const;
       void resize(const TQSize&);
-      TQSize minimumSize() const;
+      TQSize tqminimumSize() const;
       void activeChange();
       void captionChange();
       void iconChange();
diff --git a/twin-styles/riscos/MaximiseButton.cpp b/twin-styles/riscos/MaximiseButton.cpp
index e7f55db7..dcc1b52a 100644
--- a/twin-styles/riscos/MaximiseButton.cpp
+++ b/twin-styles/riscos/MaximiseButton.cpp
@@ -78,7 +78,7 @@ void MaximiseButton::setOn(bool on)
    on_ = on;
    setPixmap(on_ ? TQPixmap((const char **)unmaximise_xpm)
                  : TQPixmap((const char **)maximise_xpm));
-   repaint();
+   tqrepaint();
    TQToolTip::remove(this);
    TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize"));
 }
diff --git a/twin-styles/riscos/Static.cpp b/twin-styles/riscos/Static.cpp
index 92d38ff0..7aac6f5a 100644
--- a/twin-styles/riscos/Static.cpp
+++ b/twin-styles/riscos/Static.cpp
@@ -372,22 +372,22 @@ void Static::_drawTitleTextAreaSides()
    _drawBorder(temp, 4, titleHeight_ - 2);
 
    painter_.begin(&aTitleTextLeft_);
-   painter_.drawPixmap(1, 1, temp, 0, 1);
+   painter_.tqdrawPixmap(1, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&aTitleTextRight_);
-   painter_.drawPixmap(0, 1, temp, 2, 1);
+   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 
    palette_ = iTitlePal_;
    _drawBorder(temp, 4, titleHeight_ - 2);
 
    painter_.begin(&iTitleTextLeft_);
-   painter_.drawPixmap(1, 1, temp, 0, 1);
+   painter_.tqdrawPixmap(1, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&iTitleTextRight_);
-   painter_.drawPixmap(0, 1, temp, 2, 1);
+   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 }
 
@@ -403,22 +403,22 @@ void Static::_drawResizeCentralAreaSides()
    _drawBorder(temp, 4, resizeHeight_ - 3);
 
    painter_.begin(&aResizeMidLeft_);
-   painter_.drawPixmap(0, 1, temp, 0, 1);
+   painter_.tqdrawPixmap(0, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&aResizeMidRight_);
-   painter_.drawPixmap(0, 1, temp, 2, 1);
+   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 
    palette_ = iResizePal_;
    _drawBorder(temp, 4, resizeHeight_ - 3);
 
    painter_.begin(&iResizeMidLeft_);
-   painter_.drawPixmap(0, 1, temp, 0, 1);
+   painter_.tqdrawPixmap(0, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&iResizeMidRight_);
-   painter_.drawPixmap(0, 1, temp, 2, 1);
+   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 }
 
@@ -433,7 +433,7 @@ void Static::_drawTitleTextAreaBackground()
    _drawBorder(temp, 70, titleHeight_ - 3);
 
    painter_.begin(&aTitleTextMid_);
-   painter_.drawPixmap(0, 1, temp, 2, 0);
+   painter_.tqdrawPixmap(0, 1, temp, 2, 0);
    if (hicolour_)
       painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, aTexture_);
    painter_.end();
@@ -442,7 +442,7 @@ void Static::_drawTitleTextAreaBackground()
    _drawBorder(temp, 70, titleHeight_ - 3);
 
    painter_.begin(&iTitleTextMid_);
-   painter_.drawPixmap(0, 1, temp, 2, 0);
+   painter_.tqdrawPixmap(0, 1, temp, 2, 0);
    if (hicolour_)
       painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, iTexture_);
    painter_.end();
@@ -459,7 +459,7 @@ void Static::_drawResizeCentralAreaBackground()
    _drawBorder(temp, 70, resizeHeight_ - 3);
 
    painter_.begin(&aResizeMid_);
-   painter_.drawPixmap(0, 0, temp, 2, 0);
+   painter_.tqdrawPixmap(0, 0, temp, 2, 0);
    if (hicolour_)
       painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, aTexture_);
    painter_.end();
@@ -468,7 +468,7 @@ void Static::_drawResizeCentralAreaBackground()
    _drawBorder(temp, 70, 7);
 
    painter_.begin(&iResizeMid_);
-   painter_.drawPixmap(0, 0, temp, 2, 0);
+   painter_.tqdrawPixmap(0, 0, temp, 2, 0);
    if (hicolour_)
       painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, iTexture_);
    painter_.end();
diff --git a/twin-styles/riscos/StickyButton.cpp b/twin-styles/riscos/StickyButton.cpp
index b40db535..2229f915 100644
--- a/twin-styles/riscos/StickyButton.cpp
+++ b/twin-styles/riscos/StickyButton.cpp
@@ -77,7 +77,7 @@ void StickyButton::setOn(bool on)
    on_ = on;
    setPixmap(on_ ? TQPixmap((const char **)unsticky_xpm) :
                    TQPixmap((const char **)sticky_xpm));
-   repaint();
+   tqrepaint();
    TQToolTip::remove(this);
    TQToolTip::add(this, on_ ? i18n("Not on all desktops")
                            : i18n("On all desktops"));