Runtime object naming repaired in kdewebdev

NOTE: runtime object naming still needs to be checked for stray "Q*" strings


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

1 files changed, 15 insertions, 15 deletions

diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index 4d8e369d..a0f8ec37 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -597,14 +597,14 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	    if ( formWindow()->isMainContainer( widget ) )
 		formWindow()->setName( v.toCString() );
 	}
-	if ( propName == "name" && widget->inherits( "TQAction" ) &&
+	if ( propName == "name" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) &&
 	     formWindow()->mainContainer() &&
-	     formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) {
+	     formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
 	    formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)widget );
 	}
-	if ( propName == "iconSet" && widget->inherits( "TQAction" ) &&
+	if ( propName == "iconSet" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) &&
 	     formWindow()->mainContainer() &&
-	     formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) {
+	     formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
 	    formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)widget );
 	}
 	if ( propName == "caption" ) {
@@ -751,9 +751,9 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
     margin = MetaDataBase::margin( layoutBase );
     layout = 0;
     if ( lay == WidgetFactory::HBox )
-	layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) );
+	layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::VBox )
-	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) );
+	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::Grid )
 	layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( QMAX( 5, fw->grid().x()), QMAX( 5, fw->grid().y()) ), false );
 }
@@ -1605,7 +1605,7 @@ void AddActionToToolBarCommand::execute()
 	toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action );
 	( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar );
     }
-    if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) {
+    if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	if ( index == -1 )
 	    toolBar->appendAction( action );
 	else
@@ -1619,7 +1619,7 @@ void AddActionToToolBarCommand::execute()
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
-		if ( !o->inherits( "TQAction" ) )
+		if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
 		// ### fix it for nested actiongroups
 		if ( o->inherits( "QDesignerAction" ) ) {
@@ -1649,7 +1649,7 @@ void AddActionToToolBarCommand::unexecute()
     toolBar->removeAction( action );
     action->removeFrom( toolBar );
     TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) );
-    if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) {
+    if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	action->removeEventFilter( toolBar );
     } else {
 	if ( action->children() ) {
@@ -1657,7 +1657,7 @@ void AddActionToToolBarCommand::unexecute()
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
-		if ( !o->inherits( "TQAction" ) )
+		if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
 		if ( o->inherits( "QDesignerAction" ) ) {
 		    o->removeEventFilter( toolBar );
@@ -1678,7 +1678,7 @@ AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow
 
 void AddActionToPopupCommand::execute()
 {
-    if ( action->inherits( "TQActionGroup" ) ) {
+    if ( action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) {
 	if ( ( (TQActionGroup*)action )->usesDropDown() ) {
 	    action->addTo( popup );
 	    popup->insertAction( index, action );
@@ -1690,7 +1690,7 @@ void AddActionToPopupCommand::execute()
 		while ( it.current() ) {
 		    TQObject *o = it.current();
 		    ++it;
-		    if ( !o->inherits( "TQAction" ) )
+		    if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 			continue;
 		    QDesignerAction *ac = (QDesignerAction*)o;
 		    popup->insertAction( index + (i++), ac );
@@ -1714,7 +1714,7 @@ void AddActionToPopupCommand::unexecute()
     action->removeFrom( popup );
     popup->removeAction( action );
     TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) );
-    if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) {
+    if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	action->removeEventFilter( popup );
     } else {
 	if ( action->children() ) {
@@ -1722,7 +1722,7 @@ void AddActionToPopupCommand::unexecute()
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
-		if ( !o->inherits( "TQAction" ) )
+		if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
 		if ( o->inherits( "QDesignerAction" ) ) {
 		    o->removeEventFilter( popup );
@@ -1748,7 +1748,7 @@ void AddMenuCommand::execute()
 	formWindow()->unify( popup, n, true );
 	popup->setName( n );
     }
-    if ( !mainWindow->child( 0, "TQMenuBar" ) ) {
+    if ( !mainWindow->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) {
 	menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow );
 	menuBar->setName( "menubar" );
     } else {