Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

1 files changed, 41 insertions, 41 deletions

diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index ed4ed2bf..2bf3c798 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -351,14 +351,14 @@ void MainWindow::setupLayoutActions()
     connect( actionEditGridLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutGrid() ) );
     actionEditGridLayout->setEnabled( FALSE );
 
-    actionEditSplitHorizontal = new DesignerAction( i18n( "Lay OutQt::Horizontally (in Splitter)" ), createIconSet("designer_editvtqlayoutsplit.png"),
+    actionEditSplitHorizontal = new DesignerAction( i18n( "Lay OutQt::Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"),
 					     i18n( "Lay OutQt::Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") );
     actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally (in Splitter)" ) );
     connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontalSplit() ) );
     actionEditSplitHorizontal->setEnabled( FALSE );
 
-    actionEditSplitVertical = new DesignerAction( i18n( "Lay OutQt::Vertically (in Splitter)" ), createIconSet("designer_edithtqlayoutsplit.png"),
+    actionEditSplitVertical = new DesignerAction( i18n( "Lay OutQt::Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"),
 					     i18n( "Lay OutQt::Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") );
     actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically (in Splitter)" ) );
@@ -392,20 +392,20 @@ void MainWindow::setupLayoutActions()
     TQWidget *w;
     commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) );
     w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() );
-    TQWhatsThis::add( tqlayoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
-    actionEditAdjustSize->addTo( tqlayoutToolBar );
-    tqlayoutToolBar->addSeparator();
-    actionEditHLayout->addTo( tqlayoutToolBar );
-    actionEditVLayout->addTo( tqlayoutToolBar );
-    actionEditGridLayout->addTo( tqlayoutToolBar );
-    actionEditSplitHorizontal->addTo( tqlayoutToolBar );
-    actionEditSplitVertical->addTo( tqlayoutToolBar );
-    actionEditBreakLayout->addTo( tqlayoutToolBar );
-    tqlayoutToolBar->addSeparator();
-    actionInsertSpacer->addTo( tqlayoutToolBar );
+    TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+    actionEditAdjustSize->addTo( layoutToolBar );
+    layoutToolBar->addSeparator();
+    actionEditHLayout->addTo( layoutToolBar );
+    actionEditVLayout->addTo( layoutToolBar );
+    actionEditGridLayout->addTo( layoutToolBar );
+    actionEditSplitHorizontal->addTo( layoutToolBar );
+    actionEditSplitVertical->addTo( layoutToolBar );
+    actionEditBreakLayout->addTo( layoutToolBar );
+    layoutToolBar->addSeparator();
+    actionInsertSpacer->addTo( layoutToolBar );
 
     TQPopupMenu *menu = new TQPopupMenu( this, "Layout" );
-    tqlayoutMenu = menu;
+    layoutMenu = menu;
     menubar->insertItem( i18n( "&Layout" ), menu, toolsMenuId + 1 );
     actionEditAdjustSize->addTo( menu );
     menu->insertSeparator();
@@ -851,7 +851,7 @@ void MainWindow::setupPreviewActions()
 {
     DesignerAction* a = 0;
     TQPopupMenu *menu = new TQPopupMenu( this, "Preview" );
-    tqlayoutMenu = menu;
+    layoutMenu = menu;
     menubar->insertItem( i18n( "&Preview" ), menu, toolsMenuId + 2 );
 
     a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, TQT_TQOBJECT(this), 0 );
@@ -1554,13 +1554,13 @@ void MainWindow::editPaste()
     TQWidgetList l( formWindow()->selectedWidgets() );
     if ( l.count() == 1 ) {
 	w = l.first();
-	if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+	if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
 	     ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) &&
 	       w != formWindow()->mainContainer() ) )
 	    w = formWindow()->mainContainer();
     }
 
-    if ( w && WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
+    if ( w && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
 	formWindow()->paste( tqApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) );
 	hierarchyView->widgetInserted( 0 );
 	formWindow()->commandHistory()->setModified( TRUE );
@@ -1611,42 +1611,42 @@ void MainWindow::editAdjustSize()
 
 void MainWindow::editLayoutHorizontal()
 {
-    if ( tqlayoutChilds )
+    if ( layoutChilds )
 	editLayoutContainerHorizontal();
-    else if ( tqlayoutSelected && formWindow() )
-	formWindow()->tqlayoutHorizontal();
+    else if ( layoutSelected && formWindow() )
+	formWindow()->layoutHorizontal();
 }
 
 void MainWindow::editLayoutVertical()
 {
-    if ( tqlayoutChilds )
+    if ( layoutChilds )
 	editLayoutContainerVertical();
-    else if ( tqlayoutSelected && formWindow() )
-	formWindow()->tqlayoutVertical();
+    else if ( layoutSelected && formWindow() )
+	formWindow()->layoutVertical();
 }
 
 void MainWindow::editLayoutHorizontalSplit()
 {
-    if ( tqlayoutChilds )
+    if ( layoutChilds )
 	; // no way to do that
-    else if ( tqlayoutSelected && formWindow() )
-	formWindow()->tqlayoutHorizontalSplit();
+    else if ( layoutSelected && formWindow() )
+	formWindow()->layoutHorizontalSplit();
 }
 
 void MainWindow::editLayoutVerticalSplit()
 {
-    if ( tqlayoutChilds )
+    if ( layoutChilds )
 	; // no way to do that
-    else if ( tqlayoutSelected && formWindow() )
-	formWindow()->tqlayoutVerticalSplit();
+    else if ( layoutSelected && formWindow() )
+	formWindow()->layoutVerticalSplit();
 }
 
 void MainWindow::editLayoutGrid()
 {
-    if ( tqlayoutChilds )
+    if ( layoutChilds )
 	editLayoutContainerGrid();
-    else if ( tqlayoutSelected && formWindow() )
-	formWindow()->tqlayoutGrid();
+    else if ( layoutSelected && formWindow() )
+	formWindow()->layoutGrid();
 }
 
 void MainWindow::editLayoutContainerVertical()
@@ -1658,7 +1658,7 @@ void MainWindow::editLayoutContainerVertical()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->tqlayoutVerticalContainer( w  );
+	formWindow()->layoutVerticalContainer( w  );
 }
 
 void MainWindow::editLayoutContainerHorizontal()
@@ -1670,7 +1670,7 @@ void MainWindow::editLayoutContainerHorizontal()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->tqlayoutHorizontalContainer( w );
+	formWindow()->layoutHorizontalContainer( w );
 }
 
 void MainWindow::editLayoutContainerGrid()
@@ -1682,7 +1682,7 @@ void MainWindow::editLayoutContainerGrid()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->tqlayoutGridContainer( w  );
+	formWindow()->layoutGridContainer( w  );
 }
 
 void MainWindow::editBreakLayout()
@@ -1692,15 +1692,15 @@ void MainWindow::editBreakLayout()
     TQWidget *w = formWindow()->mainContainer();
     if ( formWindow()->currentWidget() )
 	w = formWindow()->currentWidget();
-    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
-	 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
+    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
+	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
 	formWindow()->breakLayout( w );
 	return;
     } else {
 	TQWidgetList widgets = formWindow()->selectedWidgets();
 	for ( w = widgets.first(); w; w = widgets.next() ) {
-	    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
-		 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
+	    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
+		 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
 		break;
 	}
 	if ( w ) {
@@ -1710,8 +1710,8 @@ void MainWindow::editBreakLayout()
     }
 
     w = formWindow()->mainContainer();
-    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
-	 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
+	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
 	formWindow()->breakLayout( w );
 }