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 1b3271a8fc)
1 year ago · a32ce76561
parent a148cb8630
commit a32ce76561
2 changed files with 4 additions and 4 deletions
--- 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<TQApplication*>(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<TQWidget*>(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<TQWidget*>(ptr);
--- 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<TQObject*>(source);