TQt4 port kdeartwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1246991 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

17 files changed, 108 insertions, 98 deletions

diff --git a/kwin-styles/riscos/AboveButton.h b/kwin-styles/riscos/AboveButton.h
index 9ea0e005..86fbb0a7 100644
--- a/kwin-styles/riscos/AboveButton.h
+++ b/kwin-styles/riscos/AboveButton.h
@@ -31,6 +31,7 @@ namespace RiscOS
 class AboveButton : public Button
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
diff --git a/kwin-styles/riscos/Button.cpp b/kwin-styles/riscos/Button.cpp
index d126ced1..7bf4f477 100644
--- a/kwin-styles/riscos/Button.cpp
+++ b/kwin-styles/riscos/Button.cpp
@@ -31,13 +31,13 @@ Button::Button(TQWidget *parent, const TQString& tip,
                const ButtonState realizeButtons)
   : TQWidget(parent, "Button", 0),
     realizeButtons_(realizeButtons),
-    lastButton_(NoButton),
+    lastButton_(Qt::NoButton),
     alignment_(Left),
     down_     (false),
     active_   (false)
 {
    TQToolTip::add(this, tip);
-   setBackgroundColor(Qt::black);
+   setBackgroundColor(TQt::black);
 
    setFixedSize(Static::instance()->titleHeight() - 1,
                 Static::instance()->titleHeight());
@@ -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,10 +69,10 @@ void Button::mousePressEvent(TQMouseEvent *e)
 {
    down_ = true;
    lastButton_ = e->button();
-   repaint();
+   tqrepaint();
 
    TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
-                  (e->button()&realizeButtons_) ? LeftButton : NoButton,
+                  (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton,
                   e->state());
    TQWidget::mousePressEvent(&me);
 }
@@ -81,9 +81,9 @@ void Button::mouseReleaseEvent(TQMouseEvent *e)
 {
    down_ = false;
    lastButton_ = e->button();
-   repaint();
+   tqrepaint();
    TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
-                  (e->button()&realizeButtons_) ? LeftButton : NoButton,
+                  (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton,
                   e->state());
    TQWidget::mouseReleaseEvent(&me);
 }
@@ -94,9 +94,9 @@ void Button::setPixmap(const TQPixmap &p)
       aPixmap_ = iPixmap_ = p;
    else
    {
-      QRgb light;
-      QRgb* data = NULL;
-      QRgb w = qRgb(255, 255, 255);
+      TQRgb light;
+      TQRgb* data = NULL;
+      TQRgb w = tqRgb(255, 255, 255);
 
       TQImage aTx(p.convertToImage());
       TQImage iTx(aTx.copy());
@@ -104,10 +104,10 @@ void Button::setPixmap(const TQPixmap &p)
       const KDecorationOptions* options = KDecoration::options();
       light = options->color(KDecoration::ColorButtonBg, true).light(150).rgb();
 
-      if (light == qRgb(0, 0, 0))
-         light = qRgb(228, 228, 228);
+      if (light == tqRgb(0, 0, 0))
+         light = tqRgb(228, 228, 228);
 
-      data = (QRgb *)aTx.bits();
+      data = (TQRgb *)aTx.bits();
 
       for (int x = 0; x < 144; x++)
          if (data[x] == w)
@@ -115,10 +115,10 @@ void Button::setPixmap(const TQPixmap &p)
 
       light = options->color(KDecoration::ColorButtonBg, false).light(150).rgb();
 
-      if (light == qRgb(0, 0, 0))
-         light = qRgb(228, 228, 228);
+      if (light == tqRgb(0, 0, 0))
+         light = tqRgb(228, 228, 228);
 
-      data = (QRgb *)iTx.bits();
+      data = (TQRgb *)iTx.bits();
 
       for (int x = 0; x < 144; x++)
          if (data[x] == w)
@@ -133,7 +133,7 @@ void Button::setPixmap(const TQPixmap &p)
          iPixmap_.setMask(*p.mask());
       }
    }
-   repaint();
+   tqrepaint();
 }
 
 void Button::paintEvent(TQPaintEvent *)
diff --git a/kwin-styles/riscos/Button.h b/kwin-styles/riscos/Button.h
index fc29e205..0c7c66c5 100644
--- a/kwin-styles/riscos/Button.h
+++ b/kwin-styles/riscos/Button.h
@@ -31,9 +31,10 @@
 namespace RiscOS
 {
 
-class Button : public QWidget
+class Button : public TQWidget
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
@@ -42,12 +43,12 @@ class Button : public QWidget
       enum Alignment { Left, Right };
 
       Button(TQWidget *parent, const TQString &tip,
-             const ButtonState realizeButton = LeftButton);
+             const ButtonState realizeButton = Qt::LeftButton);
       virtual ~Button();
 
