diff options
Diffstat (limited to 'style/qtc_kstyle.cpp')
| -rw-r--r-- | style/qtc_kstyle.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/style/qtc_kstyle.cpp b/style/qtc_kstyle.cpp index 4d479a9..910ec7c 100644 --- a/style/qtc_kstyle.cpp +++ b/style/qtc_kstyle.cpp @@ -392,18 +392,18 @@ void TQtCKStyle::drawPrimitive( PrimitiveElement pe, if (pe == PE_DockWindowHandle) { // Wild workarounds are here. Beware. - TQWidget *widget, *tqparent; + TQWidget *widget, *parent; if (p && p->device()->devType() == TQInternal::Widget) { widget = static_cast<TQWidget*>(p->device()); - tqparent = widget->parentWidget(); + parent = widget->parentWidget(); } else return; // Don't paint on non-widgets // Check if we are a normal toolbar or a hidden dockwidget. - if ( tqparent && - (tqparent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) || // Normal toolbar - (tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) )) // Collapsed dock + if ( parent && + (parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) || // Normal toolbar + (parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) )) // Collapsed dock // Draw a toolbar handle drawKStylePrimitive( KPE_ToolBarHandle, p, widget, r, cg, flags, opt ); @@ -760,12 +760,12 @@ int TQtCKStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const case PM_DockWindowHandleExtent: { - TQWidget* tqparent = 0; + TQWidget* parent = 0; // Check that we are not a normal toolbar or a hidden dockwidget, // in which case we need to adjust the height for font size - if (widget && (tqparent = widget->parentWidget() ) - && !tqparent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) - && !tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) + if (widget && (parent = widget->parentWidget() ) + && !parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) + && !parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) return widget->fontMetrics().lineSpacing(); else |