summaryrefslogtreecommitdiffstats
path: root/kolourpaint
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint')
-rw-r--r--kolourpaint/kpselection.cpp2
-rw-r--r--kolourpaint/patches/doc_resize_no_flicker.diff4
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritycube.cpp4
-rw-r--r--kolourpaint/widgets/kptoolwidgetbase.cpp2
-rw-r--r--kolourpaint/widgets/kptoolwidgetspraycansize.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index 2728f3cb..8c0459bb 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -784,7 +784,7 @@ TQPixmap kpSelection::transparentForegroundTextPixmap () const
// we can identify the transparent pixels for manually creating
// the mask.
pixmapPainter.setPen (
- TQColor (mostContrastingRGB (m_textStyle.effectiveBackgroundColor ().toTQRgb () & TQRGB_MASK)));
+ TQColor (mostContrastingRGB (m_textStyle.effectiveBackgroundColor ().toTQRgb () & TQT_RGB_MASK)));
pixmapPainter.setFont (font);
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 2254286f..22565194 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -353,8 +353,8 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+ }
+#endif
+
- updateResizeLines (QMAX (1, TQMAX (m_view->width () + viewDX, m_view->zoomDocToViewX (1))),
- QMAX (1, TQMAX (m_view->height () + viewDY, m_view->zoomDocToViewY (1))),
+ updateResizeLines (TQMAX (1, TQMAX (m_view->width () + viewDX, m_view->zoomDocToViewX (1))),
+ TQMAX (1, TQMAX (m_view->height () + viewDY, m_view->zoomDocToViewY (1))),
viewDX, viewDY);
emit continuedDocResize (newDocSize ());
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
index 60299475..8dcf7398 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -256,8 +256,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p,
<< " colorCubeDiagDist=" << kpColorSimilarityCube::colorCubeDiagonalDistance
<< endl
<< "\tbaseBrightness=" << baseBrightness
- << " color[0]=" << ((colors [0].rgb () & TQRGB_MASK) >> ((2 - redOrGreenOrBlue) * 8))
- << " color[1]=" << ((colors [1].rgb () & TQRGB_MASK) >> ((2 - redOrGreenOrBlue) * 8))
+ << " color[0]=" << ((colors [0].rgb () & TQT_RGB_MASK) >> ((2 - redOrGreenOrBlue) * 8))
+ << " color[1]=" << ((colors [1].rgb () & TQT_RGB_MASK) >> ((2 - redOrGreenOrBlue) * 8))
<< endl;
#endif
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index bb74cafc..25761856 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -188,7 +188,7 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const
<< endl;
#endif
- return tqMakePair (row, col);
+ return qMakePair (row, col);
}
// public
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
index d435c72b..d14942e4 100644
--- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
+++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
@@ -79,7 +79,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char
{
for (int x = 0; x < image.width (); x++)
{
- if ((image.pixel (x, y) & TQRGB_MASK) == 0/*black*/)
+ if ((image.pixel (x, y) & TQT_RGB_MASK) == 0/*black*/)
painter.drawPoint (x, y); // mark as opaque
}
}