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

diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp
index 7adce7f3..fdea1cf7 100644
--- a/kword/KWMailMergeLabelAction.cpp
+++ b/kword/KWMailMergeLabelAction.cpp
@@ -30,8 +30,8 @@
 class MailMergeDraggableLabel : public TQToolButton
 {
 public:
-    MailMergeDraggableLabel( KoMainWindow * mw, const TQString & text, TQWidget * tqparent = 0, const char * name = 0 )
-        : TQToolButton( tqparent, name ), m_mw(mw)
+    MailMergeDraggableLabel( KoMainWindow * mw, const TQString & text, TQWidget * parent = 0, const char * name = 0 )
+        : TQToolButton( parent, name ), m_mw(mw)
     {
         setText(text);
         setAcceptDrops(true);
@@ -103,8 +103,8 @@ private:
 
 
 KWMailMergeLabelAction::KWMailMergeLabelAction( const TQString &text, int accel,
-                    TQObject* receiver, const char* slot, TQObject *tqparent, const char *name )
-    : KAction( text, accel, receiver, slot, tqparent, name ), m_label( 0L )
+                    TQObject* receiver, const char* slot, TQObject *parent, const char *name )
+    : KAction( text, accel, receiver, slot, parent, name ), m_label( 0L )
 {
 }