diff options
Diffstat (limited to 'tdestyles/plastik/plastik.cpp')
| -rw-r--r-- | tdestyles/plastik/plastik.cpp | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 0db70b8a9..ab3382b93 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -148,7 +148,7 @@ class PlastikStylePlugin : public TQStylePlugin } }; -KDE_Q_EXPORT_PLUGIN( PlastikStylePlugin ) +TDE_EXPORT_PLUGIN( PlastikStylePlugin ) // -- end -- PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrollBar), @@ -184,7 +184,7 @@ PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrol if ( _animateProgressBar ) { animationTimer = new TQTimer( this ); - connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) ); + connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) ); } } @@ -197,7 +197,7 @@ void PlastikStyle::updateProgressPos() bool visible = false; for (iter = progAnimWidgets.begin(); iter != progAnimWidgets.end(); ++iter) { - if ( !::tqqt_cast<TQProgressBar*>(iter.key()) ) + if ( !::tqt_cast<TQProgressBar*>(iter.key()) ) continue; pb = dynamic_cast<TQProgressBar*>(iter.key()); @@ -225,7 +225,7 @@ PlastikStyle::~PlastikStyle() void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) @@ -237,39 +237,39 @@ void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? tdehtmlWidgets[widget] = true; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(tdehtmlWidgetDestroyed(TQObject*))); } - // use tqqt_cast where possible to check if the widget inheits one of the classes. might improve + // use tqt_cast where possible to check if the widget inheits one of the classes. might improve // performance compared to TQObject::inherits() - if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQToolButton*>(widget) || widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) + if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQToolButton*>(widget) || widget->inherits("TQSplitterHandle") ) { // widget->setBackgroundMode(PaletteBackground); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQLineEdit*>(widget)) { + } else if (::tqt_cast<TQLineEdit*>(widget)) { installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQTabBar*>(widget)) { + } else if (::tqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(true); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQPopupMenu*>(widget)) { + } else if (::tqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( NoBackground ); } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { installObjectEventHandler(ceData, elementFlags, ptr, this); } - if( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget) ) + if( _animateProgressBar && ::tqt_cast<TQProgressBar*>(widget) ) { installObjectEventHandler(ceData, elementFlags, ptr, this); progAnimWidgets[widget] = 0; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*))); if (!animationTimer->isActive()) animationTimer->start( 50, false ); } @@ -280,32 +280,32 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? tdehtmlWidgets.remove(widget); } - // use tqqt_cast to check if the widget inheits one of the classes. - if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQToolButton*>(widget) || ::tqqt_cast<TQLineEdit*>(widget) || - widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) + // use tqt_cast to check if the widget inheits one of the classes. + if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQToolButton*>(widget) || ::tqt_cast<TQLineEdit*>(widget) || + widget->inherits("TQSplitterHandle") ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if (::tqqt_cast<TQTabBar*>(widget)) { + else if (::tqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(false); removeObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQPopupMenu*>(widget)) { + } else if (::tqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( PaletteBackground ); } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - if ( ::tqqt_cast<TQProgressBar*>(widget) ) + if ( ::tqt_cast<TQProgressBar*>(widget) ) { progAnimWidgets.remove(widget); } @@ -316,12 +316,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj) { - tdehtmlWidgets.remove(TQT_TQWIDGET(obj)); + tdehtmlWidgets.remove(static_cast<TQWidget*>(obj)); } void PlastikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(TQT_TQWIDGET(obj)); + progAnimWidgets.remove(static_cast<TQWidget*>(obj)); } void PlastikStyle::renderContour(TQPainter *p, @@ -664,7 +664,7 @@ void PlastikStyle::renderPixel(TQPainter *p, if(fullAlphaBlend) // full alpha blend: paint into an image with alpha buffer and convert to a pixmap ... { - QRgb rgb = color.rgb(); + TQRgb rgb = color.rgb(); // generate a quite unique key -- use the unused width field to store the alpha value. CacheEntry search(cAlphaDot, alpha, 0, rgb); int key = search.key(); @@ -697,8 +697,8 @@ void PlastikStyle::renderPixel(TQPainter *p, } else // don't use an alpha buffer: calculate the resulting color from the alpha value, the fg- and the bg-color. { - QRgb rgb_a = color.rgb(); - QRgb rgb_b = background.rgb(); + TQRgb rgb_a = color.rgb(); + TQRgb rgb_b = background.rgb(); int a = alpha; if(a>255) a = 255; if(a<0) a = 0; @@ -827,7 +827,7 @@ void PlastikStyle::renderGradient(TQPainter *painter, int r_w = result->rect().width(); int r_h = result->rect().height(); int r_x, r_y, r_x2, r_y2; - TQT_TQRECT_OBJECT(result->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); + result->rect().coords(&r_x, &r_y, &r_x2, &r_y2); int rDiff, gDiff, bDiff; int rc, gc, bc; @@ -894,7 +894,7 @@ void PlastikStyle::renderPanel(TQPainter *p, if (kickerMode && p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame") { + TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame") { // Stolen wholesale from Keramik. I don't like it, but oh well. if (sunken) { const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; @@ -1451,7 +1451,7 @@ void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe, } -void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, +void PlastikStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2159,7 +2159,7 @@ void PlastikStyle::drawPrimitive(TQ_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 { @@ -2181,7 +2181,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, } -void PlastikStyle::drawControl(TQ_ControlElement element, +void PlastikStyle::drawControl(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2682,20 +2682,20 @@ 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 ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - 1; TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, r.y() + r.height() / 2 - dim / 2, dim, dim), r ); @@ -2737,7 +2737,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, } } -void PlastikStyle::drawControlMask(TQ_ControlElement element, +void PlastikStyle::drawControlMask(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2759,7 +2759,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element, } } -void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, +void PlastikStyle::drawComplexControlMask(ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2782,7 +2782,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, } } -void PlastikStyle::drawComplexControl(TQ_ComplexControl control, +void PlastikStyle::drawComplexControl(ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -3013,7 +3013,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, const TQSpinWidget *sw = dynamic_cast<const TQSpinWidget *>(widget); SFlags sflags = flags; - TQ_PrimitiveElement pe; + PrimitiveElement pe; bool hasFocus = false; if (sw) @@ -3199,7 +3199,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, } } -TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, +TQRect PlastikStyle::querySubControlMetrics(ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -3346,7 +3346,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce return 1; case PM_DefaultFrameWidth: { - if(widget && ::tqqt_cast<TQPopupMenu*>(widget)) + if(widget && ::tqt_cast<TQPopupMenu*>(widget)) return 1; else return 2; @@ -3452,7 +3452,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, case CT_ToolButton: { - if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) ) + if(widget->parent() && ::tqt_cast<TQToolBar*>(widget->parent()) ) return TQSize( s.width()+2*4, s.height()+2*4 ); else return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); @@ -3465,7 +3465,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); } -int PlastikStyle::styleHint( TQ_StyleHint stylehint, +int PlastikStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, @@ -3497,13 +3497,13 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) ) return true; - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* obj = reinterpret_cast<TQObject*>(source); if (!obj->isWidgetType() ) return false; // Track show events for progress bars - if ( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(obj) ) + if ( _animateProgressBar && ::tqt_cast<TQProgressBar*>(obj) ) { if ((ev->type() == TQEvent::Show) && !animationTimer->isActive()) { @@ -3512,7 +3512,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, } if ( !qstrcmp(obj->name(), "tde toolbar widget") ) { - TQWidget* lb = TQT_TQWIDGET(obj); + TQWidget* lb = static_cast<TQWidget*>(obj); if (lb->backgroundMode() == TQt::PaletteButton) lb->setBackgroundMode(TQt::PaletteBackground); removeObjectEventHandler(ceData, elementFlags, source, this); |
