diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-12 09:58:34 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-13 09:50:52 +0900 |
| commit | f96ebf441342bf58101652bbb1f9da71e1a1fadc (patch) | |
| tree | 583e8222cbbd3a116e66be4884e9f4f6f0f515c0 /style/qtc_tdestyle.cpp | |
| parent | 39f1c0117b0b631d8b6b12cc32dec98e89068f6f (diff) | |
| download | tde-style-qtcurve-f96ebf44.tar.gz tde-style-qtcurve-f96ebf44.zip | |
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit cd1f0752e84b82fee6f7a574dc79e51a39a6584f)
Diffstat (limited to 'style/qtc_tdestyle.cpp')
| -rw-r--r-- | style/qtc_tdestyle.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/style/qtc_tdestyle.cpp b/style/qtc_tdestyle.cpp index 5981f8f..1686705 100644 --- a/style/qtc_tdestyle.cpp +++ b/style/qtc_tdestyle.cpp @@ -121,7 +121,7 @@ TQString TQtCTDEStyle::defaultStyle() void TQtCTDEStyle::polish( 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 ( d->useFilledFrameWorkaround ) @@ -138,7 +138,7 @@ void TQtCTDEStyle::polish( TQStyleControlElementData ceData, ControlElementFlags void TQtCTDEStyle::unPolish( 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 ( d->useFilledFrameWorkaround ) @@ -415,13 +415,13 @@ void TQtCTDEStyle::drawPrimitive( PrimitiveElement pe, // Check if we are a normal toolbar or a hidden dockwidget. if ( parent && - (parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) || // Normal toolbar - (parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) )) // Collapsed dock + (parent->inherits("TQToolBar") || // Normal toolbar + (parent->inherits("TQMainWindow")) )) // Collapsed dock // Draw a toolbar handle drawTDEStylePrimitive( KPE_ToolBarHandle, p, ceData, elementFlags, r, cg, flags, opt, widget ); - else if ( widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) + else if ( widget->inherits("TQDockWindowHandle") ) // Draw a dock window handle drawTDEStylePrimitive( KPE_DockWindowHandle, p, ceData, elementFlags, r, cg, flags, opt, widget ); @@ -779,9 +779,9 @@ int TQtCTDEStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, C // 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->parentWidget() ) - && !parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) - && !parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) - && widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) + && !parent->inherits("TQToolBar") + && !parent->inherits("TQMainWindow") + && widget->inherits("TQDockWindowHandle") ) return widget->fontMetrics().lineSpacing(); else return TQCommonStyle::pixelMetric(m, ceData, elementFlags, widget); @@ -1682,7 +1682,7 @@ int TQtCTDEStyle::styleHint( StyleHint sh, TQStyleControlElementData ceData, Con bool TQtCTDEStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if ( d->useFilledFrameWorkaround ) |