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 b8cc513c5e875739c6790da651f6a3f47ed8f657)

21 files changed, 221 insertions, 221 deletions

diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 33f0c4bf..604e45d4 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -281,7 +281,7 @@ static void fixObject( TQObject *&o )
 
 bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) )
+    if ( !o || !e || o->inherits( "TQDockWindowHandle" ) || o->inherits( "TQDockWindowTitleBar" ) )
 	return TQToolBar::eventFilter( o, e );
 
     if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress &&
@@ -719,7 +719,7 @@ void QDesignerToolBar::installEventFilters( TQWidget *w )
 {
     if ( !w )
 	return;
-    TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = w->queryList( "TQWidget" );
     for ( TQObject *o = l->first(); o; o = l->next() )
 	o->installEventFilter( this );
     delete l;
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index b9b97827..8d7888c2 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -371,7 +371,7 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw,
 
     // Include the children of the selected items when deleting
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList *children = w->queryList( "TQWidget" );
 	for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) {
 	    if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) {
 		widgets.insert(widgets.at() + 1, c);
diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp
index 12b03a1d..d2371426 100644
--- a/kdevdesigner/designer/connectionitems.cpp
+++ b/kdevdesigner/designer/connectionitems.cpp
@@ -258,7 +258,7 @@ void SenderItem::setSenderEx( TQObject *sender )
 
 void SenderItem::senderChanged( const TQString &sender )
 {
-    TQObject *o = formWindow->child( sender, TQOBJECT_OBJECT_NAME_STRING );
+    TQObject *o = formWindow->child( sender, "TQObject" );
     if ( !o )
 	o = formWindow->findAction( sender );
     if ( !o )
@@ -315,7 +315,7 @@ void ReceiverItem::setReceiverEx( TQObject *receiver )
 
 void ReceiverItem::receiverChanged( const TQString &receiver )
 {
-    TQObject *o = formWindow->child( receiver, TQOBJECT_OBJECT_NAME_STRING );
+    TQObject *o = formWindow->child( receiver, "TQObject" );
     if ( !o )
 	o = formWindow->findAction( receiver );
     if ( !o )
diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp
index b5baea28..e7fdf0df 100644
--- a/kdevdesigner/designer/database.cpp
+++ b/kdevdesigner/designer/database.cpp
@@ -62,7 +62,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
 	con = TQSqlDatabase::database();
     frm = new TQSqlForm( o, table );
     for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) {
-	TQObject *chld = parent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING );
+	TQObject *chld = parent->child( it.key(), "TQWidget" );
 	if ( !chld )
 	    continue;
 	frm->insert( (TQWidget*)chld, *it );
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index 5681f00b..4d006097 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/kdevdesigner/designer/editfunctionsimpl.cpp
@@ -116,7 +116,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 		      TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
 
     // Connect signal-relay to TQLineEdit "functionName"
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" );
+    TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" );
     TQObject *obj;
     TQObjectListIt itemsLineEditIt( *l );
     while ( (obj = itemsLineEditIt.current()) != 0 ) {
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index 99f631ae..db0c1e2a 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -198,7 +198,7 @@ void FormWindow::init()
 	     this, TQT_SLOT( modificationChanged( bool ) ) );
     buffer = 0;
 
-    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this );
     setMainContainer( w );
     propertyWidget = TQT_TQOBJECT(w);
     targetContainer = 0;
@@ -355,7 +355,7 @@ void FormWindow::insertWidget()
     bool useSizeHint = !oldRectValid || ( currRect.width() < 2 && currRect.height() < 2 );
     Qt::Orientation orient =Qt::Horizontal;
     TQString n = WidgetDatabase::className( currTool );
-    if (  useSizeHint && ( n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING ) ) {
+    if (  useSizeHint && ( n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar" ) ) {
 	TQPopupMenu m( mainWindow() );
 	m.insertItem( i18n( "&Horizontal" ) );
 	int ver = m.insertItem( i18n( "&Vertical" ) );
@@ -594,7 +594,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 		} else { // ...widget selected
 		    // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs
 		    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) {
-			TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+			TQObjectList *l = w->queryList( "TQWidget" );
 			setPropertyShowingBlocked( TRUE );
 			for ( TQObject *o = l->first(); o; o = l->next() ) {
 			    if ( !o->isWidgetType() )
@@ -1160,7 +1160,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w )
 	}
     }
     if ( !e->isAccepted() ) {
-	TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList *l = queryList( "TQWidget" );
 	if ( !l )
 	    return;
 	if ( l->find( TQT_TQOBJECT(w) ) != -1 )
@@ -1365,7 +1365,7 @@ void FormWindow::endRectDraw()
 
 void FormWindow::selectWidgets()
 {
-    TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = mainContainer()->queryList( "TQWidget" );
     if ( l ) {
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( ( (TQWidget*)o )->isVisibleTo( this ) &&
@@ -1420,7 +1420,7 @@ void FormWindow::redo()
 
 void FormWindow::raiseChildSelections( TQWidget *w )
 {
-    TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = w->queryList( "TQWidget" );
     if ( !l || !l->first() ) {
 	delete l;
 	return;
@@ -1436,7 +1436,7 @@ void FormWindow::raiseChildSelections( TQWidget *w )
 
 void FormWindow::updateChildSelections( TQWidget *w )
 {
-    TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = w->queryList( "TQWidget" );
     if ( l ) {
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( o->isWidgetType() &&
@@ -1451,7 +1451,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w )
 {
     checkedSelectionsForMove = TRUE;
 
-    TQObjectList *l = w->parentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE );
+    TQObjectList *l = w->parentWidget()->queryList( "TQWidget", 0, FALSE, FALSE );
     moving.clear();
     if ( l ) {
 	TQPtrDictIterator<WidgetSelection> it( usedSelections );
@@ -1613,7 +1613,7 @@ void FormWindow::resizeEvent( TQResizeEvent *e )
 void FormWindow::windowsRepaintWorkaroundTimerTimeout()
 {
 #if defined(TQ_WS_WIN32)
-    TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = queryList( "TQWidget" );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	flickerfree_update( (TQWidget*)o );
     }
@@ -1771,7 +1771,7 @@ void FormWindow::showOrderIndicators()
 {
     hideOrderIndicators();
     orderIndicators.setAutoDelete( TRUE );
-    TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = mainContainer()->queryList( "TQWidget" );
     stackedWidgets = MetaDataBase::tabOrder( this );
     if ( l ) {
 	int order = 1;
@@ -1903,7 +1903,7 @@ void FormWindow::checkAccels()
 {
     CHECK_MAINWINDOW;
     TQMap<TQChar, TQWidgetList > accels;
-    TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = mainContainer()->queryList( "TQWidget" );
     if ( l ) {
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( ( (TQWidget*)o )->isVisibleTo( this ) &&
@@ -1978,7 +1978,7 @@ void FormWindow::selectAll()
 {
     checkedSelectionsForMove = FALSE;
     blockSignals( TRUE );
-    TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = mainContainer()->queryList( "TQWidget" );
     if ( l ) {
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( ( (TQWidget*)o )->isVisibleTo( this ) &&
@@ -2181,7 +2181,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const
     w = WidgetFactory::containerOfWidget( w );
     if ( !w )
 	return FALSE;
-    TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList *l = w->queryList( "TQWidget" );
     if ( !l || !l->first() ) {
 	delete l;
 	return FALSE;
@@ -2376,7 +2376,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 	    TQPtrList<TQAction> al;
 	    TQAction *a = 0;
 	    for ( a = actions.first(); a; a = actions.next() ) {
-		TQObjectList *l = a->queryList( TQACTION_OBJECT_NAME_STRING );
+		TQObjectList *l = a->queryList( "TQAction" );
 		al.append( a );
 		for ( TQObject *ao = l->first(); ao; ao = l->next() )
 		    al.append( (TQAction*)ao );
@@ -2409,7 +2409,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 	}
 	if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) ) {
 	    if ( !found ) {
-		TQObjectList *l = mainContainer()->queryList( TQDOCKWINDOW_OBJECT_NAME_STRING, 0, TRUE );
+		TQObjectList *l = mainContainer()->queryList( "TQDockWindow", 0, TRUE );
 		for ( TQObject *o = l->first(); o; o = l->next() ) {
 		    if ( o != w &&
 			 qstrcmp( o->name(), s.latin1() ) == 0 ) {
@@ -2447,7 +2447,7 @@ bool FormWindow::isDatabaseWidgetUsed() const
 {
 #ifndef TQT_NO_SQL
     TQStringList dbClasses;
-    dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here
+    dbClasses << "TQDataTable"; // add more here
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
     for ( ; it.current(); ++it ) {
 	TQString c( it.current()->className() );
@@ -2663,7 +2663,7 @@ TQAction *FormWindow::findAction( const TQString &name )
     for ( TQAction *a = actionList().first(); a; a = actionList().next() ) {
 	if ( TQString( a->name() ) == name )
 	    return a;
-	TQAction *ac = (TQAction*)a->child( name.latin1(), TQACTION_OBJECT_NAME_STRING );
+	TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" );
 	if ( ac )
 	    return ac;
     }
@@ -2672,7 +2672,7 @@ TQAction *FormWindow::findAction( const TQString &name )
 
 void FormWindow::killAccels( TQObject *top )
 {
-    TQObjectList *l = top->queryList( TQACCEL_OBJECT_NAME_STRING );
+    TQObjectList *l = top->queryList( "TQAccel" );
     if ( !l )
 	return;
     for ( TQObject *o = l->first(); o; o = l->next() )
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index c6433cd0..43e16601 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -447,7 +447,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 
     if ( fakeMainWindow ) {
 	name = o->parent()->name();
-	className = TQMAINWINDOW_OBJECT_NAME_STRING;
+	className = "TQMainWindow";
     }
 
     if ( !parent )
@@ -491,7 +491,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 		    if ( widgetStacks->findRef( stack ) != -1 )
 			continue;
 		    widgetStacks->append( stack );
-		    TQObjectList *l2 = stack->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, TRUE, FALSE );
+		    TQObjectList *l2 = stack->queryList( "TQWidget", 0, TRUE, FALSE );
 		    for ( obj = l2->last(); obj; obj = l2->prev() ) {
 			if ( qstrcmp( obj->className(),
 				      "TQWidgetStackPrivate::Invisible" ) == 0 ||
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index b8fb737c..be20989c 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -170,10 +170,10 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
     needReparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase);
     if ( !layoutBase ) {
 	if ( !useSplitter )
-	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
+	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ),
 						WidgetFactory::containerOfWidget( parent ) );
 	else
-	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
+	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ),
 						WidgetFactory::containerOfWidget( parent ) );
     } else {
 	WidgetFactory::deleteLayout( layoutBase );
@@ -239,11 +239,11 @@ void Layout::breakLayout()
 	    rects.insert( w, w->geometry() );
     }
     WidgetFactory::deleteLayout( layoutBase );
-    bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
-			qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
+    bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 ||
+			qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 ||
 			( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) &&
 			  layoutBase != formWindow->mainContainer() );
-    bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
+    bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0;
     bool add = geometries.isEmpty();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needReparent )
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index 01dfa64e..85a321ab 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/kdevdesigner/designer/listboxeditorimpl.cpp
@@ -70,7 +70,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow
 
     ListBoxRename *editorRename = new ListBoxRename( preview );
 
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+    TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" );
     TQObjectListIt it( *l );
     TQObject *obj;
     while ( (obj = it.current()) != 0 ) {
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index c5ec7498..8e4c2a32 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/kdevdesigner/designer/listvieweditorimpl.cpp
@@ -86,7 +86,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 		      TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
 
     // Connect signal-relay to TQLineEdit "itemText"
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+    TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" );
     TQObject *obj;
     TQObjectListIt itemsLineEditIt( *l );
     while ( (obj = itemsLineEditIt.current()) != 0 ) {
@@ -112,7 +112,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 		      TQT_SLOT( columnTextChanged( const TQString & ) ) );
 
     // Find TQLineEdit "colText" and connect
-    l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" );
+    l = parent->queryList( "TQLineEdit", "colText" );
     TQObjectListIt columnsLineEditIt( *l );
     while ( (obj = columnsLineEditIt.current()) != 0 ) {
         ++columnsLineEditIt;
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 47a581e2..6f98d371 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -258,15 +258,15 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     set_splash_status( "Loading User Settings..." );
     readConfig();
     // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties)
-    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIDGET_OBJECT_NAME_STRING ), this, 0, FALSE );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLABEL_OBJECT_NAME_STRING ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLabel" ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQTABWIDGET_OBJECT_NAME_STRING ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQTabWidget" ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this, 0, FALSE );
     delete w;
     setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE );
     actionEditor->parentWidget()->hide();
@@ -613,7 +613,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet )
 	if ( style )
 	    w->setStyle( style );
 
-	TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList *l = w->queryList( "TQWidget" );
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( style )
 		( (TQWidget*)o )->setStyle( style );
@@ -788,7 +788,7 @@ void MainWindow::helpContents()
 	if ( source.isEmpty() || source == "designer-manual.html" ) {
 	    if ( classname.lower() == "spacer" )
 		source = "qspaceritem.html#details";
-	    else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
+	    else if ( classname == "TQLayoutWidget" )
 		source = "layout.html";
 	    else
 		source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details";
@@ -1010,7 +1010,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 		pw = pw->parentWidget();
 	    }
 	}
-	if ( o && ( ::tqqt_cast<QDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
+	if ( o && ( ::tqqt_cast<QDesignerToolBar*>(o) || o->inherits("TQDockWindowHandle") )
 	     && e->type() == TQEvent::ContextMenu )
 	    break;
 	if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL )
@@ -1550,18 +1550,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
 void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w )
 {
     const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
-    if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
+    if ( text && qstrcmp( text->type(), "TQString") != 0 )
 	text = 0;
     const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
-    if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
+    if ( title && qstrcmp( title->type(), "TQString") != 0 )
 	title = 0;
     const TQMetaProperty* pagetitle =
 	w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
-    if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
+    if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 )
 	pagetitle = 0;
     const TQMetaProperty* pixmap =
 	w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE );
-    if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
+    if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 )
 	pixmap = 0;
 
     if ( text && text->designable(w) ||
@@ -2930,11 +2930,11 @@ void MainWindow::setupActionManager()
 	TQPopupMenu *menu = 0;
 	TQToolBar *tb = 0;
 
-	if ( !( menu = (TQPopupMenu*)child( grp.latin1(), TQPOPUPMENU_OBJECT_NAME_STRING ) ) ) {
+	if ( !( menu = (TQPopupMenu*)child( grp.latin1(), "TQPopupMenu" ) ) ) {
 	    menu = new TQPopupMenu( this, grp.latin1() );
 	    menuBar()->insertItem( i18n( grp ), menu );
 	}
-	if ( !( tb = (TQToolBar*)child( grp.latin1(), TQTOOLBAR_OBJECT_NAME_STRING ) ) ) {
+	if ( !( tb = (TQToolBar*)child( grp.latin1(), "TQToolBar" ) ) ) {
 	    tb = new TQToolBar( this, grp.latin1() );
 	    tb->setCloseMode( TQDockWindow::Undocked );
 	    addToolBar( tb, grp );
@@ -3293,7 +3293,7 @@ void MainWindow::finishedRun()
 void MainWindow::enableAll( bool enable )
 {
     menuBar()->setEnabled( enable );
-    TQObjectList *l = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
+    TQObjectList *l = queryList( "TQDockWindow" );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	if ( TQT_BASE_OBJECT(o) == wspace->parentWidget() ||
 	     TQT_BASE_OBJECT(o) == oWindow->parentWidget() ||
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index ec5cc004..161d3dae 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -1045,7 +1045,7 @@ void MainWindow::fileNewDialog()
     workspace()->update();
     fw->setProject( currentProject );
     MetaDataBase::addEntry( TQT_TQOBJECT(fw) );
-    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() );
     fw->setMainContainer( w );
     fw->setCaption( n );
     fw->resize( 600, 480 );
@@ -1412,7 +1412,7 @@ void MainWindow::fileCreateTemplate()
     }
     for ( i = 0; i < WidgetDatabase::count(); ++i ) {
 	if ( WidgetDatabase::isContainer( i ) && !WidgetDatabase::isForm(i) &&
-	     WidgetDatabase::className( i ) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::group( i ) != "Temp" ) {
+	     WidgetDatabase::className( i ) != "TQTabWidget" && WidgetDatabase::group( i ) != "Temp" ) {
 	    dia.listClass->insertItem( WidgetDatabase::className( i ) );
 	}
     }
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index 17dfc1b7..738c8a55 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -79,18 +79,18 @@ void FormItem::insert( Project *pro )
     fw->setProject( pro );
     MetaDataBase::addEntry( TQT_TQOBJECT(fw) );
     if ( fType == Widget ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIDGET_OBJECT_NAME_STRING ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == Dialog ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() );
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == Wizard ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIZARD_OBJECT_NAME_STRING ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWizard" ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == MainWindow ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQMAINWINDOW_OBJECT_NAME_STRING ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQMainWindow" ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     }
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index da6289dd..d2a66750 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -357,7 +357,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index )
     PopupMenuEditorItem *i = new PopupMenuEditorItem( (TQAction *)actionGroup, this, 0,
 						      TQString( actionGroup->name() ) + "Menu" );
     TQActionGroup *g = 0;
-    TQObjectList *l = actionGroup->queryList( TQACTION_OBJECT_NAME_STRING, 0, FALSE, FALSE );
+    TQObjectList *l = actionGroup->queryList( "TQAction", 0, FALSE, FALSE );
     TQObjectListIterator it( *l );
     insert( i, index );
     for ( ; it.current(); ++it ) {
@@ -863,7 +863,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e )
 		TQString n = TQString( g->name() ) + "Item";
 		formWindow()->unify( i, n, FALSE );
 		i->setName( n );
-		TQObjectList *l = g->queryList( TQACTION_OBJECT_NAME_STRING, 0, FALSE, FALSE );
+		TQObjectList *l = g->queryList( "TQAction", 0, FALSE, FALSE );
 		TQObjectListIterator it( *l );
 		for ( ; it.current(); ++it ) {
 		    g = ::tqqt_cast<TQActionGroup*>(it.current());
diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp
index d574f9ae..15fb8058 100644
--- a/kdevdesigner/designer/previewwidgetimpl.cpp
+++ b/kdevdesigner/designer/previewwidgetimpl.cpp
@@ -31,7 +31,7 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
     : PreviewWidgetBase( parent, name )
 {
     // install event filter on child widgets
-    TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList *l = queryList("TQWidget");
     TQObjectListIt it(*l);
     TQObject * obj;
     while ((obj = it.current()) != 0) {
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index 0ab26894..d8a6cf94 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -1066,7 +1066,7 @@ TQObjectList *Project::formList( bool resolveFakeObjects ) const
 	    if ( resolveFakeObjects && f->formWindow()->isFake() )
 		l->append( objectForFakeForm( f->formWindow() ) );
 	    else
-		l->append( f->formWindow()->child( 0, TQWIDGET_OBJECT_NAME_STRING ) );
+		l->append( f->formWindow()->child( 0, "TQWidget" ) );
 	} else if ( f->isFake() ) {
 	    l->append( objectForFakeFormFile( f ) );
 	}
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 057e73f7..d4826c7e 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -861,7 +861,7 @@ TQDateEdit *PropertyDateItem::lined()
     if ( lin )
 	return lin;
     lin = new TQDateEdit( listview->viewport() );
-    TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
+    TQObjectList *l = lin->queryList( "TQLineEdit" );
     for ( TQObject *o = l->first(); o; o = l->next() )
 	o->installEventFilter( listview );
     delete l;
@@ -938,7 +938,7 @@ TQTimeEdit *PropertyTimeItem::lined()
     lin = new TQTimeEdit( listview->viewport() );
     connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ),
 	     this, TQT_SLOT( setValue() ) );
-    TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
+    TQObjectList *l = lin->queryList( "TQLineEdit" );
     for ( TQObject *o = l->first(); o; o = l->next() )
 	o->installEventFilter( listview );
     delete l;
@@ -1013,7 +1013,7 @@ TQDateTimeEdit *PropertyDateTimeItem::lined()
     lin = new TQDateTimeEdit( listview->viewport() );
     connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ),
 	     this, TQT_SLOT( setValue() ) );
-    TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
+    TQObjectList *l = lin->queryList( "TQLineEdit" );
     for ( TQObject *o = l->first(); o; o = l->next() )
 	o->installEventFilter( listview );
     delete l;
@@ -1182,7 +1182,7 @@ TQSpinBox *PropertyIntItem::spinBox()
 	spinBx = new TQSpinBox( 0, INT_MAX, 1, listview->viewport() );
     spinBx->hide();
     spinBx->installEventFilter( listview );
-    TQObjectList *ol = spinBx->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
+    TQObjectList *ol = spinBx->queryList( "TQLineEdit" );
     if ( ol && ol->first() )
 	ol->first()->installEventFilter( listview );
     delete ol;
@@ -1278,7 +1278,7 @@ TQSpinBox* PropertyLayoutItem::spinBox()
     spinBx->setSpecialValueText( i18n( "default" ) );
     spinBx->hide();
     spinBx->installEventFilter( listview );
-    TQObjectList *ol = spinBx->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
+    TQObjectList *ol = spinBx->queryList( "TQLineEdit" );
     if ( ol && ol->first() )
 	ol->first()->installEventFilter( listview );
     delete ol;
@@ -1351,7 +1351,7 @@ TQComboBox *PropertyListItem::combo()
 	     this, TQT_SLOT( setValue() ) );
     comb->installEventFilter( listview );
     if ( editable ) {
-	TQObjectList *ol = comb->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
+	TQObjectList *ol = comb->queryList( "TQLineEdit" );
 	if ( ol && ol->first() )
 	    ol->first()->installEventFilter( listview );
 	delete ol;
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 9b7d00a0..db41b131 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -112,87 +112,87 @@ static struct {
     int key;
     const char* name;
 } keyname[] = {
-    { TQt::Key_Space,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Space" ) },
-    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Esc" ) },
-    { TQt::Key_Tab,          TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Tab" ) },
-    { TQt::Key_Backtab,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backtab" ) },
-    { TQt::Key_Backspace,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backspace" ) },
-    { TQt::Key_Return,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Return" ) },
-    { TQt::Key_Enter,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Enter" ) },
-    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Ins" ) },
-    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Del" ) },
-    { TQt::Key_Pause,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Pause" ) },
-    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print" ) },
-    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "SysReq" ) },
-    { TQt::Key_Home,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
-    { TQt::Key_End,          TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "End" ) },
-    { TQt::Key_Left,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Left" ) },
-    { TQt::Key_Up,           TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Up" ) },
-    { TQt::Key_Right,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Right" ) },
-    { TQt::Key_Down,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Down" ) },
-    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgUp" ) },
-    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgDown" ) },
-    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "CapsLock" ) },
-    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "NumLock" ) },
-    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "ScrollLock" ) },
-    { TQt::Key_Menu,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Menu" ) },
-    { TQt::Key_Help,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Help" ) },
+    { TQt::Key_Space,        TQT_TRANSLATE_NOOP( "TQAccel", "Space" ) },
+    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( "TQAccel", "Esc" ) },
+    { TQt::Key_Tab,          TQT_TRANSLATE_NOOP( "TQAccel", "Tab" ) },
+    { TQt::Key_Backtab,      TQT_TRANSLATE_NOOP( "TQAccel", "Backtab" ) },
+    { TQt::Key_Backspace,    TQT_TRANSLATE_NOOP( "TQAccel", "Backspace" ) },
+    { TQt::Key_Return,       TQT_TRANSLATE_NOOP( "TQAccel", "Return" ) },
+    { TQt::Key_Enter,        TQT_TRANSLATE_NOOP( "TQAccel", "Enter" ) },
+    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( "TQAccel", "Ins" ) },
+    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( "TQAccel", "Del" ) },
+    { TQt::Key_Pause,        TQT_TRANSLATE_NOOP( "TQAccel", "Pause" ) },
+    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( "TQAccel", "Print" ) },
+    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( "TQAccel", "SysReq" ) },
+    { TQt::Key_Home,         TQT_TRANSLATE_NOOP( "TQAccel", "Home" ) },
+    { TQt::Key_End,          TQT_TRANSLATE_NOOP( "TQAccel", "End" ) },
+    { TQt::Key_Left,         TQT_TRANSLATE_NOOP( "TQAccel", "Left" ) },
+    { TQt::Key_Up,           TQT_TRANSLATE_NOOP( "TQAccel", "Up" ) },
+    { TQt::Key_Right,        TQT_TRANSLATE_NOOP( "TQAccel", "Right" ) },
+    { TQt::Key_Down,         TQT_TRANSLATE_NOOP( "TQAccel", "Down" ) },
+    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( "TQAccel", "PgUp" ) },
+    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( "TQAccel", "PgDown" ) },
+    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( "TQAccel", "CapsLock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( "TQAccel", "NumLock" ) },
+    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( "TQAccel", "ScrollLock" ) },
+    { TQt::Key_Menu,         TQT_TRANSLATE_NOOP( "TQAccel", "Menu" ) },
+    { TQt::Key_Help,         TQT_TRANSLATE_NOOP( "TQAccel", "Help" ) },
 
     // Multimedia keys
-    { TQt::Key_Back,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Back" ) },
-    { TQt::Key_Forward,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Forward" ) },
-    { TQt::Key_Stop,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Stop" ) },
-    { TQt::Key_Refresh,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Refresh" ) },
-    { TQt::Key_VolumeDown,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Down" ) },
-    { TQt::Key_VolumeMute,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Mute" ) },
-    { TQt::Key_VolumeUp,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Up" ) },
-    { TQt::Key_BassBoost,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Boost" ) },
-    { TQt::Key_BassUp,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Up" ) },
-    { TQt::Key_BassDown,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Down" ) },
-    { TQt::Key_TrebleUp,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Up" ) },
-    { TQt::Key_TrebleDown,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Down" ) },
-    { TQt::Key_MediaPlay,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Play" ) },
-    { TQt::Key_MediaStop,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Stop" ) },
-    { TQt::Key_MediaPrev,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Previous" ) },
-    { TQt::Key_MediaNext,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Next" ) },
-    { TQt::Key_MediaRecord,  TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Record" ) },
-    { TQt::Key_HomePage,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
-    { TQt::Key_Favorites,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Favorites" ) },
-    { TQt::Key_Search,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Search" ) },
-    { TQt::Key_Standby,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Standby" ) },
-    { TQt::Key_OpenUrl,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Open URL" ) },
-    { TQt::Key_LaunchMail,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Mail" ) },
-    { TQt::Key_LaunchMedia,  TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Media" ) },
-    { TQt::Key_Launch0,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (0)" ) },
-    { TQt::Key_Launch1,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (1)" ) },
-    { TQt::Key_Launch2,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (2)" ) },
-    { TQt::Key_Launch3,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (3)" ) },
-    { TQt::Key_Launch4,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (4)" ) },
-    { TQt::Key_Launch5,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (5)" ) },
-    { TQt::Key_Launch6,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (6)" ) },
-    { TQt::Key_Launch7,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (7)" ) },
-    { TQt::Key_Launch8,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (8)" ) },
-    { TQt::Key_Launch9,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (9)" ) },
-    { TQt::Key_LaunchA,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (A)" ) },
-    { TQt::Key_LaunchB,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (B)" ) },
-    { TQt::Key_LaunchC,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (C)" ) },
-    { TQt::Key_LaunchD,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (D)" ) },
-    { TQt::Key_LaunchE,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (E)" ) },
-    { TQt::Key_LaunchF,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (F)" ) },
+    { TQt::Key_Back,         TQT_TRANSLATE_NOOP( "TQAccel", "Back" ) },
+    { TQt::Key_Forward,      TQT_TRANSLATE_NOOP( "TQAccel", "Forward" ) },
+    { TQt::Key_Stop,         TQT_TRANSLATE_NOOP( "TQAccel", "Stop" ) },
+    { TQt::Key_Refresh,      TQT_TRANSLATE_NOOP( "TQAccel", "Refresh" ) },
+    { TQt::Key_VolumeDown,   TQT_TRANSLATE_NOOP( "TQAccel", "Volume Down" ) },
+    { TQt::Key_VolumeMute,   TQT_TRANSLATE_NOOP( "TQAccel", "Volume Mute" ) },
+    { TQt::Key_VolumeUp,     TQT_TRANSLATE_NOOP( "TQAccel", "Volume Up" ) },
+    { TQt::Key_BassBoost,    TQT_TRANSLATE_NOOP( "TQAccel", "Bass Boost" ) },
+    { TQt::Key_BassUp,       TQT_TRANSLATE_NOOP( "TQAccel", "Bass Up" ) },
+    { TQt::Key_BassDown,     TQT_TRANSLATE_NOOP( "TQAccel", "Bass Down" ) },
+    { TQt::Key_TrebleUp,     TQT_TRANSLATE_NOOP( "TQAccel", "Treble Up" ) },
+    { TQt::Key_TrebleDown,   TQT_TRANSLATE_NOOP( "TQAccel", "Treble Down" ) },
+    { TQt::Key_MediaPlay,    TQT_TRANSLATE_NOOP( "TQAccel", "Media Play" ) },
+    { TQt::Key_MediaStop,    TQT_TRANSLATE_NOOP( "TQAccel", "Media Stop" ) },
+    { TQt::Key_MediaPrev,    TQT_TRANSLATE_NOOP( "TQAccel", "Media Previous" ) },
+    { TQt::Key_MediaNext,    TQT_TRANSLATE_NOOP( "TQAccel", "Media Next" ) },
+    { TQt::Key_MediaRecord,  TQT_TRANSLATE_NOOP( "TQAccel", "Media Record" ) },
+    { TQt::Key_HomePage,     TQT_TRANSLATE_NOOP( "TQAccel", "Home" ) },
+    { TQt::Key_Favorites,    TQT_TRANSLATE_NOOP( "TQAccel", "Favorites" ) },
+    { TQt::Key_Search,       TQT_TRANSLATE_NOOP( "TQAccel", "Search" ) },
+    { TQt::Key_Standby,      TQT_TRANSLATE_NOOP( "TQAccel", "Standby" ) },
+    { TQt::Key_OpenUrl,      TQT_TRANSLATE_NOOP( "TQAccel", "Open URL" ) },
+    { TQt::Key_LaunchMail,   TQT_TRANSLATE_NOOP( "TQAccel", "Launch Mail" ) },
+    { TQt::Key_LaunchMedia,  TQT_TRANSLATE_NOOP( "TQAccel", "Launch Media" ) },
+    { TQt::Key_Launch0,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (0)" ) },
+    { TQt::Key_Launch1,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (1)" ) },
+    { TQt::Key_Launch2,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (2)" ) },
+    { TQt::Key_Launch3,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (3)" ) },
+    { TQt::Key_Launch4,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (4)" ) },
+    { TQt::Key_Launch5,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (5)" ) },
+    { TQt::Key_Launch6,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (6)" ) },
+    { TQt::Key_Launch7,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (7)" ) },
+    { TQt::Key_Launch8,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (8)" ) },
+    { TQt::Key_Launch9,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (9)" ) },
+    { TQt::Key_LaunchA,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (A)" ) },
+    { TQt::Key_LaunchB,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (B)" ) },
+    { TQt::Key_LaunchC,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (C)" ) },
+    { TQt::Key_LaunchD,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (D)" ) },
+    { TQt::Key_LaunchE,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (E)" ) },
+    { TQt::Key_LaunchF,      TQT_TRANSLATE_NOOP( "TQAccel", "Launch (F)" ) },
 
     // --------------------------------------------------------------
     // More consistent namings
-    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print Screen" ) },
-    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Up" ) },
-    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Down" ) },
-    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Caps Lock" ) },
-    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Num Lock" ) },
-    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Number Lock" ) },
-    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Scroll Lock" ) },
-    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Insert" ) },
-    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Delete" ) },
-    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Escape" ) },
-    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "System Request" ) },
+    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( "TQAccel", "Print Screen" ) },
+    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( "TQAccel", "Page Up" ) },
+    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( "TQAccel", "Page Down" ) },
+    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( "TQAccel", "Caps Lock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( "TQAccel", "Num Lock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( "TQAccel", "Number Lock" ) },
+    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( "TQAccel", "Scroll Lock" ) },
+    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( "TQAccel", "Insert" ) },
+    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( "TQAccel", "Delete" ) },
+    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( "TQAccel", "Escape" ) },
+    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( "TQAccel", "System Request" ) },
 
     { 0, 0 }
 };
@@ -916,7 +916,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 
     if ( ::tqqt_cast<TQTabWidget*>(obj) ) {
 	TQTabWidget* tw = (TQTabWidget*) obj;
-	TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING );
+	TQObjectList* tmpl = tw->queryList( "TQWidgetStack" );
 	TQWidgetStack *ws = (TQWidgetStack*)tmpl->first();
 	TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar();
 	for ( int i = 0; i < tb->count(); ++i ) {
@@ -1807,7 +1807,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
     if ( colspan < 1 )
 	colspan = 1;
 
-    TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
+    TQString className = e.attribute( "class", "TQWidget" );
 #ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     TQString parentClassName = WidgetFactory::classNameOf( parent );
     bool isPlugin =
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index adff44fd..1b21432f 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -151,7 +151,7 @@ void StartDialog::initFileOpen()
     TQPoint point( 0, 0 );
     fd->reparent( tab, point );
 
-    TQObjectList *l = fd->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING );
+    TQObjectList *l = fd->queryList( "TQPushButton" );
     TQObjectListIt it( *l );
     TQObject *obj;
     while ( (obj = it.current()) != 0 ) {
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index 162e20ce..9fd07ffc 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -686,7 +686,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
 TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init,
 				      const TQRect *r, Qt::Orientation orient )
 {
-    if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) {
+    if ( className == "TQPushButton" ) {
 	TQPushButton *b = 0;
 	if ( init ) {
 	    b = new QDesignerPushButton( parent, name );
@@ -697,7 +697,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	TQWidget *w = find_formwindow( b );
 	b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) );
 	return b;
-    } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQToolButton" ) {
 	if ( init ) {
 	    QDesignerToolButton *tb = new QDesignerToolButton( parent, name );
 	    if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(parent))) {
@@ -711,29 +711,29 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    return tb;
 	}
 	return new QDesignerToolButton( parent, name );
-    } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQCheckBox" ) {
 	if ( init ) {
 	    QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name );
 	    cb->setText( TQString::fromLatin1( name ) );
 	    return cb;
 	}
 	return new QDesignerCheckBox( parent, name );
-    } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQRadioButton" ) {
 	if ( init ) {
 	    QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name );
 	    rb->setText( TQString::fromLatin1( name ) );
 	    return rb;
 	}
 	return new QDesignerRadioButton( parent, name );
-    } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQGroupBox" ) {
 	if ( init )
 	    return new TQGroupBox( TQString::fromLatin1( name ), parent, name );
 	return new TQGroupBox( parent, name );
-    } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQButtonGroup" ) {
 	if ( init )
 	    return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
 	return new TQButtonGroup( parent, name );
-    } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQIconView" ) {
 #if !defined(TQT_NO_ICONVIEW)
 	TQIconView* iv = new TQIconView( parent, name );
 	if ( init )
@@ -742,7 +742,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 #else
 	return 0;
 #endif
-    } else if ( className == TQTABLE_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQTable" ) {
 #if !defined(TQT_NO_TABLE)
 	if ( init )
 	    return new TQTable( 3, 3, parent, name );
@@ -751,24 +751,24 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	return 0;
 #endif
 #ifndef TQT_NO_SQL
-    } else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQDataTable" ) {
 	return new TQDataTable( parent, name );
 #endif //TQT_NO_SQL
-    } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQDateEdit" ) {
 	return new TQDateEdit( parent, name );
-    } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQTimeEdit" ) {
 	return new TQTimeEdit( parent, name );
-    } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQDateTimeEdit" ) {
 	return new TQDateTimeEdit( parent, name );
     }
-    else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) {
+    else if ( className == "TQListBox" ) {
 	TQListBox* lb = new TQListBox( parent, name );
 	if ( init ) {
 	    lb->insertItem( i18n( "New Item" ) );
 	    lb->setCurrentItem( 0 );
 	}
 	return lb;
-    } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQListView" ) {
 	TQListView *lv = new TQListView( parent, name );
 	lv->setSorting( -1 );
 	if ( init ) {
@@ -776,17 +776,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    lv->setCurrentItem( new TQListViewItem( lv, i18n( "New Item" ) ) );
 	}
 	return lv;
-    } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING )
+    } else if ( className == "TQLineEdit" )
 	return new TQLineEdit( parent, name );
-    else if ( className == TQSPINBOX_OBJECT_NAME_STRING )
+    else if ( className == "TQSpinBox" )
 	return new TQSpinBox( parent, name );
-    else if ( className == TQSPLITTER_OBJECT_NAME_STRING )
+    else if ( className == "TQSplitter" )
 	return new TQSplitter( parent, name );
-    else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING )
+    else if ( className == "TQMultiLineEdit" )
 	return new TQMultiLineEdit( parent, name );
-    else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING )
+    else if ( className == "TQTextEdit" )
 	return new TQTextEdit( parent, name );
-    else if ( className == TQLABEL_OBJECT_NAME_STRING  || className == "TextLabel" ) {
+    else if ( className == "TQLabel"  || className == "TextLabel" ) {
 	QDesignerLabel *l = new QDesignerLabel( parent, name );
 	if ( init ) {
 	    l->setText( TQString::fromLatin1( name ) );
@@ -804,9 +804,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "scaledContents", TRUE );
 	}
 	return l;
-    } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
+    } else if ( className == "TQLayoutWidget" )
 	return new TQLayoutWidget( parent, name );
-    else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) {
+    else if ( className == "TQTabWidget" ) {
 	TQTabWidget *tw = new QDesignerTabWidget( parent, name );
 	if ( init ) {
 	    FormWindow *fw = find_formwindow( parent );
@@ -819,7 +819,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	}
 	return tw;
-    } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQWidgetStack" ) {
 	QDesignerWidgetStack *ws = new QDesignerWidgetStack( parent, name );
 	if ( init ) {
 	    FormWindow *fw = find_formwindow( parent );
@@ -829,9 +829,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    MetaDataBase::addEntry( TQT_TQOBJECT(ws) );
 	}
 	return ws;
-    } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQComboBox" ) {
 	return new TQComboBox( FALSE, parent, name );
-    } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQWidget" ) {
 	if ( parent &&
 	     ( ::tqqt_cast<FormWindow*>(parent) ||
 	       ::tqqt_cast<TQWizard*>(parent) ||
@@ -847,7 +847,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    }
 	}
 	return new TQWidget( parent, name );
-    } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQDialog" ) {
 	TQDialog *dia = 0;
 	if ( ::tqqt_cast<FormWindow*>(parent) )
 	    dia = new QDesignerDialog( (FormWindow*)parent, parent, name );
@@ -856,7 +856,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	if ( parent )
 	    dia->reparent( parent, TQPoint( 0, 0 ), TRUE );
 	return dia;
-    } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQWizard" ) {
 	TQWizard *wiz = new QDesignerWizard( parent, name );
 	if ( parent )
 	    wiz->reparent( parent, TQPoint( 0, 0 ), TRUE );
@@ -881,17 +881,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	else
 	    s->setOrientation( Qt::Horizontal );
 	return s;
-    } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING )
+    } else if ( className == "TQLCDNumber" )
 	return new TQLCDNumber( parent, name );
-    else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING )
+    else if ( className == "TQProgressBar" )
 	return new TQProgressBar( parent, name );
-    else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING )
+    else if ( className == "TQTextView" )
 	return new TQTextView( parent, name );
-    else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING )
+    else if ( className == "TQTextBrowser" )
 	return new TQTextBrowser( parent, name );
-    else if ( className == TQDIAL_OBJECT_NAME_STRING )
+    else if ( className == "TQDial" )
 	return new TQDial( parent, name );
-    else if ( className == TQSLIDER_OBJECT_NAME_STRING ) {
+    else if ( className == "TQSlider" ) {
 	TQSlider *s = new TQSlider( parent, name );
 	if ( !r )
 	    return s;
@@ -902,7 +902,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
 	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
 	return s;
-    } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQScrollBar" ) {
 	TQScrollBar *s = new TQScrollBar( parent, name );
 	if ( !r )
 	    return s;
@@ -913,7 +913,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
 	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
 	return s;
-    } else if ( className == TQFRAME_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQFrame" ) {
 	if ( !init )
 	    return new TQFrame( parent, name );
 	TQFrame *f = new TQFrame( parent, name );
@@ -932,7 +932,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	else if ( r->width() < r->height() )
 	    l->setOrientation( Qt::Vertical );
 	return l;
-    } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQMainWindow" ) {
 	TQMainWindow *mw = new TQMainWindow( parent, name, 0 );
 	mw->setDockEnabled( TQt::DockMinimized, FALSE );
 	QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" );
@@ -942,7 +942,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	(void)mw->statusBar();
 	dw->show();
 	return mw;
-    } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQToolBox" ) {
 	if ( !init )
 	    return new QDesignerToolBox( parent, name );
 	TQToolBox *tb = new QDesignerToolBox( parent, name );
@@ -958,12 +958,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	return tb;
     }
 #ifndef TQT_NO_SQL
-    else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
+    else if ( className == "TQDataBrowser" ) {
 	TQWidget *w = new QDesignerDataBrowser( parent, name );
 	if ( parent )
 	    w->reparent( parent, TQPoint( 0, 0 ), TRUE );
 	return w;
-    } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
+    } else if ( className == "TQDataView" ) {
 	TQWidget *w = new QDesignerDataView( parent, name );
 	if ( parent )
 	    w->reparent( parent, TQPoint( 0, 0 ), TRUE );
@@ -1021,7 +1021,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
     TQLayout *lay = w->layout();
 
     if ( ::tqqt_cast<TQGroupBox*>(w) ) {
-	TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
+	TQObjectList *l = TQT_TQOBJECT(lay)->queryList( "TQLayout" );
 	if ( l && l->first() )
 	    lay = (TQLayout*)l->first();
 	delete l;
@@ -1169,10 +1169,10 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
     else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->parent()) )
 	return ( lastWasAPassiveInteractor = TRUE );
 //    else if ( ::tqqt_cast<TQDockWindowHandle*>(o) )
-    else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) )
+    else if ( o->inherits( "TQDockWindowHandle" ) )
 	return ( lastWasAPassiveInteractor = TRUE );
 //    else if ( ::tqqt_cast<TQHideDock*>(o) )
-    else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) )
+    else if ( o->inherits( "TQHideDock" ) )
 	return ( lastWasAPassiveInteractor = TRUE );
     else if ( qstrcmp( o->name(), "designer_wizardstack_button" ) == 0 )
 	return ( lastWasAPassiveInteractor = TRUE );
@@ -1215,46 +1215,46 @@ const char* WidgetFactory::classNameOf( TQObject* o )
     if (WidgetDatabase::isCustomPluginWidget(WidgetDatabase::idFromClassName(o->className())))
         return o->className();
     else if ( ::tqqt_cast<QDesignerTabWidget*>(o) )
-	return TQTABWIDGET_OBJECT_NAME_STRING;
+	return "TQTabWidget";
     else if ( ::tqqt_cast<QDesignerWidgetStack*>(o) )
-	return TQWIDGETSTACK_OBJECT_NAME_STRING;
+	return "TQWidgetStack";
     else if ( ::tqqt_cast<TQWidgetStack*>(o) )
 	return "TQWeDoNotWantToBreakTabWidget";
     else if ( ::tqqt_cast<QDesignerDialog*>(o) )
-	return TQDIALOG_OBJECT_NAME_STRING;
+	return "TQDialog";
     else if ( ::tqqt_cast<QDesignerWidget*>(o) )
-	return TQWIDGET_OBJECT_NAME_STRING;
+	return "TQWidget";
     else if ( o->inherits( "CustomWidget" ) )
 	return ( (CustomWidget*)o )->realClassName().latin1();
     else if ( ::tqqt_cast<QDesignerLabel*>(o) )
-	return TQLABEL_OBJECT_NAME_STRING;
+	return "TQLabel";
     else if ( ::tqqt_cast<QDesignerWizard*>(o) )
-	return TQWIZARD_OBJECT_NAME_STRING;
+	return "TQWizard";
     else if ( ::tqqt_cast<QDesignerPushButton*>(o) )
-	return TQPUSHBUTTON_OBJECT_NAME_STRING;
+	return "TQPushButton";
     else if ( ::tqqt_cast<QDesignerToolButton*>(o) )
-	return TQTOOLBUTTON_OBJECT_NAME_STRING;
+	return "TQToolButton";
     else if ( ::tqqt_cast<QDesignerRadioButton*>(o) )
-	return TQRADIOBUTTON_OBJECT_NAME_STRING;
+	return "TQRadioButton";
     else if ( ::tqqt_cast<QDesignerCheckBox*>(o) )
-	return TQCHECKBOX_OBJECT_NAME_STRING;
+	return "TQCheckBox";
     else if ( ::tqqt_cast<MenuBarEditor*>(o) )
-	return TQMENUBAR_OBJECT_NAME_STRING;
+	return "TQMenuBar";
     else if ( ::tqqt_cast<QDesignerToolBar*>(o) )
-	return TQTOOLBAR_OBJECT_NAME_STRING;
+	return "TQToolBar";
     else if ( ::tqqt_cast<QDesignerAction*>(o) )
-	return TQACTION_OBJECT_NAME_STRING;
+	return "TQAction";
     else if ( ::tqqt_cast<QDesignerActionGroup*>(o) )
-	return TQACTIONGROUP_OBJECT_NAME_STRING;
+	return "TQActionGroup";
     else if ( ::tqqt_cast<PopupMenuEditor*>(o) )
-	return TQPOPUPMENU_OBJECT_NAME_STRING;
+	return "TQPopupMenu";
     else if ( ::tqqt_cast<QDesignerToolBox*>(o) )
-	return TQTOOLBOX_OBJECT_NAME_STRING;
+	return "TQToolBox";
 #ifndef TQT_NO_SQL
     else if ( ::tqqt_cast<QDesignerDataBrowser*>(o) )
-	return TQDATABROWSER_OBJECT_NAME_STRING;
+	return "TQDataBrowser";
     else if ( ::tqqt_cast<QDesignerDataView*>(o) )
-	return TQDATAVIEW_OBJECT_NAME_STRING;
+	return "TQDataView";
 #endif
     return o->className();
 }
@@ -1317,7 +1317,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
     }
     else if ( ::tqqt_cast<TQGroupBox*>(o) )
 	MetaDataBase::setPropertyChanged( o, "title", TRUE );
-    else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
+    else if ( o->isA( "TQFrame" ) ) {
 	MetaDataBase::setPropertyChanged( o, "frameShadow", TRUE );
 	MetaDataBase::setPropertyChanged( o, "frameShape", TRUE );
     } else if ( ::tqqt_cast<TQTabWidget*>(o) || ::tqqt_cast<TQWizard*>(o) ) {
@@ -1372,7 +1372,7 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget )
 	return TRUE;
     if ( className.contains( "IconView" ) )
 	return TRUE;
-    if ( className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING )
+    if ( className == "TQTextEdit" || className == "TQMultiLineEdit" )
 	return TRUE;
     if ( ::tqqt_cast<TQTable*>(editorWidget) != 0 )
 	return TRUE;
@@ -1435,7 +1435,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
 	return;
     }
 
-    if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING ) {
+    if ( className == "TQMultiLineEdit" || className == "TQTextEdit" ) {
 	MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw );
 	e->exec();
 	delete e;
@@ -1541,7 +1541,7 @@ void QDesignerLabel::updateBuddy()
     if ( myBuddy.isEmpty() )
 	return;
 
-    TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
+    TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, FALSE, TRUE );
     if ( !l || !l->first() ) {
 	delete l;
 	return;
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index feebe9c7..f248187e 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -402,13 +402,13 @@ public:
 	: TQToolButton( parent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) {
 	    ( (TQButtonGroup*)parentWidget() )->remove( this );
 	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}
@@ -426,13 +426,13 @@ public:
 	: TQRadioButton( parent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) {
 	    ( (TQButtonGroup*)parentWidget() )->remove( this );
 	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}
@@ -451,13 +451,13 @@ public:
 	: TQPushButton( parent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) {
 	    ( (TQButtonGroup*)parentWidget() )->remove( this );
 	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}
@@ -476,13 +476,13 @@ public:
 	: TQCheckBox( parent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) {
 	    ( (TQButtonGroup*)parentWidget() )->remove( this );
 	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}