Replace Qt with TQt

Signed-off-by: Michele Calgaro <[email protected]>

15 files changed, 87 insertions, 87 deletions

diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index fea1cf58..ff6a3271 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -942,7 +942,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e)
     // state of all the buttons - not just the one that triggered the event (button())
     TQt::ButtonState buttonState = e->stateAfter ();
 
-    if (m_mainWindow && e->button () == Qt::MidButton)
+    if (m_mainWindow && e->button () == TQt::MidButton)
     {
         const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection);
     #if DEBUG_KP_TOOL && 1
@@ -1133,7 +1133,7 @@ void kpTool::mouseReleaseEvent (TQMouseEvent *e)
         endDrawInternal (m_currentPoint, TQRect (m_startPoint, m_currentPoint).normalize ());
     }
 
-    if ((e->stateAfter () & Qt::MouseButtonMask) == 0)
+    if ((e->stateAfter () & TQt::MouseButtonMask) == 0)
     {
         releasedAllButtons ();
     }
@@ -1239,7 +1239,7 @@ void kpTool::keyPressEvent (TQKeyEvent *e)
             // TODO: what about the modifiers
             TQMouseEvent me (TQEvent::MouseButtonPress,
                             view->mapFromGlobal (TQCursor::pos ()),
-                            Qt::LeftButton,
+                            TQt::LeftButton,
                             0);
             mousePressEvent (&me);
             e->accept ();
@@ -1336,8 +1336,8 @@ void kpTool::keyReleaseEvent (TQKeyEvent *e)
         {
             TQMouseEvent me (TQEvent::MouseButtonRelease,
                             view->mapFromGlobal (TQCursor::pos ()),
-                            Qt::LeftButton,
-                            Qt::LeftButton);
+                            TQt::LeftButton,
+                            TQt::LeftButton);
             mouseReleaseEvent (&me);
             e->accept ();
         }
@@ -1469,17 +1469,17 @@ void kpTool::leaveEvent (TQEvent *)
 int kpTool::mouseButton (const TQt::ButtonState &buttonState)
 {
     // we have nothing to do with mid-buttons
-    if (buttonState & Qt::MidButton)
+    if (buttonState & TQt::MidButton)
         return -1;
 
     // both left & right together is quite meaningless...
-    TQt::ButtonState bothButtons = (TQt::ButtonState) (Qt::LeftButton | Qt::RightButton);
+    TQt::ButtonState bothButtons = (TQt::ButtonState) (TQt::LeftButton | TQt::RightButton);
     if ((buttonState & bothButtons) == bothButtons)
         return -1;
 
-    if (buttonState & Qt::LeftButton)
+    if (buttonState & TQt::LeftButton)
         return 0;
-    else if (buttonState & Qt::RightButton)
+    else if (buttonState & TQt::RightButton)
         return 1;
     else
         return -1;
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index 8c979816..da3097e1 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -1343,7 +1343,7 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
         destPixmapPainter.setRasterOp (TQt::XorROP);
         destPixmapPainter.setPen (TQPen (TQt::white, 1, TQt::DotLine));
 
-        destPixmapPainter.setBackgroundMode (Qt::OpaqueMode);
+        destPixmapPainter.setBackgroundMode (TQt::OpaqueMode);
         destPixmapPainter.setBackgroundColor (TQt::blue);
 
         TQBitmap maskBitmap;
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index 50d6ec9c..65b0da89 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -234,7 +234,7 @@ void kpGrip::keyReleaseEvent (TQKeyEvent *e)
 void kpGrip::mousePressEvent (TQMouseEvent *e)
 {
     if (m_startPoint == KP_INVALID_POINT &&
-        (e->stateAfter () & Qt::MouseButtonMask) == Qt::LeftButton)
+        (e->stateAfter () & TQt::MouseButtonMask) == TQt::LeftButton)
     {
         m_startPoint = e->pos ();
         m_currentPoint = e->pos ();
@@ -290,7 +290,7 @@ void kpGrip::mouseMoveEvent (TQMouseEvent *e)
 
     if (m_startPoint == KP_INVALID_POINT)
     {
-        if ((e->stateAfter () & Qt::MouseButtonMask) == 0)
+        if ((e->stateAfter () & TQt::MouseButtonMask) == 0)
             setUserMessage (haventBegunDrawUserMessage ());
         return;
     }
@@ -320,7 +320,7 @@ void kpGrip::mouseReleaseEvent (TQMouseEvent *e)
                         (m_type & Bottom) ? dy : 0);
     }
 
