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

1 files changed, 6 insertions, 6 deletions

diff --git a/chalk/ui/kis_doc.h b/chalk/ui/kis_doc.h
index 222e9da6..f09cf39d 100644
--- a/chalk/ui/kis_doc.h
+++ b/chalk/ui/kis_doc.h
@@ -53,7 +53,7 @@ class KRITACORE_EXPORT KisDoc : public KoDocument, private KisUndoAdapter {
   TQ_OBJECT
 
 public:
-    KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false);
+    KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false);
     virtual ~KisDoc();
 
 public:
@@ -68,7 +68,7 @@ public:
     virtual bool loadChildren( KoStore* store);
     virtual bool loadXML(TQIODevice *, const TQDomDocument& doc);
     virtual TQCString mimeType() const;
-    virtual TQWidget* createCustomDocumentWidget(TQWidget *tqparent);
+    virtual TQWidget* createCustomDocumentWidget(TQWidget *parent);
     virtual KoDocument* hitTest(const TQPoint &pos, const TQWMatrix& matrix = TQWMatrix());
 
     /**
@@ -114,13 +114,13 @@ public:
     void setRedoLimit(TQ_INT32 limit);
 
     /**
-     * Create a new image that has this document as a tqparent and
+     * Create a new image that has this document as a parent and
      * replace the current image with this image.
      */
     bool newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * cs, const KisColor &bgColor, const TQString &imgDescription, const double imgResolution);
 
     /**
-     * Create a new image that has this document as a tqparent and
+     * Create a new image that has this document as a parent and
      * replace the current image with this image.
      */
     KisImageSP newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorstrategy);
@@ -168,7 +168,7 @@ signals:
 
 protected:
     // Overide KoDocument
-    virtual KoView* createViewInstance(TQWidget *tqparent, const char *name);
+    virtual KoView* createViewInstance(TQWidget *parent, const char *name);
 
 protected slots:
     // Overide KoDocument
@@ -183,7 +183,7 @@ private:
     
     TQDomElement saveImage(TQDomDocument& doc, KisImageSP img);
     KisImageSP loadImage(const TQDomElement& elem);
-    void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP tqparent);
+    void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP parent);
     KisLayerSP loadLayer(const TQDomElement& elem, KisImageSP img);
     KisLayerSP loadPaintLayer(const TQDomElement& elem, KisImageSP img,
                 TQString name, TQ_INT32 x, TQ_INT32 y, TQ_INT32 opacity, bool visible, bool locked,