diff options
Diffstat (limited to 'tdestyles/keramik')
-rw-r--r-- | tdestyles/keramik/keramik.cpp | 32 | ||||
-rw-r--r-- | tdestyles/keramik/pixmaploader.cpp | 14 |
2 files changed, 23 insertions, 23 deletions
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); } } |