-    if ((e->stateAfter () & Qt::MouseButtonMask) == 0)
+    if ((e->stateAfter () & TQt::MouseButtonMask) == 0)
     {
         m_shouldReleaseMouseButtons = false;
         setUserMessage (TQString());
diff --git a/kolourpaint/patches/checkerboard-faster-render.diff b/kolourpaint/patches/checkerboard-faster-render.diff
index ed75fb0a..824106ca 100644
--- a/kolourpaint/patches/checkerboard-faster-render.diff
+++ b/kolourpaint/patches/checkerboard-faster-render.diff
@@ -44,7 +44,7 @@ QPainter::fillRect().  QPainter::drawPixmap() seems much faster.  For
 +                    col = TQColor (224, 224, 224);
 +            }
 +            else
-+                col = Qt::white;
++                col = TQt::white;
 +
 +            painter.fillRect (x * cellSize, y * cellSize,
 +                              cellSize, cellSize,
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index ce3a74bd..2254286f 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -144,7 +144,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
 +
 +    if (!redrawWidgetRegion.isEmpty ())
      {
-         // TODO: should be "!widget->testWFlags (Qt::WRepaintNoErase)"
+         // TODO: should be "!widget->testWFlags (TQt::WRepaintNoErase)"
          //       but for some reason, doesn't work for viewport().
          const bool erase = !dynamic_cast <kpView *> (widget);
 -        widget->repaint (redrawWidgetRect, erase);
@@ -202,25 +202,25 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
 +
  
      QPainter p (viewport (), true/*unclipped*/);
-     p.setRasterOp (Qt::NotROP);
+     p.setRasterOp (TQt::NotROP);
  
 -    const QRect rightRect = rightResizeLineRect ();
 -    if (rightRect.isValid ())
--        p.fillRect (mapViewToViewport (rightRect), Qt::white);
+-        p.fillRect (mapViewToViewport (rightRect), TQt::white);
 -
 -    const QRect bottomRect = bottomResizeLineRect ();
 -    if (bottomRect.isValid ())
--        p.fillRect (mapViewToViewport (bottomRect), Qt::white);
+-        p.fillRect (mapViewToViewport (bottomRect), TQt::white);
 -
 -    const QRect bottomRightRect = bottomRightResizeLineRect ();
 -    if (bottomRightRect.isValid ())
--        p.fillRect (mapViewToViewport (bottomRightRect), Qt::white);
+-        p.fillRect (mapViewToViewport (bottomRightRect), TQt::white);
 +    const QMemArray <QRect> rects = mapViewToViewport (viewRegion).rects ();
 +    for (QMemArray <QRect>::ConstIterator it = rects.begin ();
 +         it != rects.end ();
 +         it++)
 +    {
-+        p.fillRect (*it, Qt::white);
++        p.fillRect (*it, TQt::white);
 +    }
  
      p.end ();
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 910e78ac..b6fbd6bb 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -154,10 +154,10 @@ TQImage convertImageDepth (const TQImage &image, int depth, bool dither)
 
 
     TQImage retImage = image.convertDepth (depth,
-        Qt::AutoColor |
-        (dither ? Qt::DiffuseDither : Qt::ThresholdDither) |
-        Qt::ThresholdAlphaDither |
-        (dither ? Qt::PreferDither : Qt::AvoidDither));
+        TQt::AutoColor |
+        (dither ? TQt::DiffuseDither : TQt::ThresholdDither) |
+        TQt::ThresholdAlphaDither |
+        (dither ? TQt::PreferDither : TQt::AvoidDither));
 
 #if DEBUG_KP_EFFECT_REDUCE_COLORS && 0
     kdDebug () << "After colour reduction:" << endl;
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index 00a70b02..f71ff6f8 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -79,23 +79,23 @@ static const char *pointArrayToString (const TQPointArray &pointArray)
 #endif
 
 
-static TQPen makeMaskPen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle)
+static TQPen makeMaskPen (const kpColor &color, int lineWidth, TQt::PenStyle lineStyle)
 {
     return TQPen (color.maskColor (),
                  lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle,
-                 Qt::RoundCap, Qt::RoundJoin);
+                 TQt::RoundCap, TQt::RoundJoin);
 }
 
