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, 17 insertions, 17 deletions

diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
index 3041834e..f196d1a0 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -49,8 +49,8 @@ static const char* const kmdi_not_close_xpm[] =
         "#####"
     };
 
-KMdiDockContainer::KMdiDockContainer( TQWidget *tqparent, TQWidget *win, int position, int flags )
-		: TQWidget( tqparent ), KDockContainer()
+KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags )
+		: TQWidget( parent ), KDockContainer()
 {
 	m_tabSwitching = false;
 	m_block = false;
@@ -167,9 +167,9 @@ void KMdiDockContainer::init()
 	}
 
 	// try to restore splitter size
-	if ( parentDockWidget() && parentDockWidget()->tqparent() )
+	if ( parentDockWidget() && parentDockWidget()->parent() )
 	{
-		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
+		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) );
 		if ( sp )
 			sp->setSeparatorPosX( m_separatorPos );
 	}
@@ -177,7 +177,7 @@ void KMdiDockContainer::init()
 
 KDockWidget* KMdiDockContainer::parentDockWidget()
 {
-	return ( ( KDockWidget* ) tqparent() );
+	return ( ( KDockWidget* ) parent() );
 }
 
 void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const TQString &text, int & )
@@ -462,9 +462,9 @@ void KMdiDockContainer::tabClicked( int t )
 	{
 		kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl;
 		// try save splitter position
-		if ( parentDockWidget() && parentDockWidget()->tqparent() )
+		if ( parentDockWidget() && parentDockWidget()->parent() )
 		{
-			KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
+			KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) );
 			if ( sp )
 				m_separatorPos = sp->separatorPos();
 		}
@@ -514,7 +514,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl )
 	TQDomDocument doc = dockEl.ownerDocument();
 	TQDomElement el;
 	el = doc.createElement( "name" );
-	el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( tqparent() ->name() ) ) );
+	el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( parent() ->name() ) ) );
 	dockEl.appendChild( el );
 	el = doc.createElement( "overlapMode" );
 	el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) );
@@ -569,7 +569,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 		}
 		else if ( el.tagName() == "child" )
 		{
-			KDockWidget * dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( el.text() );
+			KDockWidget * dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( el.text() );
 			if ( dw )
 			{
 				if ( el.hasAttribute( "tabCaption" ) )
@@ -580,7 +580,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 				{
 					dw->setToolTipString( el.attribute( "tabTooltip" ) );
 				}
-				dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter );
+				dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter );
 			}
 		}
 	}
@@ -624,8 +624,8 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
+	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) );
 
 	if ( isOverlapMode() )
 		cfg->writeEntry( "overlapMode", "true" );
@@ -633,10 +633,10 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 		cfg->writeEntry( "overlapMode", "false" );
 
 	// try to save the splitter position
-	if ( parentDockWidget() && parentDockWidget() ->tqparent() )
+	if ( parentDockWidget() && parentDockWidget() ->parent() )
 	{
 		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
-		                     tqparent() ->qt_cast( "KDockSplitter" ) );
+		                     parent() ->qt_cast( "KDockSplitter" ) );
 		if ( sp )
 			cfg->writeEntry( "separatorPos", m_separatorPos );
 	}
@@ -672,7 +672,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) );
 
 	if ( cfg->readEntry( "overlapMode" ) != "false" )
 		activateOverlapMode( m_tb->width() );
@@ -689,7 +689,7 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 		if ( dwn.isEmpty() )
 			break;
 		kdDebug( 760 ) << k_funcinfo << "configuring dockwidget :" << dwn << endl;
-		KDockWidget *dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( dwn );
+		KDockWidget *dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( dwn );
 		if ( dw )
 		{
 			TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).tqarg( i ) );
@@ -702,7 +702,7 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 			{
 				dw->setToolTipString( s );
 			}
-			dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter );
+			dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter );
 		}
 		if ( cfg->readBoolEntry( dwn, false ) )
 			raise = dwn;