diff options
Diffstat (limited to 'tdestyles/keramik/keramik.cpp')
| -rw-r--r-- | tdestyles/keramik/keramik.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index 23642ac99..1955554ba 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -423,7 +423,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void KeramikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(static_cast<TQProgressBar*>(TQT_TQWIDGET(obj))); + progAnimWidgets.remove(static_cast<TQProgressBar*>(obj)); } @@ -487,13 +487,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *parent = (widget)?TQT_TQWIDGET(widget->parentWidget()):(TQWidget*)NULL; + TQWidget *parent = (widget)?widget->parentWidget():NULL; int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = TQT_TQWIDGET(parent->parent()); + parent = static_cast<TQWidget*>(parent->parent()); } TQRect pr = ceData.parentWidgetData.rect; @@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, if (kickerMode) { if (p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(p->device())->className()) == "FittsLawFrame" ) + TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame" ) { int x2 = x + r.width() - 1; int y2 = y + r.height() - 1; @@ -1284,7 +1284,7 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQToolBar* parent = 0; if (widget && widget->parent() && widget->parent()->inherits("TQToolBar")) - parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent())); + parent = static_cast<TQToolBar*>(widget->parent()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal)); if (flags & Style_Horizontal) { @@ -2312,8 +2312,8 @@ void KeramikStyle::drawComplexControl( ComplexControl control, { // This assumes floating toolbars can't have extenders, //(so if we're on an extender, we're not floating) - TQWidget* parent = static_cast<TQWidget*> (TQT_TQWIDGET(widget->parent())); - TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(parent->parent())); + TQWidget* parent = static_cast<TQWidget*> (static_cast<TQWidget*>(widget->parent())); + TQToolBar* toolbar = static_cast<TQToolBar*>(parent->parent()); TQRect tr = ceData.parentWidgetData.rect; bool horiz = ceData.toolBarData.orientation == TQt::Horizontal; @@ -2809,7 +2809,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, recursion = true; object->event( static_cast<TQPaintEvent*>( event ) ); - TQWidget* widget = TQT_TQWIDGET( object ); + TQWidget* widget = static_cast<TQWidget*>( object ); TQPainter p( widget ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, widget->palette().color( TQPalette::Active, TQColorGroup::Button ), @@ -2826,7 +2826,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, //Combo dropdowns are shaped case TQEvent::Resize: { - TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object)); + TQListBox* listbox = static_cast<TQListBox*>(object); TQResizeEvent* resize = static_cast<TQResizeEvent*>(event); if (resize->size().height() < 6) return false; @@ -2892,7 +2892,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, firstComboPopupRelease = false; TQMouseEvent* mev = static_cast<TQMouseEvent*>(event); - TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object)); + TQListBox* box = static_cast<TQListBox*>(object); TQWidget* parent = box->parentWidget(); if (!parent) @@ -2919,7 +2919,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { // Draw a gradient background for custom widgets in the toolbar // that have specified a "tde toolbar widget" name. - renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object)); + renderToolbarWidgetBackground(0, ceData, elementFlags, static_cast<TQWidget*>(object)); return false; // Now draw the contents } @@ -2931,8 +2931,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { // We need to override the paint event to draw a // gradient on a QToolBarExtensionWidget. - TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(object->parent())); - TQWidget* widget = TQT_TQWIDGET(object); + TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent()); + TQWidget* widget = static_cast<TQWidget*>(object); TQRect wr = widget->rect (), tr = toolbar->rect(); TQPainter p( widget ); |