rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 6 insertions, 6 deletions

diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 4b77b9ef..49cbeb3b 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -97,7 +97,7 @@ KexiActionProxy::~KexiActionProxy()
 	for (;it.current();++it) {
 		it.current()->setActionProxyParent_internal( 0 );
 	}
-	//take me from tqparent
+	//take me from parent
 	if (m_actionProxyParent)
 		m_actionProxyParent->takeActionProxyChild( this );
 
@@ -158,7 +158,7 @@ KAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQStri
 	TQCString altName = a->name();
 	altName += "_alt";
 	KAction *alt_act = new KAction(alternativeText, a->iconSet(), a->shortcut(), 
-		0, 0, a->tqparent(), altName);
+		0, 0, a->parent(), altName);
 	TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate()));
 	alt_act->plug(w);
 
@@ -201,7 +201,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe
 					return true;
 			}
 		}
-		return m_actionProxyParent ? m_actionProxyParent->activateSharedAction(action_name, false) : false; //last chance: tqparent
+		return m_actionProxyParent ? m_actionProxyParent->activateSharedAction(action_name, false) : false; //last chance: parent
 	}
 	//activate in this proxy...
 	p->first->activate();
@@ -244,7 +244,7 @@ bool KexiActionProxy::isAvailable(const char* action_name, bool alsoCheckInChild
 					return it.current()->isAvailable(action_name, alsoCheckInChildren);
 			}
 		}
-		return m_actionProxyParent ? m_actionProxyParent->isAvailable(action_name, false) : false; //last chance: tqparent
+		return m_actionProxyParent ? m_actionProxyParent->isAvailable(action_name, false) : false; //last chance: parent
 	}
 	//supported explicitly:
 	return p->second != 0;
@@ -273,9 +273,9 @@ void KexiActionProxy::takeActionProxyChild( KexiActionProxy* child )
 		m_sharedActionChildren.take();
 }
 
-void KexiActionProxy::setActionProxyParent_internal( KexiActionProxy* tqparent )
+void KexiActionProxy::setActionProxyParent_internal( KexiActionProxy* parent )
 {
-	m_actionProxyParent = tqparent;
+	m_actionProxyParent = parent;
 }
 
 #include "kexiactionproxy_p.moc"