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 1b09e1d239b1af15ea86eb3cfb6cd808520de5e4)

6 files changed, 12 insertions, 12 deletions

diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index c8f8d9d3..9038d162 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -1391,7 +1391,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 	TQRect r = viewR;
 	r.setLeft( xPos );
 	r.setBottom( yPos<maxY?yPos:maxY );
-	if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+	if ( inherits( "TQMultiLineEdit" ) )
 	    paint.fillRect( r.intersect( updateR ), g.base() );
 	else
 	    paint.eraseRect( r.intersect( updateR ) );
@@ -1399,7 +1399,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
     if ( yPos <= maxY ) {
 	TQRect r = viewR;
 	r.setTop( yPos );
-	if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+	if ( inherits( "TQMultiLineEdit" ) )
 	    paint.fillRect( r.intersect( updateR ), g.base() );
 	else
 	    paint.eraseRect( r.intersect( updateR ) );
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index e4073d24..7862be71 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -767,7 +767,7 @@ void TagEditor::showEvent(TQShowEvent *e)
 bool TagEditor::eventFilter(TQObject *watched, TQEvent *e)
 {
     TQKeyEvent *ke = TQT_TQKEYEVENT(e);
-    if(watched->inherits(TQSPINBOX_OBJECT_NAME_STRING) && e->type() == TQEvent::KeyRelease && ke->state() == 0)
+    if(watched->inherits("TQSpinBox") && e->type() == TQEvent::KeyRelease && ke->state() == 0)
 	slotDataChanged();
 
     return false;
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h
index f1a3f72e..cca5591b 100644
--- a/kaboodle/kaboodle_factory.h
+++ b/kaboodle/kaboodle_factory.h
@@ -41,7 +41,7 @@ public:
 	KaboodleFactory();
 	virtual ~KaboodleFactory();
 
-	virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+	virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
 
 	static const TDEAboutData *aboutData();
 	static TDEInstance *instance();
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 6170992a..f75041d9 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -470,7 +470,7 @@ MDWSlider::setStereoLinked(bool value)
     ***********************************************************/
    int firstSliderValue = 0;
    bool firstSliderValueValid = false;
-   if (slider->isA(TQSLIDER_OBJECT_NAME_STRING) ) {
+   if (slider->isA("TQSlider") ) {
       TQSlider *sld = static_cast<TQSlider*>(slider);
       firstSliderValue = sld->value();
       firstSliderValueValid = true;
@@ -493,7 +493,7 @@ MDWSlider::setStereoLinked(bool value)
          if ( firstSliderValueValid ) {
             // Remark: firstSlider== 0 could happen, if the static_cast<TQRangeControl*> above fails.
             //         It's a safety measure, if we got other Slider types in the future.
-            if (slider->isA(TQSLIDER_OBJECT_NAME_STRING) ) {
+            if (slider->isA("TQSlider") ) {
                TQSlider *sld = static_cast<TQSlider*>(slider);
                sld->setValue( firstSliderValue );
             }
@@ -538,7 +538,7 @@ MDWSlider::setTicks( bool ticks )
 
 		slider = m_sliders.first();
 
-	if ( slider->inherits( TQSLIDER_OBJECT_NAME_STRING ) )
+	if ( slider->inherits( "TQSlider" ) )
 	{
 		if( ticks )
 			if( isStereoLinked() )
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index e520320c..72064a4a 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -122,11 +122,11 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget
      if (!meta_widget.widget->isEnabled())
          return;
 
-     if (meta_widget.widget->inherits(TQSPINBOX_OBJECT_NAME_STRING))
+     if (meta_widget.widget->inherits("TQSpinBox"))
          value = static_cast<TQSpinBox *>(meta_widget.widget)->value();
-     else if (meta_widget.widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING))
+     else if (meta_widget.widget->inherits("TQComboBox"))
          value = static_cast<TQComboBox *>(meta_widget.widget)->currentText();
-     else if (meta_widget.widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+     else if (meta_widget.widget->inherits("TQLineEdit"))
          value = static_cast<TQLineEdit *>(meta_widget.widget)->text();
 
      TQString group = keyGroup(meta_info, meta_widget.key);
@@ -204,7 +204,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
             box->setValidator(validator);
 
             // Is it an integer validator
-            if (validator->inherits(TQINTVALIDATOR_OBJECT_NAME_STRING)) {
+            if (validator->inherits("TQIntValidator")) {
                 TQIntValidator *int_validator = static_cast<TQIntValidator *>(validator);
 
                 // FIXME: Why the -hell- doesn't TQSpinBox::setValidator() do this??
diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h
index d15a341e..3640ccfd 100644
--- a/tdemid/tdemid_part.h
+++ b/tdemid/tdemid_part.h
@@ -19,7 +19,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
 
     virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName,
                 TQObject* parent = 0, const char* name = 0,
-                const char* classname = TQOBJECT_OBJECT_NAME_STRING,
+                const char* classname = "TQObject",
                 const TQStringList &args = TQStringList());
 
     static TDEInstance *instance();