Remove additional unneeded tq method conversions

5 files changed, 16 insertions, 16 deletions

diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp
index b5cec59f..3588c1dd 100644
--- a/twin-styles/riscos/Button.cpp
+++ b/twin-styles/riscos/Button.cpp
@@ -51,16 +51,16 @@ Button::~Button()
 void Button::setAlignment(Alignment a)
 {
    alignment_ = a;
-   tqrepaint();
+   repaint();
 }
 
 void Button::setActive(bool b)
 {
    active_ = b;
-   tqrepaint();
+   repaint();
 }
 
-Button::Alignment Button::tqalignment() const
+Button::Alignment Button::alignment() const
 {
    return alignment_;
 }
@@ -69,7 +69,7 @@ void Button::mousePressEvent(TQMouseEvent *e)
 {
    down_ = true;
    lastButton_ = e->button();
-   tqrepaint();
+   repaint();
 
    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();
-   tqrepaint();
+   repaint();
    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());
       }
    }
-   tqrepaint();
+   repaint();
 }
 
 void Button::paintEvent(TQPaintEvent *)
diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h
index 712759c8..f2efb1aa 100644
--- a/twin-styles/riscos/Button.h
+++ b/twin-styles/riscos/Button.h
@@ -48,7 +48,7 @@ class Button : public TQWidget
 
       void setAlignment(Alignment);
 
-      Alignment tqalignment() const;
+      Alignment alignment() const;
 
    protected slots:
 
diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index 88f3f505..f41fd073 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-styles/riscos/Manager.cpp
@@ -142,14 +142,14 @@ TQSize Manager::minimumSize() const
 void Manager::activeChange()
 {
    updateTitleBuffer();
-   widget()->tqrepaint();
+   widget()->repaint();
    emit(activeChanged(isActive()));
 }
 
 void Manager::captionChange()
 {
    updateTitleBuffer();
-   widget()->tqrepaint();
+   widget()->repaint();
 }
 
 void Manager::iconChange()
@@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e)
 
    // Title bar.
 
-   TQRect tr = titleSpacer_->tqgeometry();
+   TQRect tr = titleSpacer_->geometry();
    bitBlt(widget(), tr.topLeft(), &titleBuf_);
 
    // Resize bar.
@@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*)
 {
    updateButtonVisibility();
    updateTitleBuffer();
-   widget()->tqrepaint();
+   widget()->repaint();
 }
 
 void Manager::updateButtonVisibility()
@@ -292,7 +292,7 @@ void Manager::updateTitleBuffer()
 
    Static * s = Static::instance();
 
-   TQRect tr = titleSpacer_->tqgeometry();
+   TQRect tr = titleSpacer_->geometry();
 
    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_->tqgeometry().contains(e->pos()))
+   if (e->button() == Qt::LeftButton && titleSpacer_->geometry().contains(e->pos()))
       titlebarDblClickOperation();
 }
 
 void Manager::wheelEvent(TQWheelEvent *e)
 {
-    if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) )
+    if (isSetShade() || titleLayout_->geometry().contains(e->pos()) )
         titlebarMouseWheelOperation( e->delta());
 }
 
diff --git a/twin-styles/riscos/MaximiseButton.cpp b/twin-styles/riscos/MaximiseButton.cpp
index dcc1b52a..e7f55db7 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));
-   tqrepaint();
+   repaint();
    TQToolTip::remove(this);
    TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize"));
 }
diff --git a/twin-styles/riscos/StickyButton.cpp b/twin-styles/riscos/StickyButton.cpp
index 2229f915..b40db535 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));
-   tqrepaint();
+   repaint();
    TQToolTip::remove(this);
    TQToolTip::add(this, on_ ? i18n("Not on all desktops")
                            : i18n("On all desktops"));