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/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 33 insertions, 33 deletions

diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index b908f8e9..43011071 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -123,9 +123,9 @@ FormWindow *find_formwindow( TQWidget *w )
     for (;;) {
 	if ( w->inherits( "FormWindow" ) )
 	    return (FormWindow*)w;
-	if ( !w->tqparentWidget() )
+	if ( !w->parentWidget() )
 	    return 0;
-	w = w->tqparentWidget();
+	w = w->parentWidget();
     }
 }
 
@@ -387,10 +387,10 @@ TQMap< int, TQStringList > *changedProperties = 0;
 
 /*!
   \class WidgetFactory widgetfactory.h
-  \brief Set of static functions for creating widgets, tqlayouts and do other stuff
+  \brief Set of static functions for creating widgets, layouts and do other stuff
 
   The widget factory offers functions to create widgets, create and
-  delete tqlayouts find out other details - all based on the
+  delete layouts find out other details - all based on the
   WidgetDatabase's data. So the functions that use ids use the same
   ids as in the WidgetDatabase.
 */
@@ -679,7 +679,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
 
     if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) &&
 	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
-	   widget && widget->tqparentWidget() && widget->tqparentWidget()->inherits( "FormWindow" ) ) )
+	   widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
     if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
@@ -1262,7 +1262,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
   TQWidget::tqlayout() of \a w or to 0 after the function call.
 */
 
-WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout )
 {
     tqlayout = 0;
 
@@ -1304,7 +1304,7 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&t
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
 {
     if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
@@ -1318,14 +1318,14 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
 {
     TQLayout *l = 0;
-    return tqlayoutType( w, l );
+    return layoutType( w, l );
 }
 
 
-TQWidget *WidgetFactory::tqlayoutParent( TQLayout *tqlayout )
+TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
 {
     TQObject *o = TQT_TQOBJECT(tqlayout);
     while ( o ) {
@@ -1365,20 +1365,20 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
 /*!  Returns the actual designer widget of the container \a w. This is
   normally \a w itself, but might be a tqparent or grand tqparent of \a w
   (e.g. when working with a tabwidget and \a w is the container which
-  contains and tqlayouts childs, but the actual widget known to the
+  contains and layouts childs, but the actual widget known to the
   designer is the tabwidget which is the tqparent of \a w. So this
   function returns the tabwidget then.)
 */
 
 TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w )
 {
-    if ( w->tqparentWidget() && w->tqparentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
-	w = w->tqparentWidget();
+    if ( w->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+	w = w->parentWidget();
     while ( w ) {
 	if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ||
-	     w && w->tqparentWidget() && w->tqparentWidget()->inherits( "FormWindow" ) )
+	     w && w->parentWidget() && w->parentWidget()->inherits( "FormWindow" ) )
 	    return w;
-	w = w->tqparentWidget();
+	w = w->parentWidget();
     }
     return w;
 }
@@ -1686,14 +1686,14 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
 	return TQVariant();
     } else if ( propName == "frameworkCode" ) {
 	return TQVariant( true, 0 );
-    } else if ( propName == "tqlayoutMargin" ) {
+    } else if ( propName == "layoutMargin" ) {
 	if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
 	    return TQVariant( 0 );
 	else if ( MainWindow::self->formWindow() )
-	    return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultMargin() );
-    } else if ( propName == "tqlayoutSpacing" ) {
+	    return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() );
+    } else if ( propName == "layoutSpacing" ) {
 	if ( MainWindow::self->formWindow() )
-	    return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultSpacing() );
+	    return TQVariant( MainWindow::self->formWindow()->layoutDefaultSpacing() );
     }
 
     return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName );
@@ -1794,7 +1794,7 @@ bool TQLayoutWidget::event( TQEvent *e )
 /*
   This function must be called on TQLayoutWidget creation and whenever
   the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout
-  to a TQVBoxLayout), because of the (illogical) way tqlayouting works.
+  to a TQVBoxLayout), because of the (illogical) way layouting works.
 */
 void TQLayoutWidget::updateSizePolicy()
 {
@@ -1819,21 +1819,21 @@ void TQLayoutWidget::updateSizePolicy()
 
     if ( tqlayout() ) {
 	/*
-	  tqparentLayout is set to the tqparent tqlayout if there is one and if it is
-	  top level, in which case tqlayouting is illogical.
+	  parentLayout is set to the tqparent tqlayout if there is one and if it is
+	  top level, in which case layouting is illogical.
 	*/
-	TQLayout *tqparentLayout = 0;
+	TQLayout *parentLayout = 0;
 	if ( tqparent() && tqparent()->isWidgetType() ) {
-	    tqparentLayout = ((TQWidget *)tqparent())->tqlayout();
-	    if ( tqparentLayout && tqparentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
-		tqparentLayout = 0;
+	    parentLayout = ((TQWidget *)tqparent())->tqlayout();
+	    if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
+		parentLayout = 0;
 	}
 
 	TQObjectListIt it( childrenListObject() );
 	TQObject *o;
 
 	if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
-	    if ( tqparentLayout && tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
+	    if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
 		vt = TQSizePolicy::Minimum;
 	    else
 		vt = TQSizePolicy::Fixed;
@@ -1854,7 +1854,7 @@ void TQLayoutWidget::updateSizePolicy()
 		    vt |= TQSizePolicy::Maximum;
 	    }
 	} else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
-	    if ( tqparentLayout && tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
+	    if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
 		ht = TQSizePolicy::Minimum;
 	    else
 		ht = TQSizePolicy::Fixed;
@@ -1877,10 +1877,10 @@ void TQLayoutWidget::updateSizePolicy()
 	} else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
 	    ht = TQSizePolicy::Fixed;
 	    vt = TQSizePolicy::Fixed;
-	    if ( tqparentLayout ) {
-		if ( tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
+	    if ( parentLayout ) {
+		if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
 		    ht = TQSizePolicy::Minimum;
-		else if ( tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
+		else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
 		    vt = TQSizePolicy::Minimum;
 	    }
 
@@ -1921,8 +1921,8 @@ void TQLayoutWidget::updateSizePolicy()
 
 void CustomWidget::paintEvent( TQPaintEvent *e )
 {
-    if ( tqparentWidget() && tqparentWidget()->inherits( "FormWindow" ) ) {
-	( (FormWindow*)tqparentWidget() )->paintGrid( this, e );
+    if ( parentWidget() && parentWidget()->inherits( "FormWindow" ) ) {
+	( (FormWindow*)parentWidget() )->paintGrid( this, e );
     } else {
 	TQPainter p( this );
 	p.fillRect( rect(), tqcolorGroup().dark() );