Fix a number of runtime object identification problems which led to an even larger array of minor glitches

NOTE: kdevelop and kdewebdev still need to be fully repaired


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 13 deletions

diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 874a410d..8ea48706 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -263,15 +263,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" ), this, 0, FALSE );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIDGET_OBJECT_NAME_STRING ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLabel" ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLABEL_OBJECT_NAME_STRING ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQTabWidget" ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQTABWIDGET_OBJECT_NAME_STRING ), this, 0, FALSE );
     delete w;
-    w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this, 0, FALSE );
+    w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this, 0, FALSE );
     delete w;
     setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE );
     actionEditor->parentWidget()->hide();
@@ -618,7 +618,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet )
 	if ( style )
 	    w->setStyle( style );
 
-	TQObjectList *l = w->queryList( "TQWidget" );
+	TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( style )
 		( (TQWidget*)o )->setStyle( style );
@@ -1555,18 +1555,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") != 0 )
+    if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	text = 0;
     const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
-    if ( title && qstrcmp( title->type(), "TQString") != 0 )
+    if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	title = 0;
     const TQMetaProperty* pagetitle =
 	w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
-    if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 )
+    if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	pagetitle = 0;
     const TQMetaProperty* pixmap =
 	w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE );
-    if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 )
+    if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
 	pixmap = 0;
 
     if ( text && text->designable(w) ||
@@ -2935,11 +2935,11 @@ void MainWindow::setupActionManager()
 	TQPopupMenu *menu = 0;
 	TQToolBar *tb = 0;
 
-	if ( !( menu = (TQPopupMenu*)child( grp.latin1(), "TQPopupMenu" ) ) ) {
+	if ( !( menu = (TQPopupMenu*)child( grp.latin1(), TQPOPUPMENU_OBJECT_NAME_STRING ) ) ) {
 	    menu = new TQPopupMenu( this, grp.latin1() );
 	    menuBar()->insertItem( i18n( grp ), menu );
 	}
-	if ( !( tb = (TQToolBar*)child( grp.latin1(), "TQToolBar" ) ) ) {
+	if ( !( tb = (TQToolBar*)child( grp.latin1(), TQTOOLBAR_OBJECT_NAME_STRING ) ) ) {
 	    tb = new TQToolBar( this, grp.latin1() );
 	    tb->setCloseMode( TQDockWindow::Undocked );
 	    addToolBar( tb, grp );
@@ -3298,7 +3298,7 @@ void MainWindow::finishedRun()
 void MainWindow::enableAll( bool enable )
 {
     menuBar()->setEnabled( enable );
-    TQObjectList *l = queryList( "TQDockWindow" );
+    TQObjectList *l = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	if ( o == wspace->parentWidget() ||
 	     o == oWindow->parentWidget() ||