From 303b6445011a6ed10c48ac6e1eda415e5c371264 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 13 Nov 2023 20:33:00 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro (cherry picked from commit c8ece3630d4d21acaf1749fc2cf660a0463070c3) --- tdefx/kdrawutil.cpp | 14 +++++++------- tdefx/kdrawutil.h | 4 ++-- tdefx/kimageeffect.cpp | 2 +- tdefx/kpixmapsplitter.h | 2 +- tdefx/tdestyle.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'tdefx') diff --git a/tdefx/kdrawutil.cpp b/tdefx/kdrawutil.cpp index 0610865cb..de5946087 100644 --- a/tdefx/kdrawutil.cpp +++ b/tdefx/kdrawutil.cpp @@ -27,13 +27,13 @@ TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h, int y2 = y+h-1; p->fillRect(x+1, y+1, w-2, h-2, fill ? *fill : g.brush(TQColorGroup::Button)); - p->setPen(sunken ? Qt::black : g.light()); + p->setPen(sunken ? TQt::black : g.light()); p->drawLine(x, y, x2-1, y); p->drawLine(x, y, x, y2-1); p->setPen(sunken ? g.midlight() : g.mid()); p->drawLine(x+1, y2-1, x2-1, y2-1); p->drawLine(x2-1, y+1, x2-1, y2-1); - p->setPen(sunken ? g.light() : Qt::black); + p->setPen(sunken ? g.light() : TQt::black); p->drawLine(x, y2, x2, y2); p->drawLine(x2, y, x2, y2); p->setPen(oldPen); @@ -161,10 +161,10 @@ TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool 3,1,3,2,3,3,3,4,3,0,4,1,4,2,4,3,4,4,4 }; if(clear) - p->fillRect(x, y, w, h, TQBrush(Qt::color0, Qt::SolidPattern)); + p->fillRect(x, y, w, h, TQBrush(TQt::color0, TQt::SolidPattern)); - TQBrush fillBrush(Qt::color1, Qt::SolidPattern); - p->setPen(Qt::color1); + TQBrush fillBrush(TQt::color1, TQt::SolidPattern); + p->setPen(TQt::color1); if(w > 16 && h > 16){ int x2 = x+w-1; int y2 = y+h-1; @@ -223,7 +223,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int blackColor, whiteColor}; TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(), - Qt::black, Qt::white}; + TQt::black, TQt::white}; int i; for(i=0; i < 6; ++i){ @@ -246,7 +246,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int blackColor, whiteColor}; TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(), - Qt::black, Qt::white}; + TQt::black, TQt::white}; int i; TQBitmap b; diff --git a/tdefx/kdrawutil.h b/tdefx/kdrawutil.h index 909792817..bee877e6a 100644 --- a/tdefx/kdrawutil.h +++ b/tdefx/kdrawutil.h @@ -125,7 +125,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h); * @c \#include @c * * Paints the pixels covered by a round button of the given size with - * Qt::color1. This function is useful in TQStyle::drawControlMask(). + * TQt::color1. This function is useful in TQStyle::drawControlMask(). * * @param p The painter to use for drawing the button. * @param x The X coordinate of the button. @@ -133,7 +133,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h); * @param w The width of the button. * @param h The height of the button. * @param clear Whether to clear the rectangle specified by @p (x, y, w, h) to - * Qt::color0 before drawing the mask. + * TQt::color0 before drawing the mask. */ TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false); diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp index 0ee1645cb..444119a1c 100644 --- a/tdefx/kimageeffect.cpp +++ b/tdefx/kimageeffect.cpp @@ -2820,7 +2820,7 @@ void KImageEffect::threshold(TQImage &img, unsigned int threshold) data = (unsigned int *)img.tqcolorTable(); } for(i=0; i < count; ++i) - data[i] = intensityValue(data[i]) < threshold ? TQColor(Qt::black).rgb() : TQColor(Qt::white).rgb(); + data[i] = intensityValue(data[i]) < threshold ? TQColor(TQt::black).rgb() : TQColor(TQt::white).rgb(); } void KImageEffect::hull(const int x_offset, const int y_offset, diff --git a/tdefx/kpixmapsplitter.h b/tdefx/kpixmapsplitter.h index 3e7a6dfa1..cf96515ce 100644 --- a/tdefx/kpixmapsplitter.h +++ b/tdefx/kpixmapsplitter.h @@ -42,7 +42,7 @@ class KPixmapSplitterPrivate; * splitter.setItemSize( TQSize( 20, 10 )); * * TQPixmap item( 20, 10 ); - * item.fill( Qt::white ); + * item.fill( TQt::white ); * TQRect rect = splitter.coordinates( 4 ); * if ( !rect.isEmpty() ) * bitBlt( &item, TQPoint(0,0), &somePixmap, rect, CopyROP ); diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp index 628c5ca7c..f191dc751 100644 --- a/tdefx/tdestyle.cpp +++ b/tdefx/tdestyle.cpp @@ -537,7 +537,7 @@ void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, break; default: - p->fillRect(r, Qt::yellow); // Something really bad happened - highlight. + p->fillRect(r, TQt::yellow); // Something really bad happened - highlight. break; } } @@ -1937,7 +1937,7 @@ bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, Cont TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame ); TQRect r = pe->rect(); - if (toolbar && toolbar->orientation() == Qt::Vertical) + if (toolbar && toolbar->orientation() == TQt::Vertical) horizontal = false; if (horizontal) { -- cgit v1.2.1