Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 22625693f124aae09863f4d33e30b625a96c3557)

25 files changed, 47 insertions, 47 deletions

diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index 8078f94be..ac82e4417 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -89,7 +89,7 @@ void BackTrace::start()
   {
     TQObject * o = parent();
 
-    if (o && !o->inherits(TQWIDGET_OBJECT_NAME_STRING))
+    if (o && !o->inherits("TQWidget"))
     {
       o = NULL;
     }
diff --git a/drkonqi/bugdescriptiondialog.cpp b/drkonqi/bugdescriptiondialog.cpp
index 6d6b2d75a..32c7b4b2d 100644
--- a/drkonqi/bugdescriptiondialog.cpp
+++ b/drkonqi/bugdescriptiondialog.cpp
@@ -94,7 +94,7 @@ BugDescriptionDialog::BugDescriptionDialog( TQWidget * parentw, bool modal, cons
 	lay->addWidget( m_descriptionLabel );
 	
 	// The multiline-edit
-	m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING );
+	m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" );
 	m_lineedit->setMinimumHeight( 180 ); // make it big
 	m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth);
 	lay->addWidget( m_lineedit, 10 /*stretch*/ );
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 473d26014..9ce970849 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -256,7 +256,7 @@ bool ToolView::visible () const
 void ToolView::childEvent ( TQChildEvent *ev )
 {
   // set the widget to be focus proxy if possible
-  if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast(TQWIDGET_OBJECT_NAME_STRING)) {
+  if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast("TQWidget")) {
     setFocusProxy (::tqqt_cast<QWidget*>(TQT_TQOBJECT(ev->child())));
 }
 
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 6e2b5d0ea..359033b87 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -450,7 +450,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
 
   TQValueList<int> psizes;
   if ( ! isFirstTime )
-    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->tqt_cast("TQSplitter")) )
       psizes = ps->sizes();
 
   Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
@@ -471,7 +471,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
     s->moveToFirst( vsNew );
 
   if (!isFirstTime)
-    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->tqt_cast("TQSplitter")) )
       ps->setSizes( psizes );
 
   s->show();
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ca80619e5..b17581846 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -105,7 +105,7 @@ TQString KCGlobal::baseGroup()
 
 void KCGlobal::repairAccels( TQWidget * tw )
 {
-    TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING );
+    TQObjectList * l = tw->queryList( "TQAccel" );
     TQObjectListIt it( *l );             // iterate over the buttons
     TQObject * obj;
     while ( (obj=it.current()) != 0 ) { // for each found object...
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 39dfb7010..084bf040d 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -183,13 +183,13 @@ void ModifiersModule::initGUI()
 	plbl = new TQLabel( i18n("X11-Mod"), pGroup );
 	plbl->setFont( font );
 
-	new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Shift"), pGroup );
+	new TQLabel( i18n("TQAccel", "Shift"), pGroup );
 	new TQLabel( "shift", pGroup );
 
-	m_plblCtrl = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl"), pGroup );
+	m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup );
 	new TQLabel( "control", pGroup );
 
-	m_plblAlt = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt"), pGroup );
+	m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup );
 	new TQLabel( "mod1", pGroup );
 
 	m_plblWin = new TQLabel( i18n("Win"), pGroup );
@@ -286,8 +286,8 @@ void ModifiersModule::updateWidgets()
 		}
 		m_pchkMacSwap->setEnabled( true );
 	} else {
-		m_plblCtrl->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl") );
-		m_plblAlt->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt") );
+		m_plblCtrl->setText( i18n("TQAccel", "Ctrl") );
+		m_plblAlt->setText( i18n("TQAccel", "Alt") );
 		m_plblWin->setText( i18n("Win") );
 		m_pchkMacSwap->setEnabled( false );
 	}
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index d2a17ca74..339405461 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -244,7 +244,7 @@ void TDELocaleApplication::slotTranslate()
   // The untranslated string for TQLabel are stored in
   // the name() so we use that when retranslating
   TQObject *wc;
-  TQObjectList *list = queryList(TQWIDGET_OBJECT_NAME_STRING);
+  TQObjectList *list = queryList("TQWidget");
   TQObjectListIt it(*list);
   while ( (wc = it.current()) != 0 )
   {
@@ -260,15 +260,15 @@ void TDELocaleApplication::slotTranslate()
     if (::qstrcmp(wc->name(), "unnamed") == 0)
       continue;
 
-    if (::qstrcmp(wc->className(), TQLABEL_OBJECT_NAME_STRING) == 0)
+    if (::qstrcmp(wc->className(), "TQLabel") == 0)
       ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQGROUPBOX_OBJECT_NAME_STRING) == 0 ||
-             ::qstrcmp(wc->className(), TQVGROUPBOX_OBJECT_NAME_STRING) == 0)
+    else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 ||
+             ::qstrcmp(wc->className(), "TQVGroupBox") == 0)
       ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQPUSHBUTTON_OBJECT_NAME_STRING) == 0 ||
