diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 07:41:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 07:41:52 +0000 |
| commit | bf85f02dd35b67007f6732d3c7dc76d7ac7f2a3d (patch) | |
| tree | 3c966548ca8c50ba05e163b7908ec39b51d47c3d /kdefx/kstyle.cpp | |
| parent | b5fb39eb73302856329affac603779129a545abd (diff) | |
| download | tdelibs-bf85f02dd35b67007f6732d3c7dc76d7ac7f2a3d.tar.gz tdelibs-bf85f02dd35b67007f6732d3c7dc76d7ac7f2a3d.zip | |
Update remaining kdelibs inherits() functions to use new object name defines instead of hard coded string literals
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1226843 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdefx/kstyle.cpp')
| -rw-r--r-- | kdefx/kstyle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp index a7602e50f..58caa39b7 100644 --- a/kdefx/kstyle.cpp +++ b/kdefx/kstyle.cpp @@ -575,13 +575,13 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, // Check if we are a normal toolbar or a hidden dockwidget. if ( parent && - (parent->inherits("QToolBar") || // Normal toolbar - (parent->inherits("QMainWindow")) )) // Collapsed dock + (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 ); - else if ( widget->inherits("QDockWindowHandle") ) + else if ( widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) // Draw a dock window handle drawKStylePrimitive( KPE_DockWindowHandle, p, widget, r, cg, flags, opt ); @@ -987,9 +987,9 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const // 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 && (parent = widget->tqparentWidget() ) - && !parent->inherits("QToolBar") - && !parent->inherits("QMainWindow") - && widget->inherits("QDockWindowHandle") ) + && !parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) + && !parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) + && widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) return widget->fontMetrics().lineSpacing(); else return TQCommonStyle::tqpixelMetric(m, widget); |