From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kstyles/plastik/config/plastikconf.cpp | 36 +++---- kstyles/plastik/misc.cpp | 6 +- kstyles/plastik/plastik.cpp | 190 ++++++++++++++++----------------- kstyles/plastik/plastik.h | 14 +-- 4 files changed, 123 insertions(+), 123 deletions(-) (limited to 'kstyles/plastik') diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastikconf.cpp index 70d4f6cfa..4ad31ef26 100644 --- a/kstyles/plastik/config/plastikconf.cpp +++ b/kstyles/plastik/config/plastikconf.cpp @@ -49,7 +49,7 @@ extern "C" PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) { //Should have no margins here, the dialog provides them - TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0); KGlobal::locale()->insertCatalogue("kstyle_plastik_config"); // scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this); @@ -62,33 +62,33 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) customFocusHighlightColor = new TQCheckBox(i18n("Custom text input highlight color:"), this); TQHBox *hbox1 = new TQHBox(this); - hbox1->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) ); + hbox1->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) ); focusHighlightColor = new KColorButton(hbox1); customOverHighlightColor = new TQCheckBox(i18n("Custom mouseover highlight color:"), this); TQHBox *hbox2 = new TQHBox(this); - hbox2->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) ); + hbox2->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) ); overHighlightColor = new KColorButton(hbox2); customCheckMarkColor = new TQCheckBox(i18n("Custom checkmark color:"), this); TQHBox *hbox3 = new TQHBox(this); - hbox3->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) ); + hbox3->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) ); checkMarkColor = new KColorButton(hbox3); -// layout->add(scrollBarLines); - layout->add(animateProgressBar); - layout->add(drawToolBarSeparator); - layout->add(drawToolBarItemSeparator); -// layout->add(drawFocusRect); - layout->add(drawTriangularExpander); - layout->add(inputFocusHighlight); - layout->add(customFocusHighlightColor); - layout->add(hbox1); - layout->add(customOverHighlightColor); - layout->add(hbox2); - layout->add(customCheckMarkColor); - layout->add(hbox3); - layout->addStretch(1); +// tqlayout->add(scrollBarLines); + tqlayout->add(animateProgressBar); + tqlayout->add(drawToolBarSeparator); + tqlayout->add(drawToolBarItemSeparator); +// tqlayout->add(drawFocusRect); + tqlayout->add(drawTriangularExpander); + tqlayout->add(inputFocusHighlight); + tqlayout->add(customFocusHighlightColor); + tqlayout->add(hbox1); + tqlayout->add(customOverHighlightColor); + tqlayout->add(hbox2); + tqlayout->add(customCheckMarkColor); + tqlayout->add(hbox3); + tqlayout->addStretch(1); TQSettings s; // origScrollBarLines = s.readBoolEntry("/plastikstyle/Settings/scrollBarLines", false); diff --git a/kstyles/plastik/misc.cpp b/kstyles/plastik/misc.cpp index e1fc2df79..d1a52d61e 100644 --- a/kstyles/plastik/misc.cpp +++ b/kstyles/plastik/misc.cpp @@ -30,9 +30,9 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i if(alpha<0) alpha = 0; int inv_alpha = 255 - alpha; - TQColor result = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255, - qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255, - qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) ); + TQColor result = TQColor( tqRgb(tqRed(rgb_b)*inv_alpha/255 + tqRed(rgb)*alpha/255, + tqGreen(rgb_b)*inv_alpha/255 + tqGreen(rgb)*alpha/255, + tqBlue(rgb_b)*inv_alpha/255 + tqBlue(rgb)*alpha/255) ); return result; } diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index dd7954cc9..a148b953c 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -74,7 +74,7 @@ // some bitmaps for the radio button so it's easier to handle the circle stuff... // 13x13 -static const unsigned char radiobutton_mask_bits[] = { +static const unsigned char radiobutton_tqmask_bits[] = { 0xf8, 0x03, 0xfc, 0x07, 0xfe, 0x0f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07, 0xf8, 0x03}; @@ -662,7 +662,7 @@ void PlastikStyle::renderPixel(TQPainter *p, int key = search.key(); CacheEntry *cacheEntry; - if( (cacheEntry = pixmapCache->find(key)) ) { + if( (cacheEntry = pixmapCache->tqfind(key)) ) { if( search == *cacheEntry ) { // match! we can draw now... if(cacheEntry->pixmap) p->drawPixmap(pos, *(cacheEntry->pixmap) ); @@ -675,7 +675,7 @@ void PlastikStyle::renderPixel(TQPainter *p, TQImage aImg(1,1,32); // 1x1 aImg.setAlphaBuffer(true); - aImg.setPixel(0,0,qRgba(qRed(rgb),qGreen(rgb),qBlue(rgb),alpha)); + aImg.setPixel(0,0,tqRgba(tqRed(rgb),tqGreen(rgb),tqBlue(rgb),alpha)); TQPixmap *result = new TQPixmap(aImg); p->drawPixmap(pos, *result); @@ -696,9 +696,9 @@ void PlastikStyle::renderPixel(TQPainter *p, if(a<0) a = 0; int a_inv = 255 - a; - TQColor res = TQColor( qRgb(qRed(rgb_b)*a_inv/255 + qRed(rgb_a)*a/255, - qGreen(rgb_b)*a_inv/255 + qGreen(rgb_a)*a/255, - qBlue(rgb_b)*a_inv/255 + qBlue(rgb_a)*a/255) ); + TQColor res = TQColor( tqRgb(tqRed(rgb_b)*a_inv/255 + tqRed(rgb_a)*a/255, + tqGreen(rgb_b)*a_inv/255 + tqGreen(rgb_a)*a/255, + tqBlue(rgb_b)*a_inv/255 + tqBlue(rgb_a)*a/255) ); p->setPen(res); p->drawPoint(pos); } @@ -798,7 +798,7 @@ void PlastikStyle::renderGradient(TQPainter *painter, int key = search.key(); CacheEntry *cacheEntry; - if( (cacheEntry = pixmapCache->find(key)) ) { + if( (cacheEntry = pixmapCache->tqfind(key)) ) { if( search == *cacheEntry ) { // match! we can draw now... if(cacheEntry->pixmap) { painter->drawTiledPixmap(rect, *(cacheEntry->pixmap) ); @@ -1143,7 +1143,7 @@ void PlastikStyle::renderTab(TQPainter *p, // fake the panel border edge for tabs which are aligned left-most // (i.e. only if there is no widget in the corner of the tabwidget!) if(isFirst&&!reverseLayout&&!cornerWidget) - // normal layout + // normal tqlayout { if (!bottom) { p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) ); @@ -1165,7 +1165,7 @@ void PlastikStyle::renderTab(TQPainter *p, p->drawPoint(Rb.x()+1, Rb.bottom() ); } } else if(isFirst&&reverseLayout&&!cornerWidget) - // reverse layout + // reverse tqlayout { if (!bottom) { p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) ); @@ -1266,16 +1266,16 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, p->drawPoint(xcenter+5-4, ycenter+8); - TQRegion mask(xcenter-4, ycenter-5, 9, 13); - mask -= TQRegion(xcenter-4, ycenter+4, 1, 4); - mask -= TQRegion(xcenter-3, ycenter+5, 1, 3); - mask -= TQRegion(xcenter-2, ycenter+6, 1, 2); - mask -= TQRegion(xcenter-1, ycenter+7, 1, 1); - mask -= TQRegion(xcenter+1, ycenter+7, 1, 1); - mask -= TQRegion(xcenter+2, ycenter+6, 1, 2); - mask -= TQRegion(xcenter+3, ycenter+5, 1, 3); - mask -= TQRegion(xcenter+4, ycenter+4, 1, 4); - p->setClipRegion(mask); + TQRegion tqmask(xcenter-4, ycenter-5, 9, 13); + tqmask -= TQRegion(xcenter-4, ycenter+4, 1, 4); + tqmask -= TQRegion(xcenter-3, ycenter+5, 1, 3); + tqmask -= TQRegion(xcenter-2, ycenter+6, 1, 2); + tqmask -= TQRegion(xcenter-1, ycenter+7, 1, 1); + tqmask -= TQRegion(xcenter+1, ycenter+7, 1, 1); + tqmask -= TQRegion(xcenter+2, ycenter+6, 1, 2); + tqmask -= TQRegion(xcenter+3, ycenter+5, 1, 3); + tqmask -= TQRegion(xcenter+4, ycenter+4, 1, 4); + p->setClipRegion(tqmask); uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Round_UpperLeft|Round_UpperRight|Is_Horizontal; if(!enabled) surfaceFlags |= Is_Disabled; @@ -1316,16 +1316,16 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, p->drawPoint(xcenter+8, ycenter-5+4); p->drawPoint(xcenter+8, ycenter+5-4); - TQRegion mask(xcenter-5, ycenter-4, 13, 9); - mask -= TQRegion(xcenter+4, ycenter-4, 4, 1); - mask -= TQRegion(xcenter+5, ycenter-3, 3, 1); - mask -= TQRegion(xcenter+6, ycenter-2, 2, 1); - mask -= TQRegion(xcenter+7, ycenter-1, 1, 1); - mask -= TQRegion(xcenter+7, ycenter+1, 1, 1); - mask -= TQRegion(xcenter+6, ycenter+2, 2, 1); - mask -= TQRegion(xcenter+5, ycenter+3, 3, 1); - mask -= TQRegion(xcenter+4, ycenter+4, 4, 1); - p->setClipRegion(mask); + TQRegion tqmask(xcenter-5, ycenter-4, 13, 9); + tqmask -= TQRegion(xcenter+4, ycenter-4, 4, 1); + tqmask -= TQRegion(xcenter+5, ycenter-3, 3, 1); + tqmask -= TQRegion(xcenter+6, ycenter-2, 2, 1); + tqmask -= TQRegion(xcenter+7, ycenter-1, 1, 1); + tqmask -= TQRegion(xcenter+7, ycenter+1, 1, 1); + tqmask -= TQRegion(xcenter+6, ycenter+2, 2, 1); + tqmask -= TQRegion(xcenter+5, ycenter+3, 3, 1); + tqmask -= TQRegion(xcenter+4, ycenter+4, 4, 1); + p->setClipRegion(tqmask); uint surfaceFlags = Draw_Left|Draw_Top|Draw_Bottom|Round_UpperLeft|Round_BottomLeft| Round_UpperRight|Is_Horizontal; if(!enabled) @@ -1515,7 +1515,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, case PE_ButtonTool: case PE_ButtonDropDown: case PE_ButtonCommand: { - bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget()); + bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.tqcontains(opt.widget()); renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode ); break; } @@ -1732,7 +1732,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, TQColor contentColor = enabled?cg.base():cg.background(); TQBitmap bmp; - bmp = TQBitmap(13, 13, radiobutton_mask_bits, true); + bmp = TQBitmap(13, 13, radiobutton_tqmask_bits, true); // first the surface... uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom|Is_Horizontal; if(!enabled) { @@ -1806,7 +1806,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, p->fillRect(r, color0); TQBitmap bmp; - bmp = TQBitmap(13, 13, radiobutton_mask_bits, true); + bmp = TQBitmap(13, 13, radiobutton_tqmask_bits, true); bmp.setMask(bmp); p->setPen(color1); p->drawPixmap(x, y, bmp); @@ -2094,11 +2094,11 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, } } - const TQWMatrix oldMatrix( p->worldMatrix() ); + const TQWMatrix oldMatrix( p->tqworldMatrix() ); if (flags & Style_Down) { - p->translate(pixelMetric(PM_ButtonShiftHorizontal), - pixelMetric(PM_ButtonShiftVertical)); + p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), + tqpixelMetric(PM_ButtonShiftVertical)); } a.translate((r.x()+r.width()/2), (r.y()+r.height()/2)); @@ -2138,7 +2138,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, } -void PlastikStyle::drawControl(ControlElement element, +void PlastikStyle::tqdrawControl(ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2211,15 +2211,15 @@ void PlastikStyle::drawControl(ControlElement element, reverseLayout ? Draw_Left|Draw_Right|Draw_Top|Draw_Bottom|Round_UpperLeft|Round_BottomLeft : Draw_Left|Draw_Right|Draw_Top|Draw_Bottom|Round_UpperRight|Round_BottomRight); - TQRegion mask(Rsurface); + TQRegion tqmask(Rsurface); if(reverseLayout) { - mask -= TQRegion(Rsurface.left(), Rsurface.top(), 1, 1); - mask -= TQRegion(Rsurface.left(), Rsurface.bottom(), 1, 1); + tqmask -= TQRegion(Rsurface.left(), Rsurface.top(), 1, 1); + tqmask -= TQRegion(Rsurface.left(), Rsurface.bottom(), 1, 1); } else { - mask -= TQRegion(Rsurface.right(), Rsurface.top(), 1, 1); - mask -= TQRegion(Rsurface.right(), Rsurface.bottom(), 1, 1); + tqmask -= TQRegion(Rsurface.right(), Rsurface.top(), 1, 1); + tqmask -= TQRegion(Rsurface.right(), Rsurface.bottom(), 1, 1); } - p->setClipRegion(mask); + p->setClipRegion(tqmask); int counter = 0; TQPixmap surfaceTile(21, r.height()-2); TQPainter surfacePainter(&surfaceTile); @@ -2263,9 +2263,9 @@ void PlastikStyle::drawControl(ControlElement element, if (!_animateProgressBar) { staticShift = (reverseLayout ? Rsurface.left() : Rsurface.right()) % 40 - 40; } else { - // find the animation Offset for the current Widget + // tqfind the animation Offset for the current Widget TQWidget* nonConstWidget = const_cast(widget); - TQMapConstIterator iter = progAnimWidgets.find(nonConstWidget); + TQMapConstIterator iter = progAnimWidgets.tqfind(nonConstWidget); if (iter != progAnimWidgets.end()) animShift = iter.data(); } @@ -2300,7 +2300,7 @@ void PlastikStyle::drawControl(ControlElement element, if(cw) cornerWidget = true; } - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = tb->tqshape(); bool selected = false; if (flags & Style_Selected) selected = true; TabPosition pos; @@ -2336,7 +2336,7 @@ void PlastikStyle::drawControl(ControlElement element, renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget); break; default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } break; @@ -2379,15 +2379,15 @@ void PlastikStyle::drawControl(ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric(PM_ButtonShiftHorizontal, widget); - y += pixelMetric(PM_ButtonShiftVertical, widget); + x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); + y += tqpixelMetric(PM_ButtonShiftVertical, widget); flags |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); if ( button->iconSet() && !button->iconSet()->isNull() && (dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w ) { @@ -2396,7 +2396,7 @@ void PlastikStyle::drawControl(ControlElement element, else { p->setPen(cg.buttonText()); - drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), + drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), cg, flags, opt ); w -= dx; } @@ -2422,7 +2422,7 @@ void PlastikStyle::drawControl(ControlElement element, p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap ); if (cornArrow) //Draw over the icon - drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), + drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), cg, flags, opt ); @@ -2432,14 +2432,14 @@ void PlastikStyle::drawControl(ControlElement element, } // Make the label indicate if the button is a default button or not - drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(), + drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->tqcolorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, - &button->colorGroup().buttonText() ); + &button->tqcolorGroup().buttonText() ); if ( flags & Style_HasFocus ) drawPrimitive( PE_FocusRect, p, - visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), + tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags ); break; } @@ -2489,7 +2489,7 @@ void PlastikStyle::drawControl(ControlElement element, bool enabled = mi->isEnabled(); bool checkable = popupmenu->isCheckable(); bool active = flags & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText ); + bool etchtext = tqstyleHint( SH_EtchDisabledText ); bool reverse = TQApplication::reverseLayout(); if ( checkable ) checkcol = QMAX( checkcol, 20 ); @@ -2524,7 +2524,7 @@ void PlastikStyle::drawControl(ControlElement element, break; } - TQRect cr = visualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r ); + TQRect cr = tqvisualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r ); // Do we have an icon? if ( mi->iconSet() ) { @@ -2605,7 +2605,7 @@ void PlastikStyle::drawControl(ControlElement element, TQString s = mi->text(); // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = 2; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -2668,8 +2668,8 @@ void PlastikStyle::drawControl(ControlElement element, // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator) - 1; - TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1; + TQRect vr = tqvisualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, r.y() + r.height() / 2 - dim / 2, dim, dim), r ); // Draw an arrow at the far end of the menu item @@ -2705,11 +2705,11 @@ void PlastikStyle::drawControl(ControlElement element, break; default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void PlastikStyle::drawControlMask(ControlElement element, +void PlastikStyle::tqdrawControlMask(ControlElement element, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -2724,12 +2724,12 @@ void PlastikStyle::drawControlMask(ControlElement element, } default: { - KStyle::drawControlMask (element, p, w, r, opt); + KStyle::tqdrawControlMask (element, p, w, r, opt); } } } -void PlastikStyle::drawComplexControlMask(ComplexControl c, +void PlastikStyle::tqdrawComplexControlMask(ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -2745,12 +2745,12 @@ void PlastikStyle::drawComplexControlMask(ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, w, r, o); + KStyle::tqdrawComplexControlMask (c, p, w, r, o); } } } -void PlastikStyle::drawComplexControl(ComplexControl control, +void PlastikStyle::tqdrawComplexControl(ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2785,7 +2785,7 @@ void PlastikStyle::drawComplexControl(ComplexControl control, :cg.background(); uint contourFlags = 0; - if( khtmlWidgets.contains(cb) ) + if( khtmlWidgets.tqcontains(cb) ) contourFlags |= Draw_AlphaBlend; if (_inputFocusHighlight && hasFocus && editable && enabled) @@ -2951,10 +2951,10 @@ void PlastikStyle::drawComplexControl(ComplexControl control, // If we're pressed, on, or raised... if (bflags & (Style_Down | Style_On | Style_Raised) || widget==hoverWidget ) { drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); - } else if (tb->parentWidget() && - tb->parentWidget()->backgroundPixmap() && - !tb->parentWidget()->backgroundPixmap()->isNull()) { - TQPixmap pixmap = *(tb->parentWidget()->backgroundPixmap()); + } else if (tb->tqparentWidget() && + tb->tqparentWidget()->backgroundPixmap() && + !tb->tqparentWidget()->backgroundPixmap()->isNull()) { + TQPixmap pixmap = *(tb->tqparentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, tb->pos() ); } } @@ -3140,7 +3140,7 @@ void PlastikStyle::drawComplexControl(ComplexControl control, } default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; @@ -3245,15 +3245,15 @@ TQRect PlastikStyle::querySubControlMetrics(ComplexControl control, } } -int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { // TABS // ---- case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if (tb->shape() == TQTabBar::RoundedAbove || - tb->shape() == TQTabBar::RoundedBelow) + if (tb->tqshape() == TQTabBar::RoundedAbove || + tb->tqshape() == TQTabBar::RoundedBelow) return 12; else return 4; @@ -3342,7 +3342,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -3364,8 +3364,8 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, bool checkable = popup->isCheckable(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (!mi->custom()->fullSpan() ) h += 4; } else if (mi->widget()) { @@ -3386,7 +3386,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, } } - if (!mi->text().isNull() && (mi->text().find('\t') >= 0)) { + if (!mi->text().isNull() && (mi->text().tqfind('\t') >= 0)) { w += itemHMargin + itemFrame*2 + 7; } else if (mi->popup()) { w += 2 * arrowHMargin; @@ -3411,8 +3411,8 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, { const TQPushButton* btn = static_cast(widget); - int w = s.width() + 2 * pixelMetric(PM_ButtonMargin, widget); - int h = s.height() + 2 * pixelMetric(PM_ButtonMargin, widget); + int w = s.width() + 2 * tqpixelMetric(PM_ButtonMargin, widget); + int h = s.height() + 2 * tqpixelMetric(PM_ButtonMargin, widget); if ( btn->text().isEmpty() && s.width() < 32 ) return TQSize(w, h); return TQSize( w+25, h+5 ); @@ -3433,7 +3433,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, return KStyle::sizeFromContents (t, widget, s, opt); } -int PlastikStyle::styleHint( StyleHint stylehint, +int PlastikStyle::tqstyleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, QStyleHintReturn* returnData ) const @@ -3443,7 +3443,7 @@ int PlastikStyle::styleHint( StyleHint stylehint, return 96; // Motif-like delay... default: - return KStyle::styleHint(stylehint, widget, option, returnData); + return KStyle::tqstyleHint(stylehint, widget, option, returnData); } } @@ -3458,19 +3458,19 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) if ( ::qt_cast(obj) ) { TQWidget* widget = static_cast(obj); - if ( ::qt_cast(widget->parentWidget()) ) + if ( ::qt_cast(widget->tqparentWidget()) ) { - TQWidget* spinbox = widget->parentWidget(); + TQWidget* spinbox = widget->tqparentWidget(); if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - spinbox->repaint(false); + spinbox->tqrepaint(false); } return false; } if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - widget->repaint(false); + widget->tqrepaint(false); } return false; } @@ -3484,13 +3484,13 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) { TQWidget* button = static_cast(obj); hoverWidget = button; - button->repaint(false); + button->tqrepaint(false); } else if ((ev->type() == TQEvent::Leave) && (obj == hoverWidget) ) { TQWidget* button = static_cast(obj); hoverWidget = 0; - button->repaint(false); + button->tqrepaint(false); } return false; } @@ -3500,7 +3500,7 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* tabbar = static_cast(obj); hoverWidget = tabbar; hoverTab = 0; - tabbar->repaint(false); + tabbar->tqrepaint(false); } else if (ev->type() == TQEvent::MouseMove) { @@ -3508,18 +3508,18 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQMouseEvent *me = dynamic_cast(ev); if (tabbar && me) { - // avoid unnecessary repaints (which otherwise would occour on every + // avoid unnecessary tqrepaints (which otherwise would occour on every // MouseMove event causing high cpu load). - bool repaint = true; + bool tqrepaint = true; TQTab *tab = tabbar->selectTab(me->pos() ); if (hoverTab == tab) - repaint = false; + tqrepaint = false; hoverTab = tab; - if (repaint) - tabbar->repaint(false); + if (tqrepaint) + tabbar->tqrepaint(false); } } else if (ev->type() == TQEvent::Leave) @@ -3527,7 +3527,7 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* tabbar = static_cast(obj); hoverWidget = 0; hoverTab = 0; - tabbar->repaint(false); + tabbar->tqrepaint(false); } return false; } diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h index 9b38d764c..7ddc6c183 100644 --- a/kstyles/plastik/plastik.h +++ b/kstyles/plastik/plastik.h @@ -81,7 +81,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawControl(ControlElement element, + void tqdrawControl(ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -89,9 +89,9 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; + void tqdrawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; - void drawComplexControl(ComplexControl control, + void tqdrawComplexControl(ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -101,7 +101,7 @@ public: SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - int pixelMetric(PixelMetric m, + int tqpixelMetric(PixelMetric m, const TQWidget *widget = 0 ) const; TQRect subRect(SubRect r, @@ -112,7 +112,7 @@ public: SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawComplexControlMask(TQStyle::ComplexControl c, + void tqdrawComplexControlMask(TQStyle::ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -123,7 +123,7 @@ public: const TQSize &s, const TQStyleOption &o) const; - int styleHint(StyleHint, const TQWidget * = 0, + int tqstyleHint(StyleHint, const TQWidget * = 0, const TQStyleOption & = TQStyleOption::Default, QStyleHintReturn * = 0 ) const; @@ -326,7 +326,7 @@ private: { // create an int key from the properties which is used to refer to entries in the TQIntCache. // the result may not be 100% correct as we don't have so much space in one integer -- use - // == operator after find to make sure we got the right one. :) + // == operator after tqfind to make sure we got the right one. :) return horizontal ^ (type<<1) ^ (width<<5) ^ (height<<10) ^ (c1Rgb<<19) ^ (c2Rgb<<22); } -- cgit v1.2.1