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

9 files changed, 24 insertions, 24 deletions

diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc
index 7d8d84ab..dbb6c3f9 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.cc
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc
@@ -109,8 +109,8 @@ int getH(int r, int g, int b)
     return h;
 }
 
-KisWetColorSpace::KisWetColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisAbstractColorSpace(KisID("WET", i18n("Watercolors")), 0, icMaxEnumData, tqparent, p)
+KisWetColorSpace::KisWetColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisAbstractColorSpace(KisID("WET", i18n("Watercolors")), 0, icMaxEnumData, parent, p)
 {
     wet_init_render_tab();
 
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.h b/chalk/colorspaces/wet/kis_wet_colorspace.h
index 25af68fd..dddbcf02 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.h
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.h
@@ -92,7 +92,7 @@ void wetPixFromDouble(WetPix * dst, WetPixDbl *src);
 
 class KisWetColorSpace : public KisAbstractColorSpace {
 public:
-    KisWetColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisWetColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisWetColorSpace();
 
 
@@ -211,7 +211,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icMaxEnumData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisWetColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisWetColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return ""; };
 };
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
index eb6556d2..901f2909 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
@@ -46,7 +46,7 @@
 #include "kis_wet_colorspace.h"
 #include "kis_wet_palette_widget.h"
 
-KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *tqparent, const char *name) : super(tqparent, name)
+KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_subject = 0;
 
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.h b/chalk/colorspaces/wet/kis_wet_palette_widget.h
index 10c177e6..60fd28e0 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.h
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.h
@@ -45,7 +45,7 @@ class KRITAUI_EXPORT KisWetPaletteWidget
     typedef TQWidget super;
 
 public:
-    KisWetPaletteWidget(TQWidget *tqparent = 0L, const char *name = 0);
+    KisWetPaletteWidget(TQWidget *parent = 0L, const char *name = 0);
     virtual ~KisWetPaletteWidget() {}
 
 protected slots:
diff --git a/chalk/colorspaces/wet/kis_wetop.cc b/chalk/colorspaces/wet/kis_wetop.cc
index 55f466fa..900fd721 100644
--- a/chalk/colorspaces/wet/kis_wetop.cc
+++ b/chalk/colorspaces/wet/kis_wetop.cc
@@ -36,10 +36,10 @@
 #include "kis_wetop.h"
 #include "kis_wet_colorspace.h"
 
-KisWetOpSettings::KisWetOpSettings(TQWidget *tqparent)
-    : super(tqparent)
+KisWetOpSettings::KisWetOpSettings(TQWidget *parent)
+    : super(parent)
 {
-    m_options = new WetPaintOptions(tqparent, "wet option widget");
+    m_options = new WetPaintOptions(parent, "wet option widget");
 }
 
 bool KisWetOpSettings::varySize() const
@@ -67,13 +67,13 @@ KisPaintOp * KisWetOpFactory::createOp(const KisPaintOpSettings *settings, KisPa
     return op;
 }
 
-KisPaintOpSettings* KisWetOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice)
+KisPaintOpSettings* KisWetOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice)
 {
     if (inputDevice == KisInputDevice::mouse()) {
         // No options for mouse, only tablet devices
         return 0;
     } else {
-        return new KisWetOpSettings(tqparent);
+        return new KisWetOpSettings(parent);
     }
 }
 
@@ -120,8 +120,8 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
         dab = brush->image(KisMetaRegistry::instance()->csRegistry()->getAlpha8(), inf);
     }
     else {
-        KisAlphaMaskSP tqmask = brush->tqmask(inf);
-        dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
+        KisAlphaMaskSP mask = brush->mask(inf);
+        dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
     }
 
     KisColorSpace * cs = device->colorSpace();
diff --git a/chalk/colorspaces/wet/kis_wetop.h b/chalk/colorspaces/wet/kis_wetop.h
index 37cd594a..85224f29 100644
--- a/chalk/colorspaces/wet/kis_wetop.h
+++ b/chalk/colorspaces/wet/kis_wetop.h
@@ -36,13 +36,13 @@ public:
     virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter);
     virtual KisID id() { return KisID("wetbrush", i18n("Watercolor Brush")); }
     virtual bool userVisible(KisColorSpace* cs) { return cs->id() == KisID("WET", ""); }
