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

diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 2a9b383e..c0da86e9 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -29,41 +29,41 @@
 #include <kdebug.h>
 
 KColorAction::KColorAction( const TQString& text, int accel,
-			    TQObject* tqparent, const char* name )
-    : KAction( text, accel, tqparent, name )
+			    TQObject* parent, const char* name )
+    : KAction( text, accel, parent, name )
 {
     typ = TextColor;
     init();
 }
 
 KColorAction::KColorAction( const TQString& text, int accel,
-			    TQObject* receiver, const char* slot, TQObject* tqparent,
+			    TQObject* receiver, const char* slot, TQObject* parent,
 			    const char* name )
-    : KAction( text, accel, receiver, slot, tqparent, name )
+    : KAction( text, accel, receiver, slot, parent, name )
 {
     typ = TextColor;
     init();
 }
 
 KColorAction::KColorAction( const TQString& text, Type type, int accel,
-			    TQObject* tqparent, const char* name )
-    : KAction( text, accel, tqparent, name )
+			    TQObject* parent, const char* name )
+    : KAction( text, accel, parent, name )
 {
     typ = type;
     init();
 }
 
 KColorAction::KColorAction( const TQString& text, Type type, int accel,
-			    TQObject* receiver, const char* slot, TQObject* tqparent,
+			    TQObject* receiver, const char* slot, TQObject* parent,
 			    const char* name )
-    : KAction( text, accel, receiver, slot, tqparent, name )
+    : KAction( text, accel, receiver, slot, parent, name )
 {
     typ = type;
     init();
 }
 
-KColorAction::KColorAction( TQObject* tqparent, const char* name )
-    : KAction( tqparent, name )
+KColorAction::KColorAction( TQObject* parent, const char* name )
+    : KAction( parent, name )
 {
     typ = TextColor;
     init();
@@ -218,8 +218,8 @@ void KColorAction::createPixmap()
 
 KSelectColorAction::KSelectColorAction( const TQString& text, Type type,
                                         const TQObject* receiver, const char* slot,
-                                        KActionCollection* tqparent, const char* name ) :
-    KAction( text, KShortcut(), receiver, slot, tqparent, name ), m_type( type ),
+                                        KActionCollection* parent, const char* name ) :
+    KAction( text, KShortcut(), receiver, slot, parent, name ), m_type( type ),
     m_color( TQt::black )
 {
 }