From 34553b6ef4ad31cad512b6538bc703ac7ca09337 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:19:57 +0900 Subject: [PATCH] Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro --- style/qtcurve.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp index 054b24d..d0b0055 100644 --- a/style/qtcurve.cpp +++ b/style/qtcurve.cpp @@ -6110,9 +6110,9 @@ void QtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, cons if(!sunken && !editable && !(opts.thin&THIN_FRAMES) && ((MO_GLOW==opts.coloredMouseOver && flags&Style_MouseOver)/* || (FOCUS_FULL==opts.focus && flags&Style_HasFocus)*/ || glowFocus)) - drawGlow(p, widget ? TQT_TQRECT_OBJECT(ceData.rect) : r, cg, WIDGET_COMBO, glowFocus ? itsFocusCols : NULL); + drawGlow(p, widget ? ceData.rect : r, cg, WIDGET_COMBO, glowFocus ? itsFocusCols : NULL); else - drawEtch(p, widget ? TQT_TQRECT_OBJECT(ceData.rect) : r, cg, + drawEtch(p, widget ? ceData.rect : r, cg, !editable && EFFECT_SHADOW==opts.buttonEffect && !sunken, editable && (opts.square&SQUARE_ENTRY)); } @@ -6246,7 +6246,7 @@ void QtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, cons } if(doEtch) - drawEtch(p, ceData.widgetObjectTypes.contains("TQSpinWidget") ? TQT_TQRECT_OBJECT(ceData.rect) : r, cg, false, (opts.square&SQUARE_ENTRY)); + drawEtch(p, ceData.widgetObjectTypes.contains("TQSpinWidget") ? ceData.rect : r, cg, false, (opts.square&SQUARE_ENTRY)); } itsFormMode=false; break;