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

diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h
index 5c75b6b7..ea6926b7 100644
--- a/chalk/ui/layerlist.h
+++ b/chalk/ui/layerlist.h
@@ -37,7 +37,7 @@ class LayerList: public KListView
   TQ_OBJECT
 
 public:
-    LayerList( TQWidget *tqparent = 0, const char *name = 0 );
+    LayerList( TQWidget *parent = 0, const char *name = 0 );
     virtual ~LayerList();
 
     void addProperty( const TQString &name, const TQString &displayName, const TQIconSet &icon = TQIconSet(),
@@ -97,10 +97,10 @@ public slots:
     LayerItem *addLayer( const TQString &displayName, LayerItem *after = 0, int id = -1 );
     LayerItem *addLayer( const TQString &displayName, int afterID, int id = -1 );
 
-    LayerItem *addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 );
+    LayerItem *addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 );
     LayerItem *addLayerToParent( const TQString &displayName, int parentID, int afterID = -1, int id = -1 );
 
-    void moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after );
+    void moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after );
     void moveLayer( int id, int parentID, int afterID );
 
     void removeLayer( LayerItem *layer );
@@ -116,13 +116,13 @@ signals:
     void propertyChanged( LayerItem *layer, const TQString &name, bool on );
     void propertyChanged( int id, const TQString &name, bool on );
 
-    void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after );
+    void layerMoved( LayerItem *layer, LayerItem *parent, LayerItem *after );
     void layerMoved( int id, int parentID, int afterID );
 
-    void requestNewLayer( LayerItem *tqparent, LayerItem *after );
+    void requestNewLayer( LayerItem *parent, LayerItem *after );
     void requestNewLayer( int parentID, int afterID );
 
-    void requestNewFolder( LayerItem *tqparent, LayerItem *after );
+    void requestNewFolder( LayerItem *parent, LayerItem *after );
     void requestNewFolder( int parentID, int afterID );
 
     void requestRemoveLayer( LayerItem *layer );
@@ -163,14 +163,14 @@ public: //reimplemented for internal reasons
 protected:
     virtual void contentsMousePressEvent( TQMouseEvent *e );
     virtual void contentsMouseDoubleClickEvent ( TQMouseEvent *e );
-    virtual void findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after );
+    virtual void findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after );
 };
 
 class LayerItem: public KListViewItem
 {
 public:
-    LayerItem( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 );
-    LayerItem( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 );
+    LayerItem( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 );
+    LayerItem( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 );
     virtual ~LayerItem();
 
     void makeFolder();
@@ -203,7 +203,7 @@ public: //convenience
     LayerItem *nextSibling() const;
     LayerList *listView() const;
     LayerItem *firstChild() const;
-    LayerItem *tqparent() const;
+    LayerItem *parent() const;
     void update() const; //like TQWidget::update()
 
 protected:
@@ -259,10 +259,10 @@ public: //reimplemented for internal reasons
 class LayerFolder: public LayerItem
 {
 public:
-    LayerFolder( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 )
-        : LayerItem( displayName, tqparent, after, id ) { makeFolder(); }
-    LayerFolder( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 )
-        : LayerItem( displayName, tqparent, after, id ) { makeFolder(); }
+    LayerFolder( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 )
+        : LayerItem( displayName, parent, after, id ) { makeFolder(); }
+    LayerFolder( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 )
+        : LayerItem( displayName, parent, after, id ) { makeFolder(); }
 };