Rename obsolete tq methods to standard names

(cherry picked from commit abcbb684982167791304dc2fe0bc979489506b43)

1 files changed, 22 insertions, 22 deletions

diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index 56694eda..2e786a73 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -85,7 +85,7 @@ void Layout::setup()
     TQWidget *w = 0;
 
     // Go through all widgets of the list we got. As we can only
-    // tqlayout widgets which have the same parent, we first do some
+    // layout widgets which have the same parent, we first do some
     // sorting which means create a list for each parent containing
     // its child here. After that we keep working on the list of
     // childs which has the most entries.
@@ -120,7 +120,7 @@ void Layout::setup()
     }
 
     // If we found no list (because no widget did fit at all) or the
-    // best list has only one entry and we do not tqlayout a container,
+    // best list has only one entry and we do not layout a container,
     // we leave here.
     if ( !lastList || ( lastList->count() < 2 &&
 			( !layoutBase ||
@@ -133,11 +133,11 @@ void Layout::setup()
     }
 
     // Now we have a new and clean widget list, which makes sense
-    // to tqlayout
+    // to layout
     widgets = *lastList;
     // Also use the only correct parent later, so store it
     parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
-    // Now calculate the position where the tqlayout-meta-widget should
+    // Now calculate the position where the layout-meta-widget should
     // be placed and connect to widgetDestroyed() signals of the
     // widgets to get informed if one gets deleted to be able to
     // handle that and do not crash in this case
@@ -149,7 +149,7 @@ void Layout::setup()
 	geometries.insert( w, TQRect( w->pos(), w->size() ) );
 	// Change the Z-order, as saving/loading uses the Z-order for
 	// writing/creating widgets and this has to be the same as in
-	// the tqlayout. Else saving + loading will give different results
+	// the layout. Else saving + loading will give different results
 	w->raise();
     }
 }
@@ -182,7 +182,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
     return TRUE;
 }
 
-void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
+void Layout::finishLayout( bool needMove, TQLayout *layout )
 {
     if ( needMove )
 	layoutBase->move( startPoint );
@@ -193,7 +193,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
 	layoutBase->setGeometry( oldGeometry );
     oldGeometry = g;
     layoutBase->show();
-    tqlayout->activate();
+    layout->activate();
     formWindow->insertWidget( layoutBase );
     formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
     TQString n = layoutBase->name();
@@ -311,16 +311,16 @@ void HorizontalLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
+    TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
+		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
 	    else
-		tqlayout->addWidget( w );
+		layout->addWidget( w );
 	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
@@ -330,7 +330,7 @@ void HorizontalLayout::doLayout()
     if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
 
-    finishLayout( needMove, tqlayout );
+    finishLayout( needMove, layout );
 }
 
 
@@ -375,16 +375,16 @@ void VerticalLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
+    TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
+		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
 	    else
-		tqlayout->addWidget( w );
+		layout->addWidget( w );
 	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
@@ -394,7 +394,7 @@ void VerticalLayout::doLayout()
     if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
 
-    finishLayout( needMove, tqlayout );
+    finishLayout( needMove, layout );
 }
 
 
@@ -747,7 +747,7 @@ void GridLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
+    QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
 
     if ( !grid )
 	buildGrid();
@@ -759,18 +759,18 @@ void GridLayout::doLayout()
 	    if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 		w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	    if ( rs * cs == 1 ) {
-		tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
+		layout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
 	    } else {
-		tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
+		layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
 	    }
 	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	    w->show();
 	} else {
-	    qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() );
+	    qWarning("ooops, widget '%s' does not fit in layout", w->name() );
 	}
     }
-    finishLayout( needMove, tqlayout );
+    finishLayout( needMove, layout );
 }
 
 void GridLayout::setup()
@@ -787,7 +787,7 @@ void GridLayout::buildGrid()
     // Pixel to cell conversion:
     // By keeping a list of start'n'stop values (x & y) for each widget,
     // it is possible to create a very small grid of cells to represent
-    // the widget tqlayout.
+    // the widget layout.
     // -----------------------------------------------------------------
 
     // We need a list of both start and stop values for x- & y-axis
@@ -829,7 +829,7 @@ void GridLayout::buildGrid()
 		current++;
     }
 
-    // Create the smallest grid possible to represent the current tqlayout
+    // Create the smallest grid possible to represent the current layout
     // Since no widget will be placed in the last row and column, we'll
     // skip them to increase speed even further
     delete grid;