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

6 files changed, 12 insertions, 12 deletions

diff --git a/kivio/plugins/kiviotexttool/plugin.cpp b/kivio/plugins/kiviotexttool/plugin.cpp
index cd9a43ec..fd173935 100644
--- a/kivio/plugins/kiviotexttool/plugin.cpp
+++ b/kivio/plugins/kiviotexttool/plugin.cpp
@@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviotexttool, TextToolFactory )
 
 KInstance* TextToolFactory::s_global = 0;
 
-TextToolFactory::TextToolFactory( TQObject* tqparent, const char* name )
-: KLibFactory( tqparent, name )
+TextToolFactory::TextToolFactory( TQObject* parent, const char* name )
+: KLibFactory( parent, name )
 {
   s_global = new KInstance("kivio");
 }
@@ -42,12 +42,12 @@ TextToolFactory::~TextToolFactory()
   delete s_global;
 }
 
-TQObject* TextToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
+TQObject* TextToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& )
 {
-  if ( !tqparent->inherits("KivioView") )
+  if ( !parent->inherits("KivioView") )
     return 0;
 
-  TQObject *obj = new TextTool( (KivioView*)tqparent );
+  TQObject *obj = new TextTool( (KivioView*)parent );
   return obj;
 }
 
diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h
index 1e30ddb0..f6194c14 100644
--- a/kivio/plugins/kiviotexttool/plugin.h
+++ b/kivio/plugins/kiviotexttool/plugin.h
@@ -30,10 +30,10 @@ class TextToolFactory : public KLibFactory
 { Q_OBJECT
   TQ_OBJECT
 public:
-  TextToolFactory( TQObject* tqparent = 0, const char* name = 0 );
+  TextToolFactory( TQObject* parent = 0, const char* name = 0 );
   ~TextToolFactory();
 
-  virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+  virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* global();
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index a68b9548..49a42589 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -35,8 +35,8 @@
 
 namespace Kivio {
 
-StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *tqparent, const char *name)
-  : KDialogBase(tqparent, name, true, caption, KDialogBase::Ok|KDialogBase::Cancel)
+StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent, const char *name)
+  : KDialogBase(parent, name, true, caption, KDialogBase::Ok|KDialogBase::Cancel)
 {
   m_hAlign = -1;
   m_vAlign = -1;
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.h b/kivio/plugins/kiviotexttool/stenciltexteditor.h
index d57cb9dd..7f61c5aa 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.h
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.h
@@ -36,7 +36,7 @@ class StencilTextEditor : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    StencilTextEditor(const TQString& caption, TQWidget *tqparent = 0, const char *name = 0);
+    StencilTextEditor(const TQString& caption, TQWidget *parent = 0, const char *name = 0);
     ~StencilTextEditor();
 
     void setFont(const TQFont& font);
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index 645a79a4..7d449ae0 100644
--- a/kivio/plugins/kiviotexttool/tool_text.cpp
+++ b/kivio/plugins/kiviotexttool/tool_text.cpp
@@ -46,7 +46,7 @@
 #include "stenciltexteditor.h"
 
 
-TextTool::TextTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Text Mouse Tool")
+TextTool::TextTool( KivioView* parent ) : Kivio::MouseTool(parent, "Text Mouse Tool")
 {
   m_textAction = new Kivio::MouseToolAction( i18n("Text Tool"), "text", Key_F2, actionCollection(), "text" );
   connect(m_textAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool)));
diff --git a/kivio/plugins/kiviotexttool/tool_text.h b/kivio/plugins/kiviotexttool/tool_text.h
index 1bc43bb9..f6c4870a 100644
--- a/kivio/plugins/kiviotexttool/tool_text.h
+++ b/kivio/plugins/kiviotexttool/tool_text.h
@@ -38,7 +38,7 @@ class KIVIO_EXPORT TextTool : public Kivio::MouseTool
   Q_OBJECT
   TQ_OBJECT
   public:
-    TextTool( KivioView* tqparent );
+    TextTool( KivioView* parent );
     ~TextTool();
   
     virtual bool processEvent(TQEvent* e);