From 57ade68197b2c160aff51b75be3cbc17f682547c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:55:50 +0900 Subject: Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro (cherry picked from commit 60716f5af0920804783f44ca88664dcd403e4041) --- kolourpaint/kpselection.cpp | 2 +- kolourpaint/patches/doc_resize_no_flicker.diff | 4 ++-- kolourpaint/widgets/kpcolorsimilaritycube.cpp | 4 ++-- kolourpaint/widgets/kptoolwidgetbase.cpp | 2 +- kolourpaint/widgets/kptoolwidgetspraycansize.cpp | 2 +- kpovmodeler/pmdockwidget.cpp | 2 +- ksnapshot/ksnapshot.h | 4 ++-- ksnapshot/regiongrabber.cpp | 2 +- 8 files changed, 11 insertions(+), 11 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 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 } } diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 7de15eb1..0b9d75a9 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index 42620608..b84e8c18 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -45,14 +45,14 @@ class KSnapshotPreview : public TQLabel { TQPainter p(&mask); - style().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); + style().drawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); p.end(); handle.setMask(mask); } { TQPainter p(&handle); - style().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); + style().drawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); p.end(); } diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 61c45c47..9b2c438b 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -168,7 +168,7 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); -- cgit v1.2.1