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/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h
index 22910672..8f2c713b 100644
--- a/lib/kofficeui/kcoloractions.h
+++ b/lib/kofficeui/kcoloractions.h
@@ -39,16 +39,16 @@ public:
     };
 
     // Create default (text) color action
-    KColorAction( const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 );
+    KColorAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
     KColorAction( const TQString& text, int accel,
-		  TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
-    KColorAction( TQObject* tqparent = 0, const char* name = 0 );
+		  TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
+    KColorAction( TQObject* parent = 0, const char* name = 0 );
 
     // Create a color action of a given type
     KColorAction( const TQString& text, Type type, int accel = 0,
-		  TQObject* tqparent = 0, const char* name = 0 );
+		  TQObject* parent = 0, const char* name = 0 );
     KColorAction( const TQString& text, Type type, int accel,
-		  TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
+		  TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     virtual void setColor( const TQColor &c );
     TQColor color() const;
@@ -78,7 +78,7 @@ public:
 
     KSelectColorAction( const TQString& text, Type type,
                         const TQObject* receiver, const char* slot,
-                        KActionCollection* tqparent, const char* name );
+                        KActionCollection* parent, const char* name );
     virtual ~KSelectColorAction();
 
     virtual int plug( TQWidget* w, int index = -1 );