-static TQPen makePen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle)
+static TQPen makePen (const kpColor &color, int lineWidth, TQt::PenStyle lineStyle)
 {
     if (color.isOpaque ())
     {
         return TQPen (color.toTQColor (),
                      lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle,
-                     Qt::RoundCap, Qt::RoundJoin);
+                     TQt::RoundCap, TQt::RoundJoin);
     }
     else
-        return Qt::NoPen;
+        return TQt::NoPen;
 }
 
 static TQBrush makeMaskBrush (const kpColor &foregroundColor,
@@ -105,7 +105,7 @@ static TQBrush makeMaskBrush (const kpColor &foregroundColor,
     if (toolWidgetFillStyle)
         return toolWidgetFillStyle->maskBrush (foregroundColor, backgroundColor);
     else
-        return Qt::NoBrush;
+        return TQt::NoBrush;
 }
 
 static TQBrush makeBrush (const kpColor &foregroundColor,
@@ -115,7 +115,7 @@ static TQBrush makeBrush (const kpColor &foregroundColor,
     if (toolWidgetFillStyle)
         return toolWidgetFillStyle->brush (foregroundColor, backgroundColor);
     else
-        return Qt::NoBrush;
+        return TQt::NoBrush;
 }
 
 static bool only1PixelInPointArray (const TQPointArray &points)
@@ -135,7 +135,7 @@ static bool only1PixelInPointArray (const TQPointArray &points)
 static TQPixmap pixmap (const TQPixmap &oldPixmap,
                        const TQPointArray &points, const TQRect &rect,
                        const kpColor &foregroundColor, kpColor backgroundColor,
-                       int lineWidth, Qt::PenStyle lineStyle,
+                       int lineWidth, TQt::PenStyle lineStyle,
                        kpToolWidgetFillStyle *toolWidgetFillStyle,
                        enum kpToolPolygon::Mode mode, bool final = true)
 {
@@ -652,7 +652,7 @@ void kpToolPolygon::updateShape ()
     TQPixmap newPixmap = pixmap (oldPixmap,
                                 m_points, boundingRect,
                                 color (m_mouseButton), color (1 - m_mouseButton),
-                                m_lineWidth, Qt::SolidLine,
+                                m_lineWidth, TQt::SolidLine,
                                 m_toolWidgetFillStyle,
                                 m_mode, false/*not final*/);
 
@@ -790,7 +790,7 @@ void kpToolPolygon::endShape (const TQPoint &, const TQRect &)
             (text (),
              m_points, boundingRect,
              color (m_mouseButton), color (1 - m_mouseButton),
-             m_lineWidth, Qt::SolidLine,
+             m_lineWidth, TQt::SolidLine,
              m_toolWidgetFillStyle,
              document ()->getPixmapAt (boundingRect),
              m_mode,
@@ -844,7 +844,7 @@ kpToolPolygonCommand::kpToolPolygonCommand (const TQString &name,
                                             const TQPointArray &points,
                                             const TQRect &normalizedRect,
                                             const kpColor &foregroundColor, const kpColor &backgroundColor,
-                                            int lineWidth, Qt::PenStyle lineStyle,
+                                            int lineWidth, TQt::PenStyle lineStyle,
                                             kpToolWidgetFillStyle *toolWidgetFillStyle,
                                             const TQPixmap &originalArea,
                                             enum kpToolPolygon::Mode mode,
diff --git a/kolourpaint/tools/kptoolpolygon.h b/kolourpaint/tools/kptoolpolygon.h
index 1bd922ab..e6178025 100644
--- a/kolourpaint/tools/kptoolpolygon.h
+++ b/kolourpaint/tools/kptoolpolygon.h
@@ -130,7 +130,7 @@ public:
                           const TQPointArray &points,
                           const TQRect &normalizedRect,
                           const kpColor &foregroundColor, const kpColor &backgroundColor,
-                          int lineWidth, Qt::PenStyle lineStyle,
+                          int lineWidth, TQt::PenStyle lineStyle,
                           kpToolWidgetFillStyle *toolWidgetFillStyle,
                           const TQPixmap &originalArea,
                           kpToolPolygon::Mode mode,
@@ -148,7 +148,7 @@ private:
 
     kpColor m_foregroundColor, m_backgroundColor;
     int m_lineWidth;
-    Qt::PenStyle m_lineStyle;
+    TQt::PenStyle m_lineStyle;
     kpToolWidgetFillStyle *m_toolWidgetFillStyle;
 
     TQPixmap m_originalArea;
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index 9e5883ea..90a7352d 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -238,7 +238,7 @@ void kpToolRectangle::updatePen (int mouseButton)
         if (color (mouseButton).isOpaque ())
             m_pen [mouseButton] = TQPen (color (mouseButton).toTQColor ());
         else
-            m_pen [mouseButton] = TQPen(Qt::NoPen);
+            m_pen [mouseButton] = TQPen(TQt::NoPen);
         m_maskPen [mouseButton] = TQPen (maskPenColor);
     }
     else
@@ -250,7 +250,7 @@ void kpToolRectangle::updatePen (int mouseButton)
                                         TQt::SolidLine);
         }
         else
-            m_pen [mouseButton] = TQPen(Qt::NoPen);
+            m_pen [mouseButton] = TQPen(TQt::NoPen);
         m_maskPen [mouseButton] = TQPen (maskPenColor,
                                         m_toolWidgetLineWidth->lineWidth (),
                                         TQt::SolidLine);
@@ -276,8 +276,8 @@ void kpToolRectangle::updateBrush (int mouseButton)
     }
     else
     {
-        m_brush [mouseButton] = TQBrush(Qt::NoBrush);
-        m_maskBrush [mouseButton] = TQBrush(Qt::NoBrush);
+        m_brush [mouseButton] = TQBrush(TQt::NoBrush);
+        m_maskBrush [mouseButton] = TQBrush(TQt::NoBrush);
     }
 }
 
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 6160c166..b60f70ed 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -462,7 +462,7 @@ static bool ownColorsInitialised = false;
 #define rows 2
 #define cols 11
 kpColorCells::kpColorCells (TQWidget *parent,
-                            Qt::Orientation o,
+                            TQt::Orientation o,
                             const char *name)
     : KColorCells (parent, rows, cols),
       m_mouseButton (-1)
