5 files changed, 19 insertions, 19 deletions

diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp
index 7bf4f477..b5cec59f 100644
--- a/twin-styles/riscos/Button.cpp
+++ b/twin-styles/riscos/Button.cpp
@@ -48,7 +48,7 @@ Button::~Button()
   // Empty.
 }
 
-void Button::tqsetAlignment(Alignment a)
+void Button::setAlignment(Alignment a)
 {
    alignment_ = a;
    tqrepaint();
diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h
index 0c7c66c5..712759c8 100644
--- a/twin-styles/riscos/Button.h
+++ b/twin-styles/riscos/Button.h
@@ -46,7 +46,7 @@ class Button : public TQWidget
              const ButtonState realizeButton = Qt::LeftButton);
       virtual ~Button();
 
-      void tqsetAlignment(Alignment);
+      void setAlignment(Alignment);
 
       Alignment tqalignment() const;
 
diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index 837bec9c..88f3f505 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-styles/riscos/Manager.cpp
@@ -134,9 +134,9 @@ void Manager::resize(const TQSize &s)
    widget()->resize(s);
 }
 
-TQSize Manager::tqminimumSize() const
+TQSize Manager::minimumSize() const
 {
-   return widget()->tqminimumSize();
+   return widget()->minimumSize();
 }
 
 void Manager::activeChange()
@@ -678,7 +678,7 @@ void Manager::createTitle()
 
    for (TQPtrListIterator<Button> it(leftButtonList_); it.current(); ++it)
    {
-      it.current()->tqsetAlignment(Button::Left);
+      it.current()->setAlignment(Button::Left);
       titleLayout_->addWidget(it.current());
    }
 
@@ -689,7 +689,7 @@ void Manager::createTitle()
 
    for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it)
    {
-      it.current()->tqsetAlignment(Button::Right);
+      it.current()->setAlignment(Button::Right);
       titleLayout_->addWidget(it.current());
    }
 }
diff --git a/twin-styles/riscos/Manager.h b/twin-styles/riscos/Manager.h
index 5668a7fc..75810c91 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 tqminimumSize() const;
+      TQSize minimumSize() const;
       void activeChange();
       void captionChange();
       void iconChange();
diff --git a/twin-styles/riscos/Static.cpp b/twin-styles/riscos/Static.cpp
index 7aac6f5a..92d38ff0 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_.tqdrawPixmap(1, 1, temp, 0, 1);
+   painter_.drawPixmap(1, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&aTitleTextRight_);
-   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+   painter_.drawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 
    palette_ = iTitlePal_;
    _drawBorder(temp, 4, titleHeight_ - 2);
 
    painter_.begin(&iTitleTextLeft_);
-   painter_.tqdrawPixmap(1, 1, temp, 0, 1);
+   painter_.drawPixmap(1, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&iTitleTextRight_);
-   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+   painter_.drawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 }
 
@@ -403,22 +403,22 @@ void Static::_drawResizeCentralAreaSides()
    _drawBorder(temp, 4, resizeHeight_ - 3);
 
    painter_.begin(&aResizeMidLeft_);
-   painter_.tqdrawPixmap(0, 1, temp, 0, 1);
+   painter_.drawPixmap(0, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&aResizeMidRight_);
-   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+   painter_.drawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 
    palette_ = iResizePal_;
    _drawBorder(temp, 4, resizeHeight_ - 3);
 
    painter_.begin(&iResizeMidLeft_);
-   painter_.tqdrawPixmap(0, 1, temp, 0, 1);
+   painter_.drawPixmap(0, 1, temp, 0, 1);
    painter_.end();
 
    painter_.begin(&iResizeMidRight_);
-   painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+   painter_.drawPixmap(0, 1, temp, 2, 1);
    painter_.end();
 }
 
@@ -433,7 +433,7 @@ void Static::_drawTitleTextAreaBackground()
    _drawBorder(temp, 70, titleHeight_ - 3);
 
    painter_.begin(&aTitleTextMid_);
-   painter_.tqdrawPixmap(0, 1, temp, 2, 0);
+   painter_.drawPixmap(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_.tqdrawPixmap(0, 1, temp, 2, 0);
+   painter_.drawPixmap(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_.tqdrawPixmap(0, 0, temp, 2, 0);
+   painter_.drawPixmap(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_.tqdrawPixmap(0, 0, temp, 2, 0);
+   painter_.drawPixmap(0, 0, temp, 2, 0);
    if (hicolour_)
       painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, iTexture_);
    painter_.end();