Rename *OBJECT_NAME_STRING

Signed-off-by: ormorph <roma251078@mail.ru>

1 files changed, 12 insertions, 12 deletions

diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index 8c35f8e6..8fa45d95 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -159,13 +159,13 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
 	w->raise();
     needMove = !layoutBase;
-    needReparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
+    needReparent = needMove || layoutBase->inherits( "TQLayoutWidget" ) || layoutBase->inherits( "TQSplitter" );
     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 );
@@ -208,7 +208,7 @@ void Layout::undoLayout()
     }
     formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false );
     WidgetFactory::deleteLayout( layoutBase );
-    if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
+    if ( parent != layoutBase && !layoutBase->inherits( "TQMainWindow" ) ) {
 	layoutBase->hide();
 	TQString n = layoutBase->name();
 	n.prepend( "qt_dead_widget_" );
@@ -231,11 +231,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 )
@@ -313,13 +313,13 @@ void HorizontalLayout::doLayout()
 		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
 	    else
 		layout->addWidget( w );
-	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+	    if ( w->inherits( "TQLayoutWidget" ) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
+    if ( layoutBase->inherits( "TQSplitter" ) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
 
     finishLayout( needMove, layout );
@@ -377,13 +377,13 @@ void VerticalLayout::doLayout()
 		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
 	    else
 		layout->addWidget( w );
-	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+	    if ( w->inherits( "TQLayoutWidget" ) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
+    if ( layoutBase->inherits( "TQSplitter" ) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
 
     finishLayout( needMove, layout );
@@ -749,7 +749,7 @@ void GridLayout::doLayout()
 	    } else {
 		layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
 	    }
-	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+	    if ( w->inherits( "TQLayoutWidget" ) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	    w->show();
 	} else {