+    else if (::qstrcmp(wc->className(), "TQPushButton") == 0 ||
              ::qstrcmp(wc->className(), "KMenuButton") == 0)
       ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQCHECKBOX_OBJECT_NAME_STRING) == 0)
+    else if (::qstrcmp(wc->className(), "TQCheckBox") == 0)
       ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) );
   }
   delete list;
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index 6ea29b376..66bc6ade5 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -33,7 +33,7 @@ void StylePreview::init()
 {
     // Ensure that the user can't toy with the child widgets.
     // Method borrowed from Qt's qtconfig.
-    TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList* l = queryList("TQWidget");
     TQObjectListIt it(*l);
     TQObject* obj;
     while ((obj = it.current()) != 0)
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
index 7ac96e9c8..cd729eda8 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
@@ -45,7 +45,7 @@ class CFontViewPartFactory : public KLibFactory
 
     CFontViewPartFactory();
     virtual ~CFontViewPartFactory();
-    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
 
     static TDEInstance * instance();
 
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index b67f2bd6c..f9ec72290 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -102,7 +102,7 @@ class TOMFactory : public KLibFactory
 
     protected:
         TQObject* createObject(TQObject *parent = 0, const char *name = 0,
-                              const char *classname = TQOBJECT_OBJECT_NAME_STRING,
+                              const char *classname = "TQObject",
                               const TQStringList& args = TQStringList());
 };
 
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index ecdac5af7..252cf4ac2 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -1056,10 +1056,10 @@ bool KlipperWidget::ignoreClipboardChanges() const
     TQWidget *focusWidget = tqApp->focusWidget();
     if ( focusWidget )
     {
-        if ( focusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
+        if ( focusWidget->inherits( "TQSpinBox" ) ||
              (focusWidget->parentWidget() &&
-              focusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
-              focusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
+              focusWidget->inherits("TQLineEdit") &&
+              focusWidget->parentWidget()->inherits("TQSpinWidget")) )
         {
             return true;
         }
diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp
index 934c326f7..d87a73971 100644
--- a/konqueror/konq_actions.cpp
+++ b/konqueror/konq_actions.cpp
@@ -94,7 +94,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
     return -1;
 
   // Go menu
-  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+  if ( widget->inherits("TQPopupMenu") )
   {
     m_goMenu = (TQPopupMenu*)widget;
     // Forward signal (to main view)
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index 766a43c61..c8746e8da 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -1062,7 +1062,7 @@ TQObject *KonqMainWindow::lastFrame( KonqView *view )
   TQObject *nextFrame, *viewFrame;
   nextFrame = TQT_TQOBJECT(view->frame());
   viewFrame = 0;
-  while ( nextFrame != 0 && ! nextFrame->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
+  while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) {
     viewFrame = nextFrame;
     nextFrame = nextFrame->parent();
   }
diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp
index 3a970018b..9f7bef4d8 100644
--- a/konqueror/konq_view.cpp
+++ b/konqueror/konq_view.cpp
@@ -472,7 +472,7 @@ void KonqView::connectPart(  )
 
   m_pPart->widget()->installEventFilter( this );
 
-  if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) )
+  if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
   {
     (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
   }
@@ -1220,7 +1220,7 @@ void KonqView::reparseConfiguration()
     bool b = KonqSettings::backRightClick();
     if ( m_bBackRightClick != b )
     {
-        if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) )
+        if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
         {
             (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
         }
@@ -1265,7 +1265,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
             KURL::List lstDragURLs;
             bool ok = KURLDrag::decode( ev, lstDragURLs );
 
-            TQObjectList *children = m_pPart->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+            TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" );
 
             if ( ok &&
                  !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me
diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp
index e1cfa9bb2..d5fd6ac2c 100644
--- a/konqueror/listview/konq_listviewwidget.cpp
+++ b/konqueror/listview/konq_listviewwidget.cpp
@@ -237,9 +237,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
          lstColumns << column;
       const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting
       TQVariant::Type t = TQVariant::Invalid;
-      if ( type.lower() == TQString(TQSTRING_OBJECT_NAME_STRING).lower() )
+      if ( type.lower() == TQString("TQString").lower() )
           t = TQVariant::String;
-      else if ( type.lower() == TQString(TQDATETIME_OBJECT_NAME_STRING).lower() )
+      else if ( type.lower() == TQString("TQDateTime").lower() )
           t = TQVariant::DateTime;
       else
           kdWarning() << "Unsupported ExtraType '" << type << "'" << endl;
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 8eefa7c34..a6d172e41 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -1224,20 +1224,20 @@ void Sidebar_Widget::connectModule(TQObject *mod)
 		connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
 	}
 
-	if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
+	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
 		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
 			const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
 			TQPoint &, const KURL&, const TQString &, mode_t)));
 	}
 
-	if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
+	if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) {
 		connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)),this,
 			TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)));
 	}
 
-	if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) {
+	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
 		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
 			this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
 	}