-      void setAlignment(Alignment);
+      void tqsetAlignment(Alignment);
 
-      Alignment alignment() const;
+      Alignment tqalignment() const;
 
    protected slots:
 
diff --git a/kwin-styles/riscos/CloseButton.h b/kwin-styles/riscos/CloseButton.h
index b9173c14..615ea2ed 100644
--- a/kwin-styles/riscos/CloseButton.h
+++ b/kwin-styles/riscos/CloseButton.h
@@ -31,6 +31,7 @@ namespace RiscOS
 class CloseButton : public Button
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
diff --git a/kwin-styles/riscos/HelpButton.h b/kwin-styles/riscos/HelpButton.h
index f825a05b..d57b91ce 100644
--- a/kwin-styles/riscos/HelpButton.h
+++ b/kwin-styles/riscos/HelpButton.h
@@ -31,6 +31,7 @@ namespace RiscOS
 class HelpButton : public Button
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
diff --git a/kwin-styles/riscos/IconifyButton.h b/kwin-styles/riscos/IconifyButton.h
index 8f757cb4..54e44aba 100644
--- a/kwin-styles/riscos/IconifyButton.h
+++ b/kwin-styles/riscos/IconifyButton.h
@@ -31,6 +31,7 @@ namespace RiscOS
 class IconifyButton : public Button
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
diff --git a/kwin-styles/riscos/LowerButton.h b/kwin-styles/riscos/LowerButton.h
index f3fc4df1..8616d688 100644
--- a/kwin-styles/riscos/LowerButton.h
+++ b/kwin-styles/riscos/LowerButton.h
@@ -31,6 +31,7 @@ namespace RiscOS
 class LowerButton : public Button
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
diff --git a/kwin-styles/riscos/Makefile.am b/kwin-styles/riscos/Makefile.am
index 2a7d9764..3f81820d 100644
--- a/kwin-styles/riscos/Makefile.am
+++ b/kwin-styles/riscos/Makefile.am
@@ -31,7 +31,7 @@ kwin3_riscos_la_SOURCES = AboveButton.cpp \
                           Static.cpp \
                           StickyButton.cpp
 
-kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
 kwin3_riscos_la_LIBADD = $(LIB_KDEUI) -lkdecorations
 kwin3_riscos_la_METASOURCES = AUTO
 
