From 1180237ab336226ad932d767a6cb56208314988f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:22:15 -0600 Subject: Rename obsolete tq methods to standard names --- kstyles/asteroid/asteroid.cpp | 6 +-- kstyles/highcolor/highcolor.cpp | 4 +- kstyles/keramik/keramik.cpp | 10 ++--- kstyles/kthemestyle/kthemebase.cpp | 16 ++++---- kstyles/kthemestyle/kthemestyle.cpp | 6 +-- kstyles/light/lightstyle-v2.cpp | 70 +++++++++++++++++----------------- kstyles/light/lightstyle-v3.cpp | 76 ++++++++++++++++++------------------- 7 files changed, 94 insertions(+), 94 deletions(-) (limited to 'kstyles') diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 88ee6ad7e..0cad09ecc 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -108,7 +108,7 @@ void AsteroidStyle::polish(TQWidget *w) { /* Screwing with the palette is fun! and required in order to make it feel authentic. -clee */ - TQPalette wp = w->tqpalette(); + TQPalette wp = w->palette(); //wp.setColor(TQColorGroup::Dark, wp.active().color(TQColorGroup::Button).dark(350)); wp.setColor(TQColorGroup::Dark, TQColor(128, 128, 128)); wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to? @@ -149,7 +149,7 @@ void AsteroidStyle::unPolish(TQWidget *w) void AsteroidStyle::polish( TQApplication* app) { - TQPalette wp = TQApplication::tqpalette(); + TQPalette wp = TQApplication::palette(); wp.setColor(TQColorGroup::Dark, TQColor(128, 128, 128)); wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to? TQApplication::setPalette( wp, TRUE ); @@ -1425,7 +1425,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } if (!pb->text().isNull()) { - p->setPen(POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():(enabled ? cg.buttonText() : pb->tqpalette().disabled().buttonText())); + p->setPen(POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():(enabled ? cg.buttonText() : pb->palette().disabled().buttonText())); if (pb->iconSet() && !pb->iconSet()->isNull()) { TQRect tpr(dx, r.y(), r.width()-dx, r.height()); TQRect tr(p->boundingRect(tpr, text_flags, pb->text())); diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index b2ab9e493..f42ff4061 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -317,7 +317,7 @@ void HighColorStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, if ( sunken ) kDrawBeButton( p, x, y, w, h, cg, true, - &cg.tqbrush(TQColorGroup::Mid) ); + &cg.brush(TQColorGroup::Mid) ); else if ( flags & Style_MouseOver && !flat ) { TQBrush brush(cg.button().light(110)); @@ -367,7 +367,7 @@ void HighColorStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, cg.button(), false); } else kDrawBeButton(p, x, y, w, h, cg, false, - &cg.tqbrush(TQColorGroup::Button)); + &cg.brush(TQColorGroup::Button)); break; } diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 7bd3c7362..8ebbe8683 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -1928,7 +1928,7 @@ void KeramikStyle::drawControlMask( TQ_ControlElement element, { p->fillRect(r, color1); maskMode = true; - drawControl( element, p, widget, r, TQApplication::tqpalette().active(), TQStyle::Style_Default, opt); + drawControl( element, p, widget, r, TQApplication::palette().active(), TQStyle::Style_Default, opt); maskMode = false; } @@ -2330,7 +2330,7 @@ void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control, { maskMode = true; drawComplexControl(CC_ComboBox, p, widget, r, - TQApplication::tqpalette().active(), Style_Default, + TQApplication::palette().active(), Style_Default, SC_ComboBoxFrame,SC_None, opt); maskMode = false; @@ -2778,7 +2778,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) TQWidget* widget = TQT_TQWIDGET( object ); TQPainter p( widget ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, widget->rect(), - widget->tqpalette().color( TQPalette::Normal, TQColorGroup::Button ), + widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), Qt::black, false, Keramik::TilePainter::PaintFullBlend); recursion = false; return true; @@ -2825,8 +2825,8 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) { TQPainter p( listbox ); Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(), - listbox->tqpalette().color( TQPalette::Normal, TQColorGroup::Button ), - listbox->tqpalette().color( TQPalette::Normal, TQColorGroup::Background ) ); + listbox->palette().color( TQPalette::Normal, TQColorGroup::Button ), + listbox->palette().color( TQPalette::Normal, TQColorGroup::Background ) ); TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() ); recursion = true; diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 193d9c6d7..9da0fdabd 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -1100,12 +1100,12 @@ TQColorGroup* KThemeBase::makeColorGroup( const TQColor &fg, const TQColor &bg, lowlightVal = 100 + ( ( 2 * d->contrast + 4 ) * 10 ); return ( new TQColorGroup( fg, bg, bg.light( highlightVal ), bg.dark( lowlightVal ), bg.dark( 120 ), - fg, TQApplication::tqpalette().active().base() ) ); + fg, TQApplication::palette().active().base() ) ); } else return ( new TQColorGroup( fg, bg, bg.light( 150 ), bg.dark(), bg.dark( 120 ), fg, - TQApplication::tqpalette().active().base() ) ); + TQApplication::palette().active().base() ) ); } @@ -1273,12 +1273,12 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i ) // Gradient low color or blend background if ( keys.contains( "GradientLow" ) ) prop[ "GrLow" ] = readColorEntry( config, TQString( base + "GradientLow" ).latin1(), - &TQApplication::tqpalette().active().background() ).name(); + &TQApplication::palette().active().background() ).name(); // Gradient high color if ( keys.contains( "GradientHigh" ) ) prop[ "GrHigh" ] = readColorEntry( config, TQString( base + "GradientHigh" ).latin1(), - &TQApplication::tqpalette().active().foreground() ).name(); + &TQApplication::palette().active().foreground() ).name(); // Extended color attributes if ( keys.contains( "Foreground" ) || keys.contains( "Background" ) ) @@ -1429,7 +1429,7 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname if ( gradients[ i ] != GrNone || blends[ i ] != 0.0 ) grLowColors[ i ] = new TQColor( readColorEntry( prop, "GrLow", - TQApplication::tqpalette().active(). + TQApplication::palette().active(). background() ) ); else grLowColors[ i ] = NULL; @@ -1438,7 +1438,7 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname if ( gradients[ i ] != GrNone ) grHighColors[ i ] = new TQColor( readColorEntry( prop, "GrHigh", - TQApplication::tqpalette().active(). + TQApplication::palette().active(). background() ) ); else grHighColors[ i ] = NULL; @@ -1450,9 +1450,9 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname if ( fg.isValid() || bg.isValid() ) { if ( !fg.isValid() ) - fg = TQApplication::tqpalette().active().foreground(); + fg = TQApplication::palette().active().foreground(); if ( !bg.isValid() ) - bg = TQApplication::tqpalette().active().background(); + bg = TQApplication::palette().active().background(); colors[ i ] = makeColorGroup( fg, bg, TQt::WindowsStyle ); } else diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index aaa3c0530..085ae288e 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -1087,7 +1087,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const return menuCache; } - const TQColorGroup *g = colorGroup( TQApplication::tqpalette().active(), MenuBar); + const TQColorGroup *g = colorGroup( TQApplication::palette().active(), MenuBar); menuCache = new TQPixmap ( w, h ); TQPainter p(menuCache); @@ -1253,7 +1253,7 @@ void KThemeStyle::drawControl( ControlElement element, if ( !selected ) { p->fillRect( x, y, x2 - x + 1, 2, - tb->tqpalette().active().brush( TQColorGroup::Background ) ); + tb->palette().active().brush( TQColorGroup::Background ) ); y += 2; } p->setPen( cg->text() ); @@ -1326,7 +1326,7 @@ void KThemeStyle::drawControl( ControlElement element, if ( !selected ) { p->fillRect( x, y2 - 2, x2 - x + 1, 2, - tb->tqpalette().active().brush( TQColorGroup::Background ) ); + tb->palette().active().brush( TQColorGroup::Background ) ); y2 -= 2; } p->setPen( cg->text() ); diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index a55e2edad..2feacba8f 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -160,11 +160,11 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, if (flags & (TQStyle::Style_Down | TQStyle::Style_On | TQStyle::Style_Sunken)) - fill = &cg.tqbrush(TQColorGroup::Midlight); + fill = &cg.brush(TQColorGroup::Midlight); else - fill = &cg.tqbrush(TQColorGroup::Button); + fill = &cg.brush(TQColorGroup::Button); } else - fill = &cg.tqbrush(TQColorGroup::Background); + fill = &cg.brush(TQColorGroup::Background); drawLightBevel(p, r, cg, flags, fill); break; } @@ -177,11 +177,11 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, if (flags & TQStyle::Style_Enabled) { if (sunken) - thefill = cg.tqbrush(TQColorGroup::Midlight); + thefill = cg.brush(TQColorGroup::Midlight); else - thefill = cg.tqbrush(TQColorGroup::Button); + thefill = cg.brush(TQColorGroup::Button); } else - thefill = cg.tqbrush(TQColorGroup::Background); + thefill = cg.brush(TQColorGroup::Background); p->setPen(cg.dark()); p->drawLine(r.topLeft(), r.topRight()); @@ -225,11 +225,11 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, case PE_Indicator: const TQBrush *fill; if (! (flags & Style_Enabled)) - fill = &cg.tqbrush(TQColorGroup::Background); + fill = &cg.brush(TQColorGroup::Background); else if (flags & Style_Down) - fill = &cg.tqbrush(TQColorGroup::Mid); + fill = &cg.brush(TQColorGroup::Mid); else - fill = &cg.tqbrush(TQColorGroup::Base); + fill = &cg.brush(TQColorGroup::Base); drawLightBevel(p, r, cg, flags | Style_Sunken, fill); p->setPen(cg.text()); @@ -266,7 +266,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, cr.addCoords(2, 2, -2, -2); ir.addCoords(3, 3, -3, -3); - p->fillRect(r, cg.tqbrush(TQColorGroup::Background)); + p->fillRect(r, cg.brush(TQColorGroup::Background)); p->setPen(cg.dark()); p->drawArc(r, 0, 16*360); @@ -308,7 +308,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPixmap pm(r.height(), r.width()); TQPainter p2(&pm); p2.fillRect(0, 0, pm.width(), pm.height(), - cg.tqbrush(TQColorGroup::Highlight)); + cg.brush(TQColorGroup::Highlight)); p2.setPen(cg.highlightedText()); p2.drawText(0, 0, pm.width(), pm.height(), AlignCenter, title); p2.end(); @@ -332,7 +332,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, } } else { if (drawTitle) { - p->fillRect(r, cg.tqbrush(TQColorGroup::Highlight)); + p->fillRect(r, cg.brush(TQColorGroup::Highlight)); p->setPen(cg.highlightedText()); p->drawText(r, AlignCenter, title); } else { @@ -424,7 +424,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, if (lw == 2) drawLightBevel(p, r, cg, flags | Style_Raised, - &cg.tqbrush(TQColorGroup::Button)); + &cg.brush(TQColorGroup::Button)); else TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; @@ -436,7 +436,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, pixelMetric(PM_MenuBarFrameWidth) : data.lineWidth(); if (lw == 2) - drawLightBevel(p, r, cg, flags, &cg.tqbrush(TQColorGroup::Button)); + drawLightBevel(p, r, cg, flags, &cg.brush(TQColorGroup::Button)); else TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; @@ -460,7 +460,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, pe = PE_ArrowUp; } - p->fillRect(fr, cg.tqbrush((flags & Style_Down) ? + p->fillRect(fr, cg.brush((flags & Style_Down) ? TQColorGroup::Midlight : TQColorGroup::Background)); tqdrawPrimitive(pe, p, ar, cg, flags); @@ -485,7 +485,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, pe = PE_ArrowDown; } - p->fillRect(fr, cg.tqbrush((flags & Style_Down) ? + p->fillRect(fr, cg.brush((flags & Style_Down) ? TQColorGroup::Midlight : TQColorGroup::Background)); tqdrawPrimitive(pe, p, ar, cg, flags); @@ -511,7 +511,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, fr.addCoords(2, 0, 0, 0); } - p->fillRect(fr, cg.tqbrush((flags & Style_Down) ? + p->fillRect(fr, cg.brush((flags & Style_Down) ? TQColorGroup::Midlight : TQColorGroup::Mid)); break; @@ -538,7 +538,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, drawLightBevel(p, fr, cg, ((flags | Style_Down) ^ Style_Down) | ((flags & Style_Enabled) ? Style_Raised : Style_Default), - &cg.tqbrush(TQColorGroup::Button)); + &cg.brush(TQColorGroup::Button)); break; } @@ -790,7 +790,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); p->setPen(cg.mid().dark(120)); p->drawLine(r.left() + 12, r.top() + 1, @@ -803,11 +803,11 @@ void LightStyleV2::drawControl( TQ_ControlElement control, if (flags & Style_Active) qDrawShadePanel(p, r, cg, true, 1, - &cg.tqbrush(TQColorGroup::Midlight)); + &cg.brush(TQColorGroup::Midlight)); else if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); if ( !mi ) break; @@ -835,7 +835,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, if (mi->isChecked() && ! (flags & Style_Active) & (flags & Style_Enabled)) - qDrawShadePanel(p, cr, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); + qDrawShadePanel(p, cr, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); if (mi->iconSet()) { TQIconSet::Mode mode = @@ -936,13 +936,13 @@ void LightStyleV2::drawControl( TQ_ControlElement control, case CE_MenuBarEmptyArea: { - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); break; } case CE_DockWindowEmptyArea: { - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); break; } @@ -950,9 +950,9 @@ void LightStyleV2::drawControl( TQ_ControlElement control, case CE_MenuBarItem: { if (flags & Style_Active) - qDrawShadePanel(p, r, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); + qDrawShadePanel(p, r, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); else - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); if (data.isDefault()) break; @@ -965,7 +965,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, } case CE_ProgressBarGroove: - drawLightBevel(p, r, cg, Style_Sunken, &cg.tqbrush(TQColorGroup::Background)); + drawLightBevel(p, r, cg, Style_Sunken, &cg.brush(TQColorGroup::Background)); break; default: @@ -1049,11 +1049,11 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, if ((controls & SC_ComboBoxFrame) && frame.isValid()) drawLightBevel(p, frame, cg, flags | Style_Raised, - &cg.tqbrush(TQColorGroup::Button)); + &cg.brush(TQColorGroup::Button)); if ((controls & SC_ComboBoxArrow) && arrow.isValid()) { if (active == SC_ComboBoxArrow) - p->fillRect(arrow, cg.tqbrush(TQColorGroup::Mid)); + p->fillRect(arrow, cg.brush(TQColorGroup::Mid)); arrow.addCoords(4, 2, -2, -2); tqdrawPrimitive(PE_ArrowDown, p, arrow, cg, flags); } @@ -1069,7 +1069,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, if (flags & Style_HasFocus) { if (! combobox->editable()) { - p->fillRect( field, cg.tqbrush( TQColorGroup::Highlight ) ); + p->fillRect( field, cg.brush( TQColorGroup::Highlight ) ); TQRect fr = TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ), widget ); @@ -1098,7 +1098,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, if ((controls & SC_SpinWidgetFrame) && frame.isValid()) drawLightBevel(p, frame, cg, flags | Style_Sunken, - &cg.tqbrush(TQColorGroup::Base)); + &cg.brush(TQColorGroup::Base)); if ((controls & SC_SpinWidgetUp) && up.isValid()) { TQ_PrimitiveElement pe = PE_SpinWidgetUp; @@ -1109,7 +1109,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, p->drawLine(up.topLeft(), up.bottomLeft()); up.addCoords(1, 0, 0, 0); - p->fillRect(up, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(up, cg.brush(TQColorGroup::Button)); if (active == SC_SpinWidgetUp) p->setPen(cg.mid()); else @@ -1142,7 +1142,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, p->drawLine(down.topLeft(), down.bottomLeft()); down.addCoords(1, 0, 0, 0); - p->fillRect(down, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(down, cg.brush(TQColorGroup::Button)); if (active == SC_SpinWidgetDown) p->setPen(cg.mid()); else @@ -1274,13 +1274,13 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, drawLightBevel(p, groove, cg, ((flags | Style_Raised) ^ Style_Raised) | ((flags & Style_Enabled) ? Style_Sunken : Style_Default), - &cg.tqbrush(TQColorGroup::Midlight)); + &cg.brush(TQColorGroup::Midlight)); } if ((controls & SC_SliderHandle) && handle.isValid()) { drawLightBevel(p, handle, cg, ((flags | Style_Down) ^ Style_Down) | ((flags & Style_Enabled) ? Style_Raised : Style_Default), - &cg.tqbrush(TQColorGroup::Button)); + &cg.brush(TQColorGroup::Button)); } diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index a31dba078..94e4d09d0 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -249,7 +249,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, // fill the header if ( ! br.isValid() ) break; - p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? + p->fillRect( br, cg.brush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); // the taskbuttons in kicker seem to allow the style to set the pencolor @@ -266,11 +266,11 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if (flags & (TQStyle::Style_Down | TQStyle::Style_On | TQStyle::Style_Sunken)) - fill = &cg.tqbrush(TQColorGroup::Midlight); + fill = &cg.brush(TQColorGroup::Midlight); else - fill = &cg.tqbrush(TQColorGroup::Button); + fill = &cg.brush(TQColorGroup::Button); } else - fill = &cg.tqbrush(TQColorGroup::Background); + fill = &cg.brush(TQColorGroup::Background); bool etch = true; if ( flags & Style_ButtonDefault ) { @@ -289,11 +289,11 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if (flags & (TQStyle::Style_Down | TQStyle::Style_On | TQStyle::Style_Sunken)) - fill = &cg.tqbrush(TQColorGroup::Midlight); + fill = &cg.brush(TQColorGroup::Midlight); else - fill = &cg.tqbrush(TQColorGroup::Button); + fill = &cg.brush(TQColorGroup::Button); } else - fill = &cg.tqbrush(TQColorGroup::Background); + fill = &cg.brush(TQColorGroup::Background); drawLightBevel( p, r, cg, flags, pixelMetric( PM_DefaultFrameWidth ), false, true, fill ); break; @@ -306,11 +306,11 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if (flags & TQStyle::Style_Enabled) { if (sunken) - thefill = cg.tqbrush(TQColorGroup::Midlight); + thefill = cg.brush(TQColorGroup::Midlight); else - thefill = cg.tqbrush(TQColorGroup::Button); + thefill = cg.brush(TQColorGroup::Button); } else - thefill = cg.tqbrush(TQColorGroup::Background); + thefill = cg.brush(TQColorGroup::Background); p->setPen( cg.dark() ); p->drawLine(r.topLeft(), r.topRight()); @@ -353,11 +353,11 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, case PE_Indicator: const TQBrush *fill; if (! (flags & Style_Enabled)) - fill = &cg.tqbrush(TQColorGroup::Background); + fill = &cg.brush(TQColorGroup::Background); else if (flags & Style_Down) - fill = &cg.tqbrush(TQColorGroup::Mid); + fill = &cg.brush(TQColorGroup::Mid); else - fill = &cg.tqbrush(TQColorGroup::Base); + fill = &cg.brush(TQColorGroup::Base); drawLightBevel( p, r, cg, flags | Style_Sunken, 2, true, true, fill ); p->setPen(cg.text()); @@ -395,7 +395,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, cr.addCoords( 2, 2, -2, -2 ); ir.addCoords( 3, 3, -3, -3 ); - p->fillRect( r, cg.tqbrush( TQColorGroup::Background ) ); + p->fillRect( r, cg.brush( TQColorGroup::Background ) ); p->setPen( flags & Style_Down ? cg.mid() : ( flags & Style_Enabled ? cg.base() : cg.background() ) ); @@ -440,7 +440,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPixmap pm(r.height(), r.width()); TQPainter p2(&pm); p2.fillRect(0, 0, pm.width(), pm.height(), - cg.tqbrush(TQColorGroup::Highlight)); + cg.brush(TQColorGroup::Highlight)); p2.setPen(cg.highlightedText()); p2.drawText(0, 0, pm.width(), pm.height(), AlignCenter, title); p2.end(); @@ -461,7 +461,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, } } else { if (drawTitle) { - p->fillRect(r, cg.tqbrush(TQColorGroup::Highlight)); + p->fillRect(r, cg.brush(TQColorGroup::Highlight)); p->setPen(cg.highlightedText()); p->drawText(r, AlignCenter, title); } else { @@ -526,7 +526,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.tqbrush( TQColorGroup::Button ) ); + p->fillRect( br, cg.brush( TQColorGroup::Button ) ); break; } @@ -575,14 +575,14 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, drawLightBevel( p, r, cg, flags, ( data.isDefault() ? pixelMetric(PM_DefaultFrameWidth) : data.lineWidth() ), false, false, - &cg.tqbrush( TQColorGroup::Button ) ); + &cg.brush( TQColorGroup::Button ) ); break; case PE_PanelMenuBar: drawLightBevel( p, r, cg, flags, ( data.isDefault() ? pixelMetric(PM_MenuBarFrameWidth) : data.lineWidth() ), false, false, - &cg.tqbrush( TQColorGroup::Button ) ); + &cg.brush( TQColorGroup::Button ) ); break; case PE_ScrollBarSubLine: @@ -608,7 +608,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? + p->fillRect( br, cg.brush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); br.addCoords( 2, 2, -2, -2 ); @@ -642,7 +642,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? + p->fillRect( br, cg.brush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); br.addCoords( 2, 2, -2, -2 ); @@ -673,7 +673,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? + p->fillRect( br, cg.brush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); break; @@ -699,7 +699,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? + p->fillRect( br, cg.brush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); break; @@ -729,7 +729,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, p->drawLine( br.topRight(), br.bottomRight() ); br.addCoords( 1, 1, -1, -1 ); - p->fillRect( br, cg.tqbrush( TQColorGroup::Highlight ) ); + p->fillRect( br, cg.brush( TQColorGroup::Highlight ) ); break; } @@ -911,7 +911,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); p->setPen( cg.mid() ); p->drawLine(r.left() + 12, r.top() + 1, r.right() - 12, r.top() + 1); @@ -923,11 +923,11 @@ void LightStyleV3::drawControl( TQ_ControlElement control, if (flags & Style_Active) qDrawShadePanel(p, r, cg, true, 1, - &cg.tqbrush(TQColorGroup::Midlight)); + &cg.brush(TQColorGroup::Midlight)); else if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); if ( !mi ) break; @@ -955,7 +955,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, if (mi->isChecked() && ! (flags & Style_Active) & (flags & Style_Enabled)) - qDrawShadePanel(p, cr, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); + qDrawShadePanel(p, cr, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); if (mi->iconSet()) { TQIconSet::Mode mode = @@ -1057,16 +1057,16 @@ void LightStyleV3::drawControl( TQ_ControlElement control, case CE_MenuBarEmptyArea: { - p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); + p->fillRect(r, cg.brush(TQColorGroup::Button)); break; } case CE_MenuBarItem: { if ( flags & Style_Active ) - qDrawShadePanel(p, r, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); + qDrawShadePanel(p, r, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); else - p->fillRect( r, cg.tqbrush( TQColorGroup::Button ) ); + p->fillRect( r, cg.brush( TQColorGroup::Button ) ); if (data.isDefault()) break; @@ -1080,7 +1080,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, case CE_ProgressBarGroove: drawLightBevel( p, r, cg, Style_Sunken, pixelMetric( PM_DefaultFrameWidth ), - true, true, &cg.tqbrush( TQColorGroup::Background ) ); + true, true, &cg.brush( TQColorGroup::Background ) ); break; default: @@ -1185,7 +1185,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, if ((controls & SC_ComboBoxArrow) && arrow.isValid()) { drawLightEtch( p, arrow, cg.button(), ( active == SC_ComboBoxArrow ) ); arrow.addCoords( 1, 1, -1, -1 ); - p->fillRect( arrow, cg.tqbrush( TQColorGroup::Button ) ); + p->fillRect( arrow, cg.brush( TQColorGroup::Button ) ); arrow.addCoords(3, 1, -1, -1); tqdrawPrimitive(PE_ArrowDown, p, arrow, cg, flags); } @@ -1196,7 +1196,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, TQRect fr = TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ), widget ); - p->fillRect( fr, cg.tqbrush( TQColorGroup::Highlight ) ); + p->fillRect( fr, cg.brush( TQColorGroup::Highlight ) ); tqdrawPrimitive( PE_FocusRect, p, fr, cg, flags | Style_FocusAtBorder, TQStyleOption(cg.highlight())); @@ -1205,8 +1205,8 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, p->setPen(cg.highlightedText()); } else { p->fillRect( field, ( ( flags & Style_Enabled ) ? - cg.tqbrush( TQColorGroup::Base ) : - cg.tqbrush( TQColorGroup::Background ) ) ); + cg.brush( TQColorGroup::Base ) : + cg.brush( TQColorGroup::Background ) ) ); p->setPen( cg.text() ); } } @@ -1236,7 +1236,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, p->drawLine( up.topLeft(), up.bottomLeft() ); up.addCoords( 1, 0, 0, 0 ); - p->fillRect( up, cg.tqbrush( TQColorGroup::Button ) ); + p->fillRect( up, cg.brush( TQColorGroup::Button ) ); drawLightEtch( p, up, cg.button(), ( active == SC_SpinWidgetUp ) ); up.addCoords( 1, 0, 0, 0 ); @@ -1254,7 +1254,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, p->drawLine( down.topLeft(), down.bottomLeft() ); down.addCoords( 1, 0, 0, 0 ); - p->fillRect( down, cg.tqbrush( TQColorGroup::Button ) ); + p->fillRect( down, cg.brush( TQColorGroup::Button ) ); drawLightEtch( p, down, cg.button(), ( active == SC_SpinWidgetDown ) ); down.addCoords( 1, 0, 0, 0 ); -- cgit v1.2.1