rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 28 insertions, 28 deletions

diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index c2ece48b..93f6cc9b 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -495,7 +495,7 @@ TQString Resource::copy()
 }
 
 
-void Resource::paste( const TQString &cb, TQWidget *tqparent )
+void Resource::paste( const TQString &cb, TQWidget *parent )
 {
     if ( !formwindow )
 	return;
@@ -533,30 +533,30 @@ void Resource::paste( const TQString &cb, TQWidget *tqparent )
     formwindow->clearSelection( false );
     while ( !firstWidget.isNull() ) {
 	if ( firstWidget.tagName() == "widget" ) {
-	    TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 );
+	    TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 );
 	    if ( !w )
 		continue;
 	    widgets.append( w );
 	    int x = w->x() + formwindow->grid().x();
 	    int y = w->y() + formwindow->grid().y();
-	    if ( w->x() + w->width() > tqparent->width() )
-		x = TQMAX( 0, tqparent->width() - w->width() );
-	    if ( w->y() + w->height() > tqparent->height() )
-		y = TQMAX( 0, tqparent->height() - w->height() );
+	    if ( w->x() + w->width() > parent->width() )
+		x = TQMAX( 0, parent->width() - w->width() );
+	    if ( w->y() + w->height() > parent->height() )
+		y = TQMAX( 0, parent->height() - w->height() );
 	    if ( x != w->x() || y != w->y() )
 		w->move( x, y );
 	    formwindow->selectWidget( TQT_TQOBJECT(w) );
 	} else if ( firstWidget.tagName() == "spacer" ) {
-	    TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
+	    TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
 	    if ( !w )
 		continue;
 	    widgets.append( w );
 	    int x = w->x() + formwindow->grid().x();
 	    int y = w->y() + formwindow->grid().y();
-	    if ( w->x() + w->width() > tqparent->width() )
-		x = TQMAX( 0, tqparent->width() - w->width() );
-	    if ( w->y() + w->height() > tqparent->height() )
-		y = TQMAX( 0, tqparent->height() - w->height() );
+	    if ( w->x() + w->width() > parent->width() )
+		x = TQMAX( 0, parent->width() - w->width() );
+	    if ( w->y() + w->height() > parent->height() )
+		y = TQMAX( 0, parent->height() - w->height() );
 	    if ( x != w->x() || y != w->y() )
 		w->move( x, y );
 	    formwindow->selectWidget( TQT_TQOBJECT(w) );
@@ -1316,7 +1316,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c )
     ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl;
 }
 
-TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout )
+TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout )
 {
     lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -1335,7 +1335,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
     TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
 
     if ( !className.isNull() ) {
-	obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, false ));
+	obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false ));
 	if ( !obj )
 	    return 0;
 	if ( !mainContainerSet ) {
@@ -1368,9 +1368,9 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
 	tqlayout = 0;
 
 	if ( w && formwindow ) {
-	    if ( !tqparent || ( !tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
+	    if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
 		formwindow->insertWidget( w, pasting );
-	    else if ( tqparent && ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
+	    else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
 		MetaDataBase::addEntry( TQT_TQOBJECT(w) );
         if (w->inherits("Dialog"))
           dynamic_cast<Dialog*>(w)->setUseInternalParser(false);
@@ -1402,16 +1402,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
 	} else if ( n.tagName() == "attribute" && w ) {
 	    TQString attrib = n.attribute( "name" );
 	    TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
-	    if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+	    if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
 		if ( attrib == "title" )
-		    ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() );
+		    ( (TQTabWidget*)parent )->insertTab( w, v.toString() );
 	    } else
-        if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
+        if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
         if ( attrib == "label" )
-            ( (TQToolBox*)tqparent )->addItem( w, v.toString() );
-        } else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+            ( (TQToolBox*)parent )->addItem( w, v.toString() );
+        } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
 		if ( attrib == "title" )
-		    ( (TQWizard*)tqparent )->addPage( w, v.toString() );
+		    ( (TQWizard*)parent )->addPage( w, v.toString() );
 	    }
 	} else if ( n.tagName() == "item" ) {
 	    createItem( n, w );
@@ -1605,7 +1605,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
     }
 }
 
-TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o )
+TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -1618,7 +1618,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL
 	colspan = 1;
 
     Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"),
-						      tqparent, "spacer", false);
+						      parent, "spacer", false);
     spacer->setOrientation( o );
     spacer->setInteraciveMode( false );
     while ( !n.isNull() ) {
@@ -2429,12 +2429,12 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts
     ts << makeIndent( indent ) << "</actions>" << endl;
 }
 
-void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
+void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
 {
     TQDomElement n = e;
     TQAction *a = 0;
     if ( n.tagName() == "action" ) {
-	a = new QDesignerAction( tqparent );
+	a = new QDesignerAction( parent );
 	MetaDataBase::addEntry( a );
 	TQDomElement n2 = n.firstChild().toElement();
 	while ( !n2.isNull() ) {
@@ -2450,10 +2450,10 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+	if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
 	    formwindow->actionList().append( a );
     } else if ( n.tagName() == "actiongroup" ) {
-	a = new QDesignerActionGroup( tqparent );
+	a = new QDesignerActionGroup( parent );
 	MetaDataBase::addEntry( a );
 	TQDomElement n2 = n.firstChild().toElement();
 	while ( !n2.isNull() ) {
@@ -2472,7 +2472,7 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+	if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
 	    formwindow->actionList().append( a );
     }
 }