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) --- tdestyles/asteroid/asteroid.cpp | 10 ++++----- tdestyles/highcolor/highcolor.cpp | 18 ++++++++--------- tdestyles/highcontrast/highcontrast.cpp | 30 +++++++++++++-------------- tdestyles/keramik/keramik.cpp | 32 ++++++++++++++--------------- tdestyles/keramik/pixmaploader.cpp | 14 ++++++------- tdestyles/klegacy/klegacystyle.cpp | 22 ++++++++++---------- tdestyles/kthemestyle/kthemebase.cpp | 2 +- tdestyles/kthemestyle/kthemestyle.cpp | 26 ++++++++++++------------ tdestyles/kthemestyle/kthemestyle.h | 2 +- tdestyles/light/lightstyle-v2.cpp | 4 ++-- tdestyles/light/lightstyle-v3.cpp | 4 ++-- tdestyles/plastik/plastik.cpp | 6 +++--- tdestyles/web/webstyle.cpp | 36 ++++++++++++++++----------------- tdestyles/web/webstyle.h | 4 ++-- 14 files changed, 105 insertions(+), 105 deletions(-) (limited to 'tdestyles') diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp index bd05125fd..7c56741a3 100644 --- a/tdestyles/asteroid/asteroid.cpp +++ b/tdestyles/asteroid/asteroid.cpp @@ -907,7 +907,7 @@ void AsteroidStyle::drawPrimitive(PrimitiveElement pe, } } - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(sf & Style_Enabled ? cg.foreground() : cg.light()); } @@ -1675,11 +1675,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } else if (mi->pixmap()) { TQPixmap *pixmap = mi->pixmap(); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } p->drawPixmap(xpos, y, *pixmap); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } } } @@ -1883,7 +1883,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, int i; for( i=0; i<64; i++ ) a.setPoint( i, 0, i*2+1 ); - p.setPen( Qt::color1 ); + p.setPen( TQt::color1 ); p.drawPoints( a ); p.end(); TQApplication::flushX(); @@ -1891,7 +1891,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, p.begin( horizontalLine ); for( i=0; i<64; i++ ) a.setPoint( i, i*2+1, 0 ); - p.setPen( Qt::color1 ); + p.setPen( TQt::color1 ); p.drawPoints( a ); p.end(); TQApplication::flushX(); diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp index f15c335cb..ba093b1ca 100644 --- a/tdestyles/highcolor/highcolor.cpp +++ b/tdestyles/highcolor/highcolor.cpp @@ -430,7 +430,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, if (p && p->device()->devType() == TQInternal::Widget) { TQHeader* hdr = dynamic_cast(p->device()); if (hdr) - horizontal = hdr->orientation() == Qt::Horizontal; + horizontal = hdr->orientation() == TQt::Horizontal; } int x,y,w,h; @@ -730,7 +730,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, maskBmp.setMask(maskBmp); } - p->setPen(Qt::color1); + p->setPen(TQt::color1); p->drawPixmap(r.x(), r.y(), maskBmp); break; } @@ -1480,14 +1480,14 @@ void HighColorStyle::drawControl( TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } @@ -1689,7 +1689,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, TQRect pr = parent->rect(); renderGradient( p, r, cg.button(), - parent->orientation() == Qt::Vertical, + parent->orientation() == TQt::Vertical, r.x(), r.y(), pr.width()-2, pr.height()-2); } else if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBarExtensionWidget")) @@ -1698,7 +1698,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, TQToolBar* toolbar = (TQToolBar*)parent->parent(); TQRect tr = toolbar->rect(); - if ( toolbar->orientation() == Qt::Horizontal ) { + if ( toolbar->orientation() == TQt::Horizontal ) { renderGradient( p, r, cg.button(), false, r.x(), r.y(), r.width(), tr.height() ); } else { @@ -2048,7 +2048,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData // Check if the parent is a QToolbar, and use its orientation, else guess. TQToolBar* tb = dynamic_cast(parent); - if (tb) horiz_grad = tb->orientation() == Qt::Vertical; + if (tb) horiz_grad = tb->orientation() == TQt::Vertical; TQPainter p( widget ); renderGradient(&p, r, parent->colorGroup().button(), horiz_grad, @@ -2071,11 +2071,11 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect; TQPainter p( widget ); renderGradient(&p, wr, toolbar->colorGroup().button(), - toolbar->orientation() == Qt::Vertical, + toolbar->orientation() == TQt::Vertical, wr.x(), wr.y(), tr.width() - 2, tr.height() - 2); p.setPen( toolbar->colorGroup().dark() ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp index 0a7009dfd..7631a5376 100644 --- a/tdestyles/highcontrast/highcontrast.cpp +++ b/tdestyles/highcontrast/highcontrast.cpp @@ -219,12 +219,12 @@ void HighContrastStyle::setColorsByState (TQPainter* p, const TQColorGroup& cg, if ((flags & Style_Enabled) && (flags & highlight)) { - p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); + p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine)); p->setBackgroundColor (cg.highlight()); } else { - p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); + p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine)); p->setBackgroundColor (bg); } @@ -253,7 +253,7 @@ void HighContrastStyle::drawRoundRect (TQPainter* p, TQRect r, int offset, bool addOffset (&r3, lineWidth); p->save(); - p->setPen (Qt::NoPen); + p->setPen (TQt::NoPen); if (filled) p->fillRect (r3, p->backgroundColor()); p->drawRect (r3); @@ -371,9 +371,9 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe, case PE_FocusRect: { p->save(); p->setBrush (TQBrush ()); - p->setPen (TQPen (cg.highlight(), basicLineWidth, Qt::SolidLine)); + p->setPen (TQPen (cg.highlight(), basicLineWidth, TQt::SolidLine)); drawRoundRect (p, r, basicLineWidth, false); - p->setPen (TQPen (cg.highlightedText(), basicLineWidth, Qt::DashLine)); + p->setPen (TQPen (cg.highlightedText(), basicLineWidth, TQt::DashLine)); drawRoundRect (p, r, basicLineWidth, false); p->restore(); break; @@ -472,7 +472,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe, case PE_ProgressBarChunk: { - p->fillRect (r, Qt::color1); + p->fillRect (r, TQt::color1); break; } @@ -506,7 +506,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe, break; } case PE_IndicatorMask: { - p->fillRect (r, Qt::color1); + p->fillRect (r, TQt::color1); break; } case PE_CheckMark: { @@ -535,10 +535,10 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe, break; } case PE_ExclusiveIndicatorMask: { - p->fillRect (r, Qt::color0); - p->setBackgroundColor (Qt::color1); - p->setPen (Qt::NoPen); - p->setBrush (Qt::color1); + p->fillRect (r, TQt::color0); + p->setBackgroundColor (TQt::color1); + p->setPen (TQt::NoPen); + p->setBrush (TQt::color1); p->drawEllipse (r); break; } @@ -551,7 +551,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe, setColorsButton (p, cg, flags); p->fillRect (r, p->backgroundColor()); - p->setPen (TQPen (p->pen().color(), 1, Qt::DashLine)); + p->setPen (TQPen (p->pen().color(), 1, TQt::DashLine)); if (flags & Style_Horizontal) p->drawLine (r.center().x(), r.top(), r.center().x(), r.bottom()); else @@ -713,7 +713,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, { setColorsButton (p, cg); p->fillRect (r, p->backgroundColor()); - p->setBrush (TQBrush (p->pen().color(), Qt::BDiagPattern)); + p->setBrush (TQBrush (p->pen().color(), TQt::BDiagPattern)); drawRoundRect (p, r); break; } @@ -1133,14 +1133,14 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index e5e4699cc..346a5a2c3 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -251,20 +251,20 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap, switch (stylepixmap) { case SP_TitleBarMinButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_iconify, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); //return qpixmap_from_bits( iconify_bits, "title-iconify.png" ); case SP_TitleBarMaxButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_maximize, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); case SP_TitleBarCloseButton: if (widget && widget->inherits("KDockWidgetHeader")) return Keramik::PixmapLoader::the().pixmap(keramik_title_close_tiny, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); else return Keramik::PixmapLoader::the().pixmap(keramik_title_close, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); case SP_TitleBarNormalButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_restore, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); default: break; } @@ -1267,10 +1267,10 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if (horizontal) Keramik::ScaledPainter( keramik_slider ).draw( p, r, disabled ? cg.button() : hl, - Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); else Keramik::ScaledPainter( keramik_vslider ).draw( p, r, disabled ? cg.button() : hl, - Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); break; } @@ -1600,7 +1600,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, //toolbar we normally paint over. } Keramik::GradientPainter::renderGradient( p, pr, cg.button(), - tb->orientation() == Qt::Horizontal); + tb->orientation() == TQt::Horizontal); } else TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, @@ -1818,14 +1818,14 @@ void KeramikStyle::drawControl( TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } @@ -2100,7 +2100,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, p2->setPen( cg.buttonText() ); p2->drawLineSegments( a ); - Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); } else //Size-constrained combo -- loose the ripple. { @@ -2125,7 +2125,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, p2->fillRect( er, cg.base() ); drawPrimitive( PE_PanelLineEdit, p2, ceData, elementFlags, er, cg ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(), - Qt::black, false, pmodeFullBlend() ); + TQt::black, false, pmodeFullBlend() ); } else if ( elementFlags & CEF_HasFocus ) { @@ -2585,7 +2585,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine ) { TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget ); - if ( static_cast< const TQScrollBar* >( widget )->orientation() == Qt::Horizontal ) + if ( static_cast< const TQScrollBar* >( widget )->orientation() == TQt::Horizontal ) { if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine; } @@ -2813,7 +2813,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, TQPainter p( widget ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), - Qt::black, false, Keramik::TilePainter::PaintFullBlend); + TQt::black, false, Keramik::TilePainter::PaintFullBlend); recursion = false; return true; } @@ -2936,7 +2936,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, TQRect wr = widget->rect (), tr = toolbar->rect(); TQPainter p( widget ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) { Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(), true /*horizontal*/, false /*not a menu*/, @@ -2952,7 +2952,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, //Draw terminator line, too p.setPen( toolbar->colorGroup().mid() ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); diff --git a/tdestyles/keramik/pixmaploader.cpp b/tdestyles/keramik/pixmaploader.cpp index 73d7eb8d9..b506f9300 100644 --- a/tdestyles/keramik/pixmaploader.cpp +++ b/tdestyles/keramik/pixmaploader.cpp @@ -316,7 +316,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const { if (mode == PaintTrivialMask) { - p->fillRect(x, y, width, height, Qt::color1); + p->fillRect(x, y, width, height, TQt::color1); return; } @@ -425,12 +425,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const const TQBitmap* mask = scale( col, row, w, h, color, bg, disabled, false ).mask(); if (mask) { - p->setBackgroundColor(Qt::color0); - p->setPen(Qt::color1); + p->setBackgroundColor(TQt::color0); + p->setPen(TQt::color1); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); } else - p->fillRect ( xpos, ypos, realW, realH, Qt::color1); + p->fillRect ( xpos, ypos, realW, realH, TQt::color1); } } else @@ -445,12 +445,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask(); if (mask) { - p->setBackgroundColor(Qt::color0); - p->setPen(Qt::color1); + p->setBackgroundColor(TQt::color0); + p->setPen(TQt::color1); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); } else - p->fillRect ( xpos, ypos, realW, realH, Qt::color1); + p->fillRect ( xpos, ypos, realW, realH, TQt::color1); } } diff --git a/tdestyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp index 9cc019795..89b76f4dc 100644 --- a/tdestyles/klegacy/klegacystyle.cpp +++ b/tdestyles/klegacy/klegacystyle.cpp @@ -387,7 +387,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, // draw the image bool mask = image->hasAlphaBuffer(); TQBitmap bm(width, height); - bm.fill(Qt::color1); + bm.fill(TQt::color1); TQImage nimage[3][3]; int xx = -1, yy = -1; @@ -404,12 +404,12 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, if (nimage[yy][xx].isNull()) continue; bitBlt(pixmap, x2[xx], y2[yy], &nimage[yy][xx], - 0, 0, w2[xx], h2[yy], Qt::CopyROP); + 0, 0, w2[xx], h2[yy], TQt::CopyROP); if (mask) { TQImage am = nimage[yy][xx].createAlphaMask(); bitBlt(&bm, x2[xx], y2[yy], &am, - 0, 0, w2[xx], h2[yy], Qt::CopyROP); + 0, 0, w2[xx], h2[yy], TQt::CopyROP); } } } @@ -419,14 +419,14 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, } else { for (int y = 0; y < height; y += image->height()) for (int x = 0; x < width; x += image->width()) - bitBlt(pixmap, x, y, image, 0, 0, -1, -1, Qt::CopyROP); + bitBlt(pixmap, x, y, image, 0, 0, -1, -1, TQt::CopyROP); if (image->hasAlphaBuffer()) { TQImage mask = image->createAlphaMask(); if (! mask.isNull() && mask.depth() == 1) { TQBitmap bm(width, height); - bm.fill(Qt::color1); + bm.fill(TQt::color1); bm = mask; pixmap->setMask(bm); } @@ -1210,13 +1210,13 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (parameter == "UP") - imagedata->key.data.arrowDirection = Qt::UpArrow + 1; + imagedata->key.data.arrowDirection = TQt::UpArrow + 1; else if (parameter == "DOWN") - imagedata->key.data.arrowDirection = Qt::DownArrow + 1; + imagedata->key.data.arrowDirection = TQt::DownArrow + 1; else if (parameter == "LEFT") - imagedata->key.data.arrowDirection = Qt::LeftArrow + 1; + imagedata->key.data.arrowDirection = TQt::LeftArrow + 1; else if (parameter == "RIGHT") - imagedata->key.data.arrowDirection = Qt::RightArrow + 1; + imagedata->key.data.arrowDirection = TQt::RightArrow + 1; } else if (next == "border") { filestream >> equals; filestream >> parameter; @@ -1323,9 +1323,9 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (parameter == "VERTICAL") - imagedata->key.data.orientation = Qt::Vertical + 1; + imagedata->key.data.orientation = TQt::Vertical + 1; else if (parameter == "HORIZONTAL") - imagedata->key.data.orientation = Qt::Horizontal + 1; + imagedata->key.data.orientation = TQt::Horizontal + 1; } else if (next == "overlay_border") { filestream >> equals; filestream >> parameter; diff --git a/tdestyles/kthemestyle/kthemebase.cpp b/tdestyles/kthemestyle/kthemebase.cpp index 806815ef6..c75b7596e 100644 --- a/tdestyles/kthemestyle/kthemebase.cpp +++ b/tdestyles/kthemestyle/kthemebase.cpp @@ -1636,7 +1636,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal ) disfg = disfg.light( highlightVal ); else // black fg - use darkgray disabled fg - disfg = Qt::darkGray; + disfg = TQt::darkGray; TQColorGroup disabledgrp( disfg, background, //TODO:Convert this to the new ctor. diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp index 899d4681d..d72e524a8 100644 --- a/tdestyles/kthemestyle/kthemestyle.cpp +++ b/tdestyles/kthemestyle/kthemestyle.cpp @@ -550,9 +550,9 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen { polishLock = true; - TQColorGroup clrGroup( Qt::black, TQColor( 255, 255, 220 ), - TQColor( 96, 96, 96 ), Qt::black, Qt::black, - Qt::black, TQColor( 255, 255, 220 ) ); + TQColorGroup clrGroup( TQt::black, TQColor( 255, 255, 220 ), + TQColor( 96, 96, 96 ), TQt::black, TQt::black, + TQt::black, TQColor( 255, 255, 220 ) ); TQPalette toolTip ( clrGroup, clrGroup, clrGroup ); TQToolTip::setPalette( toolTip ); @@ -927,7 +927,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask(); if ( mask ) { - p->setPen( Qt::color1 ); + p->setPen( TQt::color1 ); p->drawPixmap( x, y, *mask ); } else @@ -945,7 +945,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt IndicatorOff ) ->mask(); if ( mask ) { - p->setPen( Qt::color1 ); + p->setPen( TQt::color1 ); p->drawPixmap( x, y, *mask ); } else @@ -1686,14 +1686,14 @@ void KThemeStyle::drawControl( ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x + diffw, y + itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } @@ -1851,7 +1851,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if ( !roundSlider() ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; if ( horizontal ) { drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true, @@ -1867,7 +1867,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, { //This code is from HighColorDefault.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; int gcenter = ( horizontal ? r.height() : r.width() ) / 2; TQRect gr; @@ -1903,7 +1903,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if ( isPixmap( Slider ) ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; if ( horizontal ) { bitBlt( p->device(), x, y + ( h - uncached( Slider ) ->height() ) / 2, @@ -1928,7 +1928,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, //This code again from HighColor.. //...except sans the gradient.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; int x, y, w, h; r.rect( &x, &y, &w, &h ); int x2 = x + w - 1; @@ -2115,7 +2115,7 @@ void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, { const TQScrollBar *sb = ( const TQScrollBar* ) widget; bool maxedOut = ( sb->minValue() == sb->maxValue() ); - bool horizontal = ( sb->orientation() == Qt::Horizontal ); + bool horizontal = ( sb->orientation() == TQt::Horizontal ); SFlags sflags = ( ( horizontal ? Style_Horizontal : Style_Default ) | ( maxedOut ? Style_Default : Style_Enabled ) ); @@ -2374,7 +2374,7 @@ void KThemeStyle::drawShade( TQPainter *p, int x, int y, int w, int h, ++x, ++y; --x2, --y2; } - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawPoints( bPntArray ); p->drawLineSegments( bLineArray ); p->setPen( highPen ); diff --git a/tdestyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h index 8bb82c8e7..e53187b2f 100644 --- a/tdestyles/kthemestyle/kthemestyle.h +++ b/tdestyles/kthemestyle/kthemestyle.h @@ -227,7 +227,7 @@ protected: mutable TQPixmap* menuCache; mutable TQPixmap* vsliderCache; - Qt::HANDLE brushHandle; + TQt::HANDLE brushHandle; bool brushHandleSet; bool kickerMode; diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp index 1809f3bad..6e6cfa788 100644 --- a/tdestyles/light/lightstyle-v2.cpp +++ b/tdestyles/light/lightstyle-v2.cpp @@ -948,10 +948,10 @@ void LightStyleV2::drawControl( TQ_ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } if (mi->popup()) diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp index 38ebe4293..38159134c 100644 --- a/tdestyles/light/lightstyle-v3.cpp +++ b/tdestyles/light/lightstyle-v3.cpp @@ -1068,10 +1068,10 @@ void LightStyleV3::drawControl( TQ_ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } if (mi->popup()) diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 4f4b709d2..06816aa32 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -2159,7 +2159,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, a.translate(0, 0); } - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { if (flags & Style_Enabled) { p->setPen(cg.buttonText()); } else { @@ -2682,14 +2682,14 @@ void PlastikStyle::drawControl(TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( r.width() - pixmap->width() ) / 2 ) + ( ( r.width() - pixmap->width() ) % 2 ); p->drawPixmap( r.x()+diffw, r.y()+1, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } diff --git a/tdestyles/web/webstyle.cpp b/tdestyles/web/webstyle.cpp index f363b9527..cce42ed15 100644 --- a/tdestyles/web/webstyle.cpp +++ b/tdestyles/web/webstyle.cpp @@ -60,7 +60,7 @@ static TQColor contrastingForeground(const TQColor & fg, const TQColor & bg) if ((diff > -72) && (diff < 72)) { - return (vbg < 128) ? Qt::white : Qt::black; + return (vbg < 128) ? TQt::white : TQt::black; } else { @@ -471,8 +471,8 @@ WebStyle::drawScrollBarControls p->setBrush(g.button()); p->drawRect(rAdd); - Qt::ArrowType t = - sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow; + TQt::ArrowType t = + sb->orientation() == Horizontal ? TQt::RightArrow : TQt::DownArrow; // Is it me or is TDEStyle::drawArrow broken ? @@ -500,8 +500,8 @@ WebStyle::drawScrollBarControls p->setBrush(g.button()); p->drawRect(rSub); - Qt::ArrowType t = - sb->orientation() == Horizontal ? Qt::LeftArrow : Qt::UpArrow; + TQt::ArrowType t = + sb->orientation() == Horizontal ? TQt::LeftArrow : TQt::UpArrow; drawArrow ( @@ -785,7 +785,7 @@ WebStyle::drawIndicatorMask int /* state */ ) { - p->fillRect(x, y, w, h, Qt::color1); + p->fillRect(x, y, w, h, TQt::color1); } void @@ -805,8 +805,8 @@ WebStyle::drawExclusiveIndicatorMask if (0 == h % 2) --h; - p->setPen(Qt::color1); - p->setBrush(Qt::color1); + p->setPen(TQt::color1); + p->setBrush(TQt::color1); p->drawEllipse(x, y, w, h); } @@ -866,7 +866,7 @@ WebStyle::drawComboButton p->drawPoint(w - 6, h - 10); if (editable) - p->fillRect(comboButtonFocusRect(x, y, w, h), Qt::red); + p->fillRect(comboButtonFocusRect(x, y, w, h), TQt::red); p->restore(); } @@ -904,12 +904,12 @@ WebStyle::drawSliderGroove { p->save(); - p->setPen(TQPen(g.dark(), 0, Qt::DotLine)); + p->setPen(TQPen(g.dark(), 0, TQt::DotLine)); - if( o == Qt::Horizontal ) + if( o == TQt::Horizontal ) p->drawLine(x, y + h / 2, w, y + h / 2); else - if( o == Qt::Vertical ) + if( o == TQt::Vertical ) p->drawLine(x + w / 2, y, x + w / 2, h); p->restore(); @@ -919,7 +919,7 @@ WebStyle::drawSliderGroove WebStyle::drawArrow ( TQPainter * p, - Qt::ArrowType type, + TQt::ArrowType type, bool down, int x, int y, @@ -955,10 +955,10 @@ WebStyle::drawSlider int sl = sliderLength(); - if( o == Qt::Horizontal ) + if( o == TQt::Horizontal ) p->drawEllipse(x, y + h / 2 - sl / 2, sl, sl); else - if( o == Qt::Vertical ) + if( o == TQt::Vertical ) p->drawEllipse(x + w / 2 - sl / 2, y, sl, sl); p->restore(); @@ -1495,7 +1495,7 @@ WebStyle::drawTabMask bool ) { - p->fillRect(tab->rect(), Qt::color1); + p->fillRect(tab->rect(), TQt::color1); } void @@ -1641,7 +1641,7 @@ WebStyle::drawKickerTaskButton p->setPen(contrastingForeground(g.text(), bg)); } - p->setPen(Qt::white); + p->setPen(TQt::white); p->drawText ( @@ -1655,7 +1655,7 @@ WebStyle::drawKickerTaskButton } p->restore(); - p->setPen(Qt::white); + p->setPen(TQt::white); } int diff --git a/tdestyles/web/webstyle.h b/tdestyles/web/webstyle.h index 0e4c59dbd..ab8742691 100644 --- a/tdestyles/web/webstyle.h +++ b/tdestyles/web/webstyle.h @@ -186,7 +186,7 @@ class WebStyle : public TDEStyle void drawArrow ( TQPainter *, - Qt::ArrowType, + TQt::ArrowType, bool down, int x, int y, @@ -406,7 +406,7 @@ class WebStyle : public TDEStyle int popupMenuItemHeight(bool, TQMenuItem *, const TQFontMetrics &); - GUIStyle guiStyle() const { return Qt::MotifStyle; } + GUIStyle guiStyle() const { return TQt::MotifStyle; } bool eventFilter(TQObject *, TQEvent *); }; -- cgit v1.2.1