-    virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice);
+    virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice);
 };
 
 class KisWetOpSettings : public KisPaintOpSettings {
     typedef KisPaintOpSettings super;
 public:
-    KisWetOpSettings(TQWidget *tqparent);
+    KisWetOpSettings(TQWidget *parent);
 
     bool varySize() const;
     bool varyWetness() const;
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc
index 1f65b83c..df0666c4 100644
--- a/chalk/colorspaces/wet/wet_plugin.cc
+++ b/chalk/colorspaces/wet/wet_plugin.cc
@@ -66,14 +66,14 @@ typedef KGenericFactory<WetPlugin> WetPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkwetplugin, WetPluginFactory( "chalkcore" ) )
 
 
-WetPlugin::WetPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+WetPlugin::WetPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(WetPluginFactory::instance());
 
     // This is not a gui plugin; only load it when the doc is created.
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent);
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") ) {
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent);
 
         KisColorSpace* colorSpaceWet = new KisWetColorSpace(f, 0);
 
@@ -97,12 +97,12 @@ WetPlugin::WetPlugin(TQObject *tqparent, const char *name, const TQStringList &)
         // Texture Action:
         f->addPaintDeviceAction(colorSpaceWet, new WetPaintDevAction);
     }
-    else if (tqparent->inherits("KisView"))
+    else if (parent->inherits("KisView"))
     {
         setInstance(WetPluginFactory::instance());
         setXMLFile(locate("data","chalkplugins/wetplugin.rc"), true);
 
-        m_view = dynamic_cast<KisView*>(tqparent);
+        m_view = dynamic_cast<KisView*>(parent);
         // Wetness visualisation
         WetnessVisualisationFilter * wf = new WetnessVisualisationFilter(m_view);
         wf->setAction(new KToggleAction(i18n("Wetness Visualisation"), 0, 0, wf,
diff --git a/chalk/colorspaces/wet/wet_plugin.h b/chalk/colorspaces/wet/wet_plugin.h
index d2fdc083..fa3bed06 100644
--- a/chalk/colorspaces/wet/wet_plugin.h
+++ b/chalk/colorspaces/wet/wet_plugin.h
@@ -34,7 +34,7 @@ class WetPlugin : public KParts::Plugin
      Q_OBJECT
   TQ_OBJECT
 public:
-    WetPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    WetPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~WetPlugin();
 
 private:
diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc
index 11aaeb04..5d789cf1 100644
--- a/chalk/colorspaces/wet/wetphysicsfilter.cc
+++ b/chalk/colorspaces/wet/wetphysicsfilter.cc
@@ -43,7 +43,7 @@
  * [11:16] <CyrilleB> boud: which one then ?
  * [11:16] <pippin> the error is distributed to the neighbour pixels (to the right, down and down to the left in pixels which have not yet been processed
  * [11:16] <pippin> )
- * [11:16] <boud> CyrilleB: it's only aptqparent when you let something dry for some time, it looks like meandering snakes (like the old game "snake")
+ * [11:16] <boud> CyrilleB: it's only apparent when you let something dry for some time, it looks like meandering snakes (like the old game "snake")
  * [11:16] <CyrilleB> pippin: somehow yes
  * [11:16] <boud> pippin: that is possible
  * [11:17] <pippin> boud: this leads to "bleeding" of data to the right and down,..
@@ -55,7 +55,7 @@
  * [11:27] <boud> Well, I don't have time to investigate right now, but it sounds very plausible.
  * [11:27] <CyrilleB> pippin: :)
  * [11:28] <boud> of course, the code _is_ available :-)
- * [11:28] <pippin> if there is some form of diffusion matrix that is directional around the current pixel,. having that tqmask rotate depending on the modulus of the current iteration # should cancel such an effect out
+ * [11:28] <pippin> if there is some form of diffusion matrix that is directional around the current pixel,. having that mask rotate depending on the modulus of the current iteration # should cancel such an effect out
  */
 WetPhysicsFilter::WetPhysicsFilter()
     : KisFilter(id(), "artistic", i18n("Dry the Paint"))