@@ -1247,7 +1247,7 @@ void Sidebar_Widget::connectModule(TQObject *mod)
 			this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
 	}
 
-	if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) {
+	if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
 		connect(mod,
 			TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 			this,
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 11fae96d1..6bdb07e6d 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -498,7 +498,7 @@ void Konsole::makeGUI()
    // Remove the empty separator Qt inserts if the menu is empty on popup,
    // not sure if this will be "fixed" in Qt, for now use this hack (malte)
    if(!(isRestored)) {
-     if (sender() && sender()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) &&
+     if (sender() && sender()->inherits("TQPopupMenu") &&
        static_cast<const TQPopupMenu *>(sender())->count() == 1)
        const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0);
        }
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index a36023fd0..e16ec4085 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -41,7 +41,7 @@ void StylePreview::init()
 {
     // Ensure that the user can't toy with the child widgets.
     // Method borrowed from Qt's qtconfig.
-    TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList* l = queryList("TQWidget");
     TQObjectListIt it(*l);
     TQObject* obj;
     while ((obj = it.current()) != 0)
diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp
index ae31d4a60..517a2bbd5 100644
--- a/ksysguard/gui/KSysGuardApplet.cpp
+++ b/ksysguard/gui/KSysGuardApplet.cpp
@@ -142,7 +142,7 @@ void KSysGuardApplet::applySettings()
   resizeDocks( mSettingsDlg->numDisplay() );
 
   for ( uint i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ i ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ i ])->setUpdateInterval( updateInterval() );
 
   save();
@@ -201,7 +201,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
       return;
 
     int dock = findDock( e->pos() );
-    if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
+    if ( mDockList[ dock ]->isA( "TQFrame" ) ) {
       if ( sensorType == "integer" || sensorType == "float" ) {
         TDEPopupMenu popup;
         TQWidget *wdg = 0;
@@ -246,7 +246,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
       }
     }
 
-    if ( !mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ dock ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ dock ])->
                   addSensor( hostName, sensorName, sensorType, sensorDescr );
   }
@@ -429,7 +429,7 @@ bool KSysGuardApplet::save()
   TQStringList hosts;
   uint i;
   for ( i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ i ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ i ])->hosts( hosts );
 
   // save host information (name, shell, etc.)
@@ -449,7 +449,7 @@ bool KSysGuardApplet::save()
   }
 
   for ( i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
+    if ( !mDockList[ i ]->isA( "TQFrame" ) ) {
       TQDomElement element = doc.createElement( "display" );
       ws.appendChild( element );
       element.setAttribute( "dock", i );
diff --git a/libkonq/konq_sound.cpp b/libkonq/konq_sound.cpp
index b40c33858..687e9eed2 100644
--- a/libkonq/konq_sound.cpp
+++ b/libkonq/konq_sound.cpp
@@ -115,7 +115,7 @@ public:
 
 protected:
 	virtual TQObject *createObject(TQObject * = 0, const char * = 0,
-		const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+		const char *className = "TQObject", const TQStringList &args = TQStringList());
 };
 
 TQObject *KonqSoundFactory::createObject(TQObject *, const char *,
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 1f2640807..1c4e8a216 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -425,7 +425,7 @@ void MediaNotifier::slotFreeCancel()
 
 void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
 {
-    TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, TQCHECKBOX_OBJECT_NAME_STRING ) );
+    TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
     if ( checkbox && checkbox->isChecked() )
         KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res);
     m_freeDialog->delayedDestruct();
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 5ea6a65a2..90376ec2a 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -604,7 +604,7 @@ void FaxCtrl::slotCloseLog()
 	{
 		TQTextEdit	*view = m_logview;
 		m_logview = 0;
-		if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+		if (obj && obj->inherits("TQPushButton"))
 			delete view->parentWidget();
 kdDebug() << "slotClose()" << endl;
 	}
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index ce5904a26..955ef8f02 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -663,7 +663,7 @@ KdmItem::parentWidget() const
   if (!this->parent())
     return 0;
 
-  if (parent()->tqt_cast(TQWIDGET_OBJECT_NAME_STRING))
+  if (parent()->tqt_cast("TQWidget"))
     return (TQWidget*)parent();
   return ((KdmItem*)parent())->parentWidget();
 }
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index 6c27b7629..8e7d33bf1 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -411,7 +411,7 @@ KdmThemer::slotActivated( const TQString &id )
 	}
 	
 	item->widget()->setFocus();
-	TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING);
+	TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast("TQLineEdit");
 	if (le) {
 		le->selectAll();
 	}
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 6f6bedb3e..d7abcd3a3 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -2206,7 +2206,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
     if ( !w )
         return state;
     TQWidget* widget = TQWidget::find( w );
-    if ( (!widget ||  widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) ) && !findClient( WindowMatchPredicate( w )) )
+    if ( (!widget ||  widget->inherits("TQToolButton") ) && !findClient( WindowMatchPredicate( w )) )
         {
         int x, y;
         Window xw;