@@ -514,16 +514,16 @@ kpColorCells::~kpColorCells ()
 {
 }
 
-Qt::Orientation kpColorCells::orientation () const
+TQt::Orientation kpColorCells::orientation () const
 {
     return m_orientation;
 }
 
-void kpColorCells::setOrientation (Qt::Orientation o)
+void kpColorCells::setOrientation (TQt::Orientation o)
 {
     int c, r;
 
-    if (o == Qt::Horizontal)
+    if (o == TQt::Horizontal)
     {
         c = cols;
         r = rows;
@@ -588,7 +588,7 @@ void kpColorCells::setOrientation (Qt::Orientation o)
         int y, x;
         int pos;
 
-        if (o == Qt::Horizontal)
+        if (o == TQt::Horizontal)
         {
             y = i / cols;
             x = i % cols;
@@ -660,17 +660,17 @@ void kpColorCells::mouseReleaseEvent (TQMouseEvent *e)
     TQt::ButtonState button = e->button ();
 #if DEBUG_KP_COLOR_TOOL_BAR
     kdDebug () << "kpColorCells::mouseReleaseEvent(left="
-               << (button & Qt::LeftButton)
+               << (button & TQt::LeftButton)
                << ",right="
-               << (button & Qt::RightButton)
+               << (button & TQt::RightButton)
                << ")"
                << endl;
 #endif
-    if (!((button & Qt::LeftButton) && (button & Qt::RightButton)))
+    if (!((button & TQt::LeftButton) && (button & TQt::RightButton)))
     {
-        if (button & Qt::LeftButton)
+        if (button & TQt::LeftButton)
             m_mouseButton = 0;
-        else if (button & Qt::RightButton)
+        else if (button & TQt::RightButton)
             m_mouseButton = 1;
     }
 
@@ -785,12 +785,12 @@ void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e)
 {
     if (rect ().contains (e->pos ()))
     {
-        if (e->button () == Qt::LeftButton)
+        if (e->button () == TQt::LeftButton)
         {
             emit transparentColorSelected (0);
             emit foregroundColorChanged (kpColor::transparent);
         }
-        else if (e->button () == Qt::RightButton)
+        else if (e->button () == TQt::RightButton)
         {
             emit transparentColorSelected (1);
             emit backgroundColorChanged (kpColor::transparent);
@@ -819,7 +819,7 @@ void kpTransparentColorCell::drawContents (TQPainter *p)
  */
 
 kpColorPalette::kpColorPalette (TQWidget *parent,
-                                Qt::Orientation o,
+                                TQt::Orientation o,
                                 const char *name)
     : TQWidget (parent, name),
       m_boxLayout (0)
@@ -849,18 +849,18 @@ kpColorPalette::~kpColorPalette ()
 }
 
 // public
-Qt::Orientation kpColorPalette::orientation () const
+TQt::Orientation kpColorPalette::orientation () const
 {
     return m_orientation;
 }
 
-void kpColorPalette::setOrientation (Qt::Orientation o)
+void kpColorPalette::setOrientation (TQt::Orientation o)
 {
     m_colorCells->setOrientation (o);
 
     delete m_boxLayout;
 
-    if (o == Qt::Horizontal)
+    if (o == TQt::Horizontal)
     {
         m_boxLayout = new TQBoxLayout (this, TQBoxLayout::LeftToRight, 0/*margin*/, 5/*spacing*/);
         m_boxLayout->addWidget (m_transparentColorCell, 0/*stretch*/, TQt::AlignVCenter);
@@ -997,7 +997,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
 }
 
 // virtual
-void kpColorToolBar::setOrientation (Qt::Orientation o)
+void kpColorToolBar::setOrientation (TQt::Orientation o)
 {
     // (TQDockWindow::undock() calls us)
     bool isOutsideDock = (place () == TQDockWindow::OutsideDock);
@@ -1014,7 +1014,7 @@ void kpColorToolBar::setOrientation (Qt::Orientation o)
         o = m_lastDockedOrientation;
     }
 
-    if (o == Qt::Horizontal)
+    if (o == TQt::Horizontal)
     {
         m_boxLayout->setDirection (TQBoxLayout::LeftToRight);
     }
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index ef3faf3f..d3bff1e3 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -123,12 +123,12 @@ TQ_OBJECT
 
 public:
     kpColorCells (TQWidget *parent,
-                  Qt::Orientation o = Qt::Horizontal,
+                  TQt::Orientation o = TQt::Horizontal,
                   const char *name = 0);
     virtual ~kpColorCells ();
 
-    Qt::Orientation orientation () const;
-    void setOrientation (Qt::Orientation o);
+    TQt::Orientation orientation () const;
+    void setOrientation (TQt::Orientation o);
 
 signals:
     void foregroundColorChanged (const TQColor &color);
@@ -139,7 +139,7 @@ signals:
     void backgroundColorChanged (const kpColor &color);
 
 protected:
-    Qt::Orientation m_orientation;
+    TQt::Orientation m_orientation;
 
     virtual void dropEvent (TQDropEvent *e);
     virtual void paintCell (TQPainter *painter, int row, int col);
@@ -189,19 +189,19 @@ TQ_OBJECT
 
 public:
     kpColorPalette (TQWidget *parent,
-                    Qt::Orientation o = Qt::Horizontal,
+                    TQt::Orientation o = TQt::Horizontal,
                     const char *name = 0);
     virtual ~kpColorPalette ();
 
-    Qt::Orientation orientation () const;
-    void setOrientation (Qt::Orientation o);
+    TQt::Orientation orientation () const;
+    void setOrientation (TQt::Orientation o);
 
 signals:
     void foregroundColorChanged (const kpColor &color);
     void backgroundColorChanged (const kpColor &color);
 
 protected:
-    Qt::Orientation m_orientation;
+    TQt::Orientation m_orientation;
 
     TQBoxLayout *m_boxLayout;
     kpTransparentColorCell *m_transparentColorCell;
@@ -290,9 +290,9 @@ public slots:
 private:
     kpMainWindow *m_mainWindow;
 
-    Qt::Orientation m_lastDockedOrientation;
+    TQt::Orientation m_lastDockedOrientation;
     bool m_lastDockedOrientationSet;
-    virtual void setOrientation (Qt::Orientation o);
+    virtual void setOrientation (TQt::Orientation o);
 
     TQBoxLayout *m_boxLayout;
     kpDualColorButton *m_dualColorButton;
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index 6e559fa8..dcd79e77 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -72,7 +72,7 @@ protected:
     // virtual [base TQWidget]
     void mouseDoubleClickEvent (TQMouseEvent *e)
     {
-        if (e->button () == Qt::LeftButton && m_tool)
+        if (e->button () == TQt::LeftButton && m_tool)
             m_tool->globalDraw ();
     }
 
@@ -548,11 +548,11 @@ void kpToolToolBar::slotToolActionToolTipChanged ()
 
 
 // public slot virtual [base TQDockWindow]
-void kpToolToolBar::setOrientation (Qt::Orientation o)
+void kpToolToolBar::setOrientation (TQt::Orientation o)
 {
 #if DEBUG_KP_TOOL_TOOL_BAR
     kdDebug () << "kpToolToolBar::setOrientation("
-               << (o == Qt::Vertical ? "vertical" : "horizontal")
+               << (o == TQt::Vertical ? "vertical" : "horizontal")
                << ") called!" << endl;
 #endif
 
@@ -575,7 +575,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
 
     delete m_toolLayout;
     delete m_baseLayout;
-    if (o == Qt::Vertical)
+    if (o == TQt::Vertical)
     {
         m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::TopToBottom,
                                        5/*margin*/,
@@ -586,7 +586,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
                                         0/*margin*/,
                                         0/*spacing*/);
     }
-    else // if (o == Qt::Horizontal)
+    else // if (o == TQt::Horizontal)
     {
         m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::LeftToRight,
                                        5/*margin*/,
@@ -616,7 +616,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
         {
             m_baseLayout->addWidget (*it,
                 0/*stretch*/,
-                o == Qt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter);
+                o == TQt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter);
         }
     }
 
@@ -624,9 +624,9 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
 }
 
 // private
-void kpToolToolBar::addButton (TQButton *button, Qt::Orientation o, int num)
+void kpToolToolBar::addButton (TQButton *button, TQt::Orientation o, int num)
 {
-    if (o == Qt::Vertical)
+    if (o == TQt::Vertical)
         m_toolLayout->addWidget (button, num / m_vertCols, num % m_vertCols);
     else
     {
diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h
index e556d6cb..ae7de140 100644
--- a/kolourpaint/widgets/kptooltoolbar.h
+++ b/kolourpaint/widgets/kptooltoolbar.h
@@ -100,12 +100,12 @@ private slots:
     void slotToolActionToolTipChanged ();
 
 public slots:
-    virtual void setOrientation (Qt::Orientation o);
+    virtual void setOrientation (TQt::Orientation o);
 
 private:
-    void addButton (TQButton *button, Qt::Orientation o, int num);
+    void addButton (TQButton *button, TQt::Orientation o, int num);
 
-    Qt::Orientation m_lastDockedOrientation;
+    TQt::Orientation m_lastDockedOrientation;
     bool m_lastDockedOrientationSet;
     int m_vertCols;
 
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index e70be6db..bb74cafc 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -541,7 +541,7 @@ void kpToolWidgetBase::mousePressEvent (TQMouseEvent *e)
 {
     e->ignore ();
 
-    if (e->button () != Qt::LeftButton)
+    if (e->button () != TQt::LeftButton)
         return;
 
 
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index d13ae932..9cd5c42d 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -149,7 +149,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
     switch (fs)
     {
     case NoFill:
-        return Qt::NoBrush;
+        return TQt::NoBrush;
         break;
     case FillWithBackground:
         return TQBrush (backgroundColor.maskColor ());
@@ -158,7 +158,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
         return TQBrush (foregroundColor.maskColor ());
         break;
     default:
-        return Qt::NoBrush;
+        return TQt::NoBrush;
         break;
     }
 }
@@ -182,22 +182,22 @@ TQBrush kpToolWidgetFillStyle::brushForFillStyle (FillStyle fs,
     switch (fs)
     {
     case NoFill:
-        return Qt::NoBrush;
+        return TQt::NoBrush;
         break;
     case FillWithBackground:
         if (backgroundColor.isOpaque ())
             return TQBrush (backgroundColor.toTQColor ());
         else
-            return Qt::NoBrush;
+            return TQt::NoBrush;
         break;
     case FillWithForeground:
         if (foregroundColor.isOpaque ())
             return TQBrush (foregroundColor.toTQColor ());
         else
-            return Qt::NoBrush;
+            return TQt::NoBrush;
         break;
     default:
-        return Qt::NoBrush;
+        return TQt::NoBrush;
         break;
     }
 }