From a32ce765611096e2f0d481b639ecf09c726fcfc8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 12 Jul 2023 09:52:50 +0900 Subject: [PATCH] Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3. Signed-off-by: Michele Calgaro (cherry picked from commit 1b3271a8fcdf6eb05f2453a075d0aa1d90cde974) --- domino/domino.cpp | 6 +++--- domino/eventfilter.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/domino/domino.cpp b/domino/domino.cpp index 214171e..669cb00 100644 --- a/domino/domino.cpp +++ b/domino/domino.cpp @@ -660,7 +660,7 @@ DominoStyle::~DominoStyle() void DominoStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (!ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQApplication")) { return; } TQApplication *app = reinterpret_cast(ptr); @@ -698,7 +698,7 @@ void DominoStyle::polish(TQPalette &p) { void DominoStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (!ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQWidget")) { return; } TQWidget *widget = reinterpret_cast(ptr); @@ -1032,7 +1032,7 @@ void DominoStyle::polish( const TQStyleControlElementData &ceData, ControlElemen void DominoStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (!ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQWidget")) { return; } TQWidget *widget = reinterpret_cast(ptr); diff --git a/domino/eventfilter.cpp b/domino/eventfilter.cpp index af9c9e8..1169f55 100644 --- a/domino/eventfilter.cpp +++ b/domino/eventfilter.cpp @@ -25,7 +25,7 @@ bool DominoStyle::objectEventHandler( const TQStyleControlElementData &ceData, return true; } - if (!ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (!ceData.widgetObjectTypes.contains("TQObject")) { return false; } TQObject* obj = reinterpret_cast(source);