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

14 files changed, 27 insertions, 27 deletions

diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cc
index 61d06e982..0a9298dad 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cc
+++ b/chalk/plugins/tools/defaulttools/default_tools.cc
@@ -56,14 +56,14 @@ typedef KGenericFactory<DefaultTools> DefaultToolsFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkdefaulttools, DefaultToolsFactory( "chalk" ) )
 
 
-DefaultTools::DefaultTools(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+DefaultTools::DefaultTools(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(DefaultToolsFactory::instance());
 
-     if ( tqparent->inherits("KisToolRegistry") )
+     if ( parent->inherits("KisToolRegistry") )
      {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
 
         r->add(new KisToolFillFactory());
         r->add(new KisToolGradientFactory());
diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h
index c50a9147b..891f2b9aa 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.h
+++ b/chalk/plugins/tools/defaulttools/default_tools.h
@@ -36,7 +36,7 @@ class DefaultTools : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    DefaultTools(TQObject *tqparent, const char *name, const TQStringList &);
+    DefaultTools(TQObject *parent, const char *name, const TQStringList &);
     virtual ~DefaultTools();
 
 };
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index 373e0a075..384e4e263 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -147,9 +147,9 @@ void KisToolBrush::slotSetPaintingMode( int mode )
 }
 
 
-TQWidget* KisToolBrush::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolBrush::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
     m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect");
     m_chkDirect->setChecked(true);
     connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int)));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.h b/chalk/plugins/tools/defaulttools/kis_tool_brush.h
index a23e8d12a..cc40a8c0f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.h
@@ -45,7 +45,7 @@ public:
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 0; }
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
 
 protected:
     
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index b238e746d..6aff68c8d 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -221,9 +221,9 @@ void KisToolColorPicker::setup(KActionCollection *collection)
     }
 }
 
-TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent)
 {
-    m_optionsWidget = new ColorPickerOptionsWidget(tqparent);
+    m_optionsWidget = new ColorPickerOptionsWidget(parent);
 
     m_optionsWidget->cbUpdateCurrentColour->setChecked(m_updateColor);
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
index ab59ef172..b6ee36d32 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
@@ -42,7 +42,7 @@ public:
     virtual void update(KisCanvasSubject *subject);
     virtual void setup(KActionCollection *collection);
     virtual void buttonPress(KisButtonPressEvent *e);
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
     virtual enumToolType toolType() { return TOOL_FILL; }
     virtual TQ_UINT32 priority() { return 3; }
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
index 9619c6aea..341bbe9af 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
@@ -230,9 +230,9 @@ TQString KisToolDuplicate::quickHelp() const {
     return i18n("To start, shift-click on the place you want to duplicate from. Then you can start painting. An indication of where you are copying from will be displayed while drawing and moving the mouse.");
 }
 
-TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* parent)
 {
-    TQWidget* widget = KisToolPaint::createOptionWidget(tqparent);
+    TQWidget* widget = KisToolPaint::createOptionWidget(parent);
     m_healing = new TQCheckBox(widget);
     m_healing->setChecked( false);
     addOptionWidgetOption(m_healing, new TQLabel(i18n("Healing"), widget ));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
index 8a2983180..ec04a592b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
@@ -52,7 +52,7 @@ public:
                  const double yTilt);
 
     virtual TQString quickHelp() const;
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
 protected slots:
     virtual void activate();
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index 5a919771d..f15bf7781 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -158,9 +158,9 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e)
     notifyModified();
 }
 
-TQWidget* KisToolFill::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolFill::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
 
     m_lbThreshold = new TQLabel(i18n("Threshold: "), widget);
     m_slThreshold = new KIntNumInput( widget, "int_widget");
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.h b/chalk/plugins/tools/defaulttools/kis_tool_fill.h
index 61087243c..01b1f139f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.h
@@ -55,7 +55,7 @@ public:
 
     bool flood(int startX, int startY);
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 
 public slots:
     virtual void slotSetThreshold(int);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
index 4eb685a58..6df9f8da4 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
@@ -226,9 +226,9 @@ void KisToolGradient::paintLine(KisCanvasPainter& gc)
     }
 }
 
-TQWidget* KisToolGradient::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
     Q_CHECK_PTR(widget);
 
     m_lbShape = new TQLabel(i18n("Shape:"), widget);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
index 59d78ad30..29df8bf7b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
@@ -67,7 +67,7 @@ public:
     virtual void paint(KisCanvasPainter& gc);
     virtual void paint(KisCanvasPainter& gc, const TQRect& rc);
 
-    TQWidget* createOptionWidget(TQWidget* tqparent);
+    TQWidget* createOptionWidget(TQWidget* parent);
 
 public slots:
     void slotSetShape(int);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index df2479172..bf23b4412 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
@@ -121,10 +121,10 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)
         TQ_INT32 height = boundingRect.height();
         TQ_INT32 width = boundingRect.width();
         KisPaintLayer *layer = new KisPaintLayer(img, '"' + text + '"', OPACITY_OPAQUE);
-        KisGroupLayerSP tqparent = img->rootLayer();
+        KisGroupLayerSP parent = img->rootLayer();
         if (img->activeLayer())
-            tqparent = img->activeLayer()->tqparent();
-        img->addLayer(layer, tqparent, img->activeLayer());
+            parent = img->activeLayer()->parent();
+        img->addLayer(layer, parent, img->activeLayer());
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
                 TQRgb pixel = image.pixel(x, y);
@@ -155,13 +155,13 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)
 }
 
 void KisToolText::setFont() {
-    KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ );
+    KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
     m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize()));
 }
 
-TQWidget* KisToolText::createOptionWidget(TQWidget* tqparent)
+TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
 {
-    TQWidget *widget = super::createOptionWidget(tqparent);
+    TQWidget *widget = super::createOptionWidget(parent);
 
     m_lbFont = new TQLabel(i18n("Font: "), widget);
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.h b/chalk/plugins/tools/defaulttools/kis_tool_text.h
index b2aa7e186..2625fb58d 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.h
@@ -47,7 +47,7 @@ public:
     virtual void buttonPress(KisButtonPressEvent*);
     virtual void buttonRelease(KisButtonReleaseEvent *e);
 
-    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* createOptionWidget(TQWidget* parent);
 public slots:
     virtual void setFont();