diff --git a/kwin-styles/riscos/Manager.cpp b/kwin-styles/riscos/Manager.cpp
index c4b77f0a..837bec9c 100644
--- a/kwin-styles/riscos/Manager.cpp
+++ b/kwin-styles/riscos/Manager.cpp
@@ -82,23 +82,23 @@ void Manager::init()
 
 bool Manager::eventFilter(TQObject *o, TQEvent *e)
 {
-   if (o != widget()) return false;
+   if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false;
    switch (e->type())
    {
       case TQEvent::Resize:
-         resizeEvent(static_cast<TQResizeEvent*>(e));
+         resizeEvent(TQT_TQRESIZEEVENT(e));
          return true;
       case TQEvent::Paint:
-         paintEvent(static_cast<TQPaintEvent*>(e));
+         paintEvent(TQT_TQPAINTEVENT(e));
          return true;
       case TQEvent::MouseButtonDblClick:
-         mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
+         mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
          return true;
       case TQEvent::MouseButtonPress:
-         processMousePressEvent(static_cast<TQMouseEvent*>(e));
+         processMousePressEvent(TQT_TQMOUSEEVENT(e));
          return true;
       case TQEvent::Wheel:
-         wheelEvent( static_cast< TQWheelEvent* >( e ));
+         wheelEvent( TQT_TQWHEELEVENT( e ));
          return true;
       case TQEvent::MouseButtonRelease:
          return false;
@@ -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()
@@ -182,7 +182,7 @@ void Manager::paintEvent(TQPaintEvent *e)
 
    if (intersectsLeft || intersectsRight)
    {
-      p.setPen(Qt::black);
+      p.setPen(TQt::black);
 
       if (intersectsLeft)
          p.drawLine(0, r.top(), 0, r.bottom());
@@ -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() == 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());
 }
 
@@ -428,7 +428,7 @@ bool Manager::animateMinimize(bool iconify)
 
          // Go away quick.
          helperShowHide(false);
-         qApp->syncX();
+         tqApp->syncX();
 
          TQRect r = iconGeometry();
 
@@ -463,7 +463,7 @@ bool Manager::animateMinimize(bool iconify)
          double delta  = finalAngle / steps;
 
          TQPainter p(workspaceWidget());
-         p.setRasterOp(Qt::NotROP);
+         p.setRasterOp(TQt::NotROP);
 
          for (double angle = 0; ; angle += delta)
          {
@@ -517,7 +517,7 @@ bool Manager::animateMinimize(bool iconify)
 
          // Go away quick.
          helperShowHide(false);
-         qApp->syncX();
+         tqApp->syncX();
 
          int stepCount = 12;
 
@@ -527,7 +527,7 @@ bool Manager::animateMinimize(bool iconify)
          int dy = r.height() / (stepCount * 2);
 
          TQPainter p(workspaceWidget());
-         p.setRasterOp(Qt::NotROP);
+         p.setRasterOp(TQt::NotROP);
 
          for (int step = 0; step < stepCount; step++)
          {
@@ -559,7 +559,7 @@ bool Manager::animateMinimize(bool iconify)
 
          TQPainter p(workspaceWidget());
 
-         p.setRasterOp(Qt::NotROP);
+         p.setRasterOp(TQt::NotROP);
 #if 0
          if (iconify)
             p.setClipRegion(TQRegion(workspaceWidget()->rect()) - wingeom);
@@ -573,7 +573,7 @@ bool Manager::animateMinimize(bool iconify)
 
          p.flush();
 
-         qApp->syncX();
+         tqApp->syncX();
 
          usleep(30000);
 
@@ -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/kwin-styles/riscos/Manager.h b/kwin-styles/riscos/Manager.h
index be440454..5668a7fc 100644
--- a/kwin-styles/riscos/Manager.h
+++ b/kwin-styles/riscos/Manager.h
@@ -45,6 +45,7 @@ class Button;
 class Manager : public KDecoration
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
@@ -55,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();
@@ -107,6 +108,7 @@ class Manager : public KDecoration
 class Factory : public TQObject, public KDecorationFactory
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
       Factory();
diff --git a/kwin-styles/riscos/MaximiseButton.cpp b/kwin-styles/riscos/MaximiseButton.cpp
index ebfb6628..dcc1b52a 100644
--- a/kwin-styles/riscos/MaximiseButton.cpp
+++ b/kwin-styles/riscos/MaximiseButton.cpp
@@ -67,7 +67,7 @@ static const char * const unmaximise_xpm[] = {
 
 MaximiseButton::MaximiseButton(TQWidget * parent)
   : Button(parent, i18n("Maximize"),
-           (ButtonState)(LeftButton|MidButton|RightButton)),
+           (ButtonState)(Qt::LeftButton|Qt::MidButton|Qt::RightButton)),
     on_(false)
 {
    setPixmap(TQPixmap((const char **)maximise_xpm));
@@ -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/kwin-styles/riscos/MaximiseButton.h b/kwin-styles/riscos/MaximiseButton.h
index ff715ba1..770c9370 100644
--- a/kwin-styles/riscos/MaximiseButton.h
+++ b/kwin-styles/riscos/MaximiseButton.h
@@ -31,6 +31,7 @@ namespace RiscOS
 class MaximiseButton : public Button
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public:
 
diff --git a/kwin-styles/riscos/Palette.h b/kwin-styles/riscos/Palette.h
index 260175b9..3fb71ab0 100644
--- a/kwin-styles/riscos/Palette.h
+++ b/kwin-styles/riscos/Palette.h
@@ -47,19 +47,19 @@ class Palette
          data_[7] = 0xFF000000;
       }
 
-      QRgb& operator [] (int idx)
+      TQRgb& operator [] (int idx)
       {
          return data_[idx];
       }
 
-      QRgb operator [] (int idx) const
+      TQRgb operator [] (int idx) const
       {
          return data_[idx];
       }
 
    private:
 
-      TQMemArray<QRgb> data_;
+      TQMemArray<TQRgb> data_;
 };
 
 } // End namespace
diff --git a/kwin-styles/riscos/Static.cpp b/kwin-styles/riscos/Static.cpp
index 5c6e427d..7aac6f5a 100644
--- a/kwin-styles/riscos/Static.cpp
+++ b/kwin-styles/riscos/Static.cpp
@@ -245,16 +245,16 @@ void Static::updatePixmaps()
 void Static::_createTexture(TQPixmap &px, int t, bool active)
 {
    const TQImage texture(TQPixmap((const char **)texture_xpm).convertToImage());
-   const QRgb w(qRgb(255, 255, 255));
-   const QRgb b(qRgb(0, 0, 0));
+   const TQRgb w(tqRgb(255, 255, 255));
+   const TQRgb b(tqRgb(0, 0, 0));
 
    TQColor c(KDecoration::options()->color(KDecoration::ColorType(t), active));
 
-   QRgb mid    (c.rgb());
-   QRgb light  (c.light(110).rgb());
-   QRgb dark   (c.dark(110).rgb());
+   TQRgb mid    (c.rgb());
+   TQRgb light  (c.light(110).rgb());
+   TQRgb dark   (c.dark(110).rgb());
 
-   QRgb* data(reinterpret_cast<QRgb *>(texture.bits()));
+   TQRgb* data(reinterpret_cast<TQRgb *>(const_cast<TQImage&>(texture).bits()));
 
    for (int x = 0; x < 64*12; x++)
       if (data[x] == w)
@@ -318,24 +318,24 @@ void Static::_resizeAllPixmaps()
 
 void Static::_blankAllPixmaps()
 {
-   aResize_        .fill(Qt::black);
-   iResize_        .fill(Qt::black);
-   aTitleTextLeft_ .fill(Qt::black);
-   aTitleTextRight_.fill(Qt::black);
-   iTitleTextLeft_ .fill(Qt::black);
-   iTitleTextRight_.fill(Qt::black);
-   aTitleTextMid_  .fill(Qt::black);
-   iTitleTextMid_  .fill(Qt::black);
-   aResizeMidLeft_ .fill(Qt::black);
-   aResizeMidRight_.fill(Qt::black);
-   iResizeMidLeft_ .fill(Qt::black);
-   iResizeMidRight_.fill(Qt::black);
-   aResizeMid_     .fill(Qt::black);
-   iResizeMid_     .fill(Qt::black);
-   aButtonUp_      .fill(Qt::black);
-   iButtonUp_      .fill(Qt::black);
-   aButtonDown_    .fill(Qt::black);
-   iButtonDown_    .fill(Qt::black);
+   aResize_        .fill(TQt::black);
+   iResize_        .fill(TQt::black);
+   aTitleTextLeft_ .fill(TQt::black);
+   aTitleTextRight_.fill(TQt::black);
+   iTitleTextLeft_ .fill(TQt::black);
+   iTitleTextRight_.fill(TQt::black);
+   aTitleTextMid_  .fill(TQt::black);
+   iTitleTextMid_  .fill(TQt::black);
+   aResizeMidLeft_ .fill(TQt::black);
+   aResizeMidRight_.fill(TQt::black);
+   iResizeMidLeft_ .fill(TQt::black);
+   iResizeMidRight_.fill(TQt::black);
+   aResizeMid_     .fill(TQt::black);
+   iResizeMid_     .fill(TQt::black);
+   aButtonUp_      .fill(TQt::black);
+   iButtonUp_      .fill(TQt::black);
+   aButtonDown_    .fill(TQt::black);
+   iButtonDown_    .fill(TQt::black);
 }
 
 void Static::_initPalettes()
@@ -362,7 +362,7 @@ void Static::_initTextures()
 void Static::_drawTitleTextAreaSides()
 {
    TQPixmap temp(4, titleHeight_);
-   temp.fill(Qt::black);
+   temp.fill(TQt::black);
 
    transx = transy = 0.0;
 
@@ -372,29 +372,29 @@ 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();
 }
 
 void Static::_drawResizeCentralAreaSides()
 {
    TQPixmap temp(4, resizeHeight_);
-   temp.fill(Qt::black);
+   temp.fill(TQt::black);
 
    transy = 1.0;
 
@@ -403,29 +403,29 @@ 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();
 }
 
 void Static::_drawTitleTextAreaBackground()
 {
    TQPixmap temp(70, titleHeight_);
-   temp.fill(Qt::black);
+   temp.fill(TQt::black);
 
    transx = transy = 0.0;
 
@@ -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();
@@ -451,7 +451,7 @@ void Static::_drawTitleTextAreaBackground()
 void Static::_drawResizeCentralAreaBackground()
 {
    TQPixmap temp(70, titleHeight_);
-   temp.fill(Qt::black);
+   temp.fill(TQt::black);
 
    transy = 1.0;
 
@@ -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/kwin-styles/riscos/Static.h b/kwin-styles/riscos/Static.h
index e7b49d59..0a5b4cdb 100644
--- a/kwin-styles/riscos/Static.h
+++ b/kwin-styles/riscos/Static.h
@@ -99,7 +99,7 @@ class Static
          aButPal_,
          iButPal_;
 
-      QPixmap
+      TQPixmap
          aButtonUp_,         iButtonUp_,
          aButtonDown_,       iButtonDown_,
          aResize_,           iResize_,
diff --git a/kwin-styles/riscos/StickyButton.cpp b/kwin-styles/riscos/StickyButton.cpp
index b40db535..2229f915 100644
--- a/kwin-styles/riscos/StickyButton.cpp
+++ b/kwin-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"));
diff --git a/kwin-styles/riscos/StickyButton.h b/kwin-styles/riscos/StickyButton.h
index 4c500b8b..26c0428e 100644
--- a/kwin-styles/riscos/StickyButton.h
+++ b/kwin-styles/riscos/StickyButton.h
@@ -31,6 +31,7 @@ namespace RiscOS
 class StickyButton : public Button
 {
    Q_OBJECT
+  TQ_OBJECT
 
    public: