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

diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index 08becf67..d4a8605d 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -552,12 +552,12 @@ void KisToolCurve::selectCurve()
     draw(false);
 }
 
-TQWidget* KisToolCurve::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolCurve::createOptionWidget(TQWidget* parent)
 {
     if (toolType() == TOOL_SHAPE || toolType() == TOOL_FREEHAND)
-        return super::createOptionWidget(tqparent);
+        return super::createOptionWidget(parent);
     else if (toolType() == TOOL_SELECT)
-        return createSelectionOptionWidget(tqparent);
+        return createSelectionOptionWidget(parent);
     else
         kdDebug(0) << "NO SUPPORT FOR THIS TOOL TYPE" << endl;
     return 0;
@@ -568,9 +568,9 @@ void KisToolCurve::slotSetAction(int action) {
         m_selectAction =(enumSelectionMode)action;
 }
 
-TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent)
 {
-    m_optWidget = new KisSelectionOptions(tqparent, m_subject);
+    m_optWidget = new KisSelectionOptions(parent, m_subject);
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(m_UIName);
 
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.h b/chalk/plugins/tools/tool_curves/kis_tool_curve.h
index 74d1ccda..d1c0886c 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.h
@@ -51,7 +51,7 @@ public:
     virtual ~KisToolCurve();
 
     virtual void update (KisCanvasSubject *subject);
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
     virtual void buttonPress(KisButtonPressEvent *event);
     virtual void move(KisMoveEvent *event);
@@ -179,7 +179,7 @@ public:
     /*
      * This initializes our Option Widget (called by createOptionWidget())
      */
-    virtual TQWidget* createSelectionOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createSelectionOptionWidget(TQWidget* parent);
     
     /*
      * This return our internal KisSelectionOptions if toolType() returns TOOL_SELECT
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
index 4b7e51d4..42806771 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
@@ -100,14 +100,14 @@ public:
         m_hCost = node.hCost();
         m_tCost = node.tCost();
         m_malus = node.malus();
-        m_parent = node.tqparent();
+        m_parent = node.parent();
     }
 
-    Node(const TQPoint& tqparent, const TQPoint& pos, int g, int h, bool malus)
+    Node(const TQPoint& parent, const TQPoint& pos, int g, int h, bool malus)
         : m_pos(pos), m_hCost(h), m_malus(malus)
     {
         setGCost(g);
-        m_parent = tqparent;
+        m_parent = parent;
     }
     ~Node ()
     {
@@ -120,7 +120,7 @@ public:
     TQPoint pos () const {return m_pos;}
     int col () const {return m_pos.x();}
     int row () const {return m_pos.y();}
-    TQPoint tqparent () const {return m_parent;}
+    TQPoint parent () const {return m_parent;}
 
     void setGCost (int g)
     {
@@ -230,8 +230,8 @@ KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2,
     return kernel;
 }
 
-KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *tqparent)
-    : m_parent(tqparent)
+KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *parent)
+    : m_parent(parent)
 {
     m_standardkeepselected = false;
 }
@@ -299,9 +299,9 @@ void KisCurveMagnetic::calculateCurve (KisCurve::iterator p1, KisCurve::iterator
             int col = (*i).col();
             int row = (*i).row();
             if ((*i) == endNode) {
-                while (current.tqparent() != TQPoint(-1,-1)) {
+                while (current.parent() != TQPoint(-1,-1)) {
                     it = addPoint(it,KisPoint(tl+current.pos()),false,false,LINEHINT);
-                    current = closedMatrix[current.tqparent().x()][current.tqparent().y()];
+                    current = closedMatrix[current.parent().x()][current.parent().y()];
                 }
                 return;
             }
@@ -759,9 +759,9 @@ void KisToolMagnetic::slotSetDistance (int dist)
     m_distance = dist;
 }
 
-TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
 {
-    m_optWidget = super::createOptionWidget(tqparent);
+    m_optWidget = super::createOptionWidget(parent);
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     TQGridLayout *box = new TQGridLayout(l, 2, 2, 3);
     box->setColStretch(0, 1);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
index ac7327fe..ca15aaef 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
@@ -53,7 +53,7 @@ class KisCurveMagnetic : public KisCurve {
 
 public:
 
-    KisCurveMagnetic (KisToolMagnetic *tqparent);
+    KisCurveMagnetic (KisToolMagnetic *parent);
     ~KisCurveMagnetic ();
 
     virtual KisCurve::iterator addPivot (iterator, const KisPoint&);
@@ -88,7 +88,7 @@ public:
     virtual KisCurve::iterator selectByMouse(KisCurve::iterator it);
 
     bool editingMode() {return m_editingMode;}
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
 public slots:
 
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc
index f9f5be33..d941c2dc 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cc
@@ -45,14 +45,14 @@ typedef KGenericFactory<ToolCurves> ToolCurvesFactory;
 K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) )
 
 
-ToolCurves::ToolCurves(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(ToolCurvesFactory::instance());
 
-    if ( tqparent->inherits("KisToolRegistry") )
+    if ( parent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent );
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent );
         r->add(new KisToolBezierPaintFactory());
         r->add(new KisToolBezierSelectFactory());
         r->add(new KisToolMagneticFactory());
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.h b/chalk/plugins/tools/tool_curves/tool_curves.h
index 82199e48..64bd1507 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.h
+++ b/chalk/plugins/tools/tool_curves/tool_curves.h
@@ -28,7 +28,7 @@ class ToolCurves : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    ToolCurves(TQObject *tqparent, const char *name, const TQStringList &);
+    ToolCurves(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ToolCurves();
 
 };