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 666848e9d8f532fa2c6d8516bcbc97a4b8ec72d7)

4 files changed, 10 insertions, 10 deletions

diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h
index 8fff837..2c39790 100644
--- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h
@@ -51,7 +51,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
     {
 	t = settings.find((*it)->name());
 
-	if((*it)->inherits(TQCHECKBOX_OBJECT_NAME_STRING))
+	if((*it)->inherits("TQCheckBox"))
 	{
 	    TQCheckBox *c = dynamic_cast<TQCheckBox *>(*it);
 
@@ -63,7 +63,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 		    (*t).second.bVal = c->isChecked();
 	    }
 	}
-	else if((*it)->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
+	else if((*it)->inherits("TQButtonGroup"))
 	{
 	    TQButtonGroup *c = dynamic_cast<TQButtonGroup *>(*it);
 
@@ -75,7 +75,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 		    (*t).second.iVal = c->selectedId();
 	    }
 	}
-	else if((*it)->inherits(TQSLIDER_OBJECT_NAME_STRING))
+	else if((*it)->inherits("TQSlider"))
 	{
 	    TQSlider *c = dynamic_cast<TQSlider *>(*it);
 
@@ -115,7 +115,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 	    }
 	}
 	// TQSpinBox should be checked after KDoubleSpinBox !
-	else if((*it)->inherits(TQSPINBOX_OBJECT_NAME_STRING))
+	else if((*it)->inherits("TQSpinBox"))
 	{
 	    TQSpinBox *c = dynamic_cast<TQSpinBox *>(*it);
 
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
index 9b08d0a..c93f0d9 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
@@ -118,7 +118,7 @@ void SQ_ImageProperties::setFileParams()
         TQObjectList *ch = const_cast<TQObjectList *>(kew1->children());
         for(TQObjectList::iterator it = ch->begin();it != ch->end();++it)
         {
-            if((*it)->inherits(TQLISTVIEW_OBJECT_NAME_STRING))
+            if((*it)->inherits("TQListView"))
             {
                 TQListView *l = dynamic_cast<TQListView *>(*it);
                 TQWidget   *w = tabWidget->page(3);
diff --git a/ksquirrel/sq_codecsettingsskeleton.ui.h b/ksquirrel/sq_codecsettingsskeleton.ui.h
index 1c0cdce..d976149 100644
--- a/ksquirrel/sq_codecsettingsskeleton.ui.h
+++ b/ksquirrel/sq_codecsettingsskeleton.ui.h
@@ -51,7 +51,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
     {
 	t = settings.find((*it)->name());
 
-	if((*it)->inherits(TQCHECKBOX_OBJECT_NAME_STRING))
+	if((*it)->inherits("TQCheckBox"))
 	{
 	    TQCheckBox *c = dynamic_cast<TQCheckBox *>(*it);
 
@@ -63,7 +63,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 		    (*t).second.bVal = c->isChecked();
 	    }
 	}
-	else if((*it)->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
+	else if((*it)->inherits("TQButtonGroup"))
 	{
 	    TQButtonGroup *c = dynamic_cast<TQButtonGroup *>(*it);
 
@@ -75,7 +75,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 		    (*t).second.iVal = c->selectedId();
 	    }
 	}
-	else if((*it)->inherits(TQSLIDER_OBJECT_NAME_STRING))
+	else if((*it)->inherits("TQSlider"))
 	{
 	    TQSlider *c = dynamic_cast<TQSlider *>(*it);
 
@@ -115,7 +115,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 	    }
 	}
 	// TQSpinBox should be checked after KDoubleSpinBox !
-	else if((*it)->inherits(TQSPINBOX_OBJECT_NAME_STRING))
+	else if((*it)->inherits("TQSpinBox"))
 	{
 	    TQSpinBox *c = dynamic_cast<TQSpinBox *>(*it);
 
diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h
index 52cf83a..d93ccc4 100644
--- a/ksquirrel/sq_imageproperties.ui.h
+++ b/ksquirrel/sq_imageproperties.ui.h
@@ -118,7 +118,7 @@ void SQ_ImageProperties::setFileParams()
         TQObjectList *ch = const_cast<TQObjectList *>(kew1->children());
         for(TQObjectList::iterator it = ch->begin();it != ch->end();++it)
         {
-            if((*it)->inherits(TQLISTVIEW_OBJECT_NAME_STRING))
+            if((*it)->inherits("TQListView"))
             {
                 TQListView *l = dynamic_cast<TQListView *>(*it);
                 TQWidget   *w = tabWidget->page(3);