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>

1 files changed, 13 insertions, 13 deletions

diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 418a48fb..484aec19 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -111,7 +111,7 @@ bool dotNETstyle::inheritsTDEHTML(const TQWidget* w) const
 
 void dotNETstyle::polish(const 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 (!qstrcmp(tqApp->argv()[0], "kicker") || ceData.widgetObjectTypes.contains("Kicker"))
@@ -124,7 +124,7 @@ void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElement
 	// to update the palette again.
 	//	bool extraPalette = false;
 	
-		if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) {
+		if (ceData.widgetObjectTypes.contains("TQComboBox") && !inheritsTDEHTML(widget)) {
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 			updatePalette( (TQComboBox*) widget );
 	// 		extraPalette = true;
@@ -137,10 +137,10 @@ void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElement
 	//	other bad things (see bug #54569)
 	/*
 		if (!widget->ownPalette()) {
-			if (ceData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) {
+			if (ceData.widgetObjectTypes.contains("TQToolBar")) {
 				updatePalette( (TQToolBar*) widget );
 				extraPalette = true;
-			} else if (ceData.widgetObjectTypes.contains(TQMENUBAR_OBJECT_NAME_STRING)) {
+			} else if (ceData.widgetObjectTypes.contains("TQMenuBar")) {
 				updatePalette( (TQMenuBar*) widget );
 				extraPalette = true;
 			}
@@ -153,10 +153,10 @@ void dotNETstyle::unPolish(const TQStyleControlElementData &ceData, ControlEleme
 {
 	winstyle->unPolish(ceData, elementFlags, ptr);
 
-    	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+    	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
-		if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) {
+		if (ceData.widgetObjectTypes.contains("TQComboBox") && !inheritsTDEHTML(widget)) {
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	}
@@ -1871,10 +1871,10 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceD
 			if (!pseudo3D) {
 				return 1;
 			} else {
-				if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING) ||
-				    ceData.widgetObjectTypes.contains(TQMENUBAR_OBJECT_NAME_STRING) ||
-				    ceData.widgetObjectTypes.contains(TQRANGECONTROL_OBJECT_NAME_STRING) ||
-				    ceData.widgetObjectTypes.contains(TQSCROLLVIEW_OBJECT_NAME_STRING)) {
+				if (ceData.widgetObjectTypes.contains("TQPopupMenu") ||
+				    ceData.widgetObjectTypes.contains("TQMenuBar") ||
+				    ceData.widgetObjectTypes.contains("TQRangeControl") ||
+				    ceData.widgetObjectTypes.contains("TQScrollView")) {
 					return 1;
 				} else {
 					return 2;
@@ -2067,10 +2067,10 @@ void dotNETstyle::slotDestroyed()
 
 bool dotNETstyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags, void* source, TQEvent *ev )
 {
-	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQObject")) {
 		TQObject* obj = reinterpret_cast<TQObject*>(source);
 
-		if (obj->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) {
+		if (obj->inherits("TQComboBox")) {
 			if (ev->type() == TQEvent::Enter) {
 				TQWidget *btn = (TQWidget *)obj;
 				if (btn->isEnabled()) {
@@ -2090,7 +2090,7 @@ bool dotNETstyle::objectEventHandler( const TQStyleControlElementData &ceData, C
 					pal.active().color(TQColorGroup::Background));
 				btn->setPalette(pal);
 			}
-		} else if (obj->inherits(TQBUTTON_OBJECT_NAME_STRING)) {
+		} else if (obj->inherits("TQButton")) {
 			TQWidget *btn = (TQWidget *)obj;
 			TQPalette pal = btn->palette();
 			pal.setColor(TQColorGroup::Button,