From db9d51186b28bc2252032458b433ba5f8d1972bc Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmdi/kmdi/dockcontainer.cpp | 12 ++++++------ kmdi/kmdi/guiclient.cpp | 2 +- kmdi/kmdichildfrm.cpp | 6 +++--- kmdi/kmdidockcontainer.cpp | 20 ++++++++++---------- kmdi/kmdiguiclient.cpp | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kmdi') diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 19b013d6b..40e490aa7 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -149,7 +149,7 @@ void DockContainer::init() if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= ::tqqt_cast(parentDockWidget()-> - tqparent()); + parent()); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -421,7 +421,7 @@ void DockContainer::tabClicked(int t) if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= ::tqqt_cast(parentDockWidget()-> - tqparent()); + parent()); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -464,8 +464,8 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) { // group name TQString grp=cfg->group(); - cfg->deleteGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name())); - cfg->setGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name())); + cfg->deleteGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); + cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); // save overlap mode cfg->writeEntry("overlapMode",isOverlapMode()); @@ -474,7 +474,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= ::tqqt_cast(parentDockWidget()-> - tqparent()); + parent()); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); } @@ -507,7 +507,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix) { TQString grp=cfg->group(); - cfg->setGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name())); + cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); if (cfg->readBoolEntry("overlapMode")) activateOverlapMode( m_vertical?m_tb->width():m_tb->height() ); diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 935378d08..b58b538c7 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -202,7 +202,7 @@ void ToggleToolViewAction::anDWChanged() setChecked(true); else if (isChecked() && (m_dw->parentDockTabGroup() && ((::tqqt_cast(m_dw->parentDockTabGroup()-> - tqparent()))->mayBeShow()))) + parent()))->mayBeShow()))) setChecked(false); } diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index 47bb7b49f..4e57649c7 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -1068,7 +1068,7 @@ void KMdiChildFrm::doResize( bool captionOnly ) static bool hasParent( TQObject* par, TQObject* o ) { while ( o && o != par ) - o = o->tqparent(); + o = o->parent(); return o == par; } @@ -1086,7 +1086,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) while ( ( pObj != 0L ) && !bIsChild ) { bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) ); - pObj = pObj->tqparent(); + pObj = pObj->parent(); } // unset the resize cursor if the cursor moved from the frame into a inner widget if ( bIsChild ) @@ -1112,7 +1112,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) m_pClient->activate(); } - if ( ( TQT_BASE_OBJECT(obj->tqparent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) ) + if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) ) { TQWidget* w = ( TQWidget* ) obj; if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) ) diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 6dc2a5cd0..65fe98e02 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -170,9 +170,9 @@ void KMdiDockContainer::init() if (!overlap) deactivateOverlapMode(); // try to restore splitter size - if ( parentDockWidget() && parentDockWidget()->tqparent() ) + if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = ::tqqt_cast( parentDockWidget()->tqparent() ); + KDockSplitter * sp = ::tqqt_cast( parentDockWidget()->parent() ); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -465,9 +465,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 = ::tqqt_cast( parentDockWidget()->tqparent() ); + KDockSplitter * sp = ::tqqt_cast( parentDockWidget()->parent() ); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -517,7 +517,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl ) TQDomDocument doc = dockEl.ownerDocument(); TQDomElement el; el = doc.createElement( "name" ); - el.appendChild( doc.createTextNode( TQString( "%1" ).arg( tqparent() ->name() ) ) ); + el.appendChild( doc.createTextNode( TQString( "%1" ).arg( parent() ->name() ) ) ); dockEl.appendChild( el ); el = doc.createElement( "overlapMode" ); el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) ); @@ -627,8 +627,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" ).arg( tqparent() ->name() ) ); - cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( tqparent() ->name() ) ); + cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); + cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); if ( isOverlapMode() ) cfg->writeEntry( "overlapMode", "true" ); @@ -636,9 +636,9 @@ 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 = ::tqqt_cast( parentDockWidget() -> tqparent() ); + KDockSplitter * sp = ::tqqt_cast( parentDockWidget() -> parent() ); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); } @@ -674,7 +674,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" ).arg( tqparent() ->name() ) ); + cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); if ( cfg->readEntry( "overlapMode" ) != "false" ) activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() ); diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index a34df98f6..f65a21f48 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged() setChecked( true ); else if ( isChecked() && ( m_dw->parentDockTabGroup() && ( ( ::tqqt_cast( m_dw->parentDockTabGroup() -> - tqparent() ) ) ->mayBeShow() ) ) ) + parent() ) ) ->mayBeShow() ) ) ) setChecked( false ); } -- cgit v1.2.1