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

16 files changed, 30 insertions, 30 deletions

diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
index ff5242d6..4a59c384 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
@@ -100,7 +100,7 @@ void KisToolSelectBrush::initPaint(KisEvent* /*e*/)
     KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("paintbrush", 0, painter());
     painter()->setPaintOp(op); // And now the painter owns the op and will destroy it.
 
-    // Set the cursor -- ideally. this should be a tqmask created from the brush,
+    // Set the cursor -- ideally. this should be a mask created from the brush,
     // now that X11 can handle colored cursors.
 #if 0
     // Setting cursors has no effect until the tool is selected again; this
@@ -143,12 +143,12 @@ void KisToolSelectBrush::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent)
 {
-    Q_UNUSED(tqparent);
+    Q_UNUSED(parent);
     // Commented out due to the fact that this doesn't actually work if you change the action
 #if 0
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Brush"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
index 374050f6..faeb32d8 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
@@ -47,7 +47,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 1; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
index c4c908fc..cc164680 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
@@ -183,9 +183,9 @@ void KisToolSelectContiguous::slotSetAction(int action)
 }
 
 
-TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Contiguous Area Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
index e4beb6b7..688276e0 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
@@ -54,7 +54,7 @@ public:
     virtual TQ_UINT32 priority() { return 7; }
     virtual enumToolType toolType() { return TOOL_SELECT; };
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
         virtual TQWidget* optionWidget();
 
     virtual void buttonPress(KisButtonPressEvent *event);
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
index efdae2f3..d16ab740 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
@@ -297,9 +297,9 @@ void KisToolSelectElliptical::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Elliptical Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
index f0d1a039..4c21cfcd 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
@@ -46,7 +46,7 @@ public:
 
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 4; }
-    virtual TQWidget * createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget * createOptionWidget(TQWidget* parent);
         virtual TQWidget* optionWidget();
     virtual enumToolType toolType() { return TOOL_SELECT; }
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
index 58a7778c..118281e1 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
@@ -100,7 +100,7 @@ void KisToolSelectEraser::initPaint(KisEvent */*e*/)
     KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("eraser", 0, painter());
     painter()->setPaintOp(op); // And now the painter owns the op and will destroy it.
 
-    // Set the cursor -- ideally. this should be a tqmask created from the brush,
+    // Set the cursor -- ideally. this should be a mask created from the brush,
     // now that X11 can handle colored cursors.
 #if 0
     // Setting cursors has no effect until the tool is selected again; this
@@ -130,12 +130,12 @@ void KisToolSelectEraser::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent)
 {
-    Q_UNUSED(tqparent);
+    Q_UNUSED(parent);
     // Commented out due to the fact that this doesn't actually work if you change the action
 #if 0
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Eraser"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
index 85bd5509..c796ec3c 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
@@ -45,7 +45,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 2; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
index b81762fb..8bac379c 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
@@ -267,9 +267,9 @@ void KisToolSelectOutline::setup(KActionCollection *collection)
 }
 
 
-TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Outline Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
index 74ecab78..08119c96 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
@@ -52,7 +52,7 @@ public:
     virtual void move(KisMoveEvent *event);
     virtual void buttonRelease(KisButtonReleaseEvent *event);
 
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
index 7bac7cc3..85a53c94 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
@@ -286,9 +286,9 @@ void KisToolSelectPolygonal::setup(KActionCollection *collection)
 }
 
 
-TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Polygonal Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
index 65a32ee6..6e2d62fa 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
@@ -58,7 +58,7 @@ public:
     virtual void doubleClick(KisDoubleClickEvent * event);
     
     void finish();
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
 public slots:
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
index aa7052af..54bfbdd6 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
@@ -298,9 +298,9 @@ void KisToolSelectRectangular::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Rectangular Selection"));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
index eb286cca..b2f8ecad 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
@@ -44,7 +44,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual TQ_UINT32 priority() { return 3; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
-    virtual TQWidget * createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget * createOptionWidget(TQWidget* parent);
         virtual TQWidget* optionWidget();
 
     virtual void paint(KisCanvasPainter& gc);
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc
index db4df1ab..fb0e6191 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cc
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cc
@@ -51,14 +51,14 @@ typedef KGenericFactory<SelectionTools> SelectionToolsFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) )
 
 
-SelectionTools::SelectionTools(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
      setInstance(SelectionToolsFactory::instance());
 
-     if ( tqparent->inherits("KisToolRegistry") )
+     if ( parent->inherits("KisToolRegistry") )
      {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
         r->add(new KisToolSelectOutlineFactory());
         r->add(new KisToolSelectPolygonalFactory());
         r->add(new KisToolSelectRectangularFactory());
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.h b/chalk/plugins/tools/selectiontools/selection_tools.h
index 2e448e3e..b3650ff2 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.h
+++ b/chalk/plugins/tools/selectiontools/selection_tools.h
@@ -36,7 +36,7 @@ class SelectionTools : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    SelectionTools(TQObject *tqparent, const char *name, const TQStringList &);
+    SelectionTools(TQObject *parent, const char *name, const TQStringList &);
     virtual ~SelectionTools();
 
 };