rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 67 insertions, 67 deletions

diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index a22e8b2..830bb3d 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -43,8 +43,8 @@
 
 TQMap<TQString, MetricEntry> FSView::_dirMetric;
 
-FSView::FSView(Inode* base, TQWidget* tqparent, const char* name)
-  : TreeMapWidget(base, tqparent, name)
+FSView::FSView(Inode* base, TQWidget* parent, const char* name)
+  : TreeMapWidget(base, parent, name)
 {
   setFieldType(0, i18n("Name"));
   setFieldType(1, i18n("Size"));
diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h
index fe1c689..91471c5 100644
--- a/konq-plugins/fsview/fsview.h
+++ b/konq-plugins/fsview/fsview.h
@@ -63,7 +63,7 @@ class FSView : public TreeMapWidget, public ScanListener
 public:
   enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime };
 
-  FSView(Inode*, TQWidget* tqparent=0, const char* name=0);
+  FSView(Inode*, TQWidget* parent=0, const char* name=0);
   ~FSView();
 
   KConfig* config() { return _config; }
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 0fdfee7..0d5eda7 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -94,9 +94,9 @@ KAboutData* FSViewPart::createAboutData()
 }
 
 FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
-                       TQObject *tqparent, const char *name,
+                       TQObject *parent, const char *name,
                        const TQStringList& /* args */)
-    : KParts::ReadOnlyPart(tqparent, name)
+    : KParts::ReadOnlyPart(parent, name)
 {
     // we need an instance
     setInstance( FSViewPartFactory::instance() );
@@ -365,9 +365,9 @@ void FSViewBrowserExtension::refresh()
   while( (i=s.next()) )
     commonParent = commonParent->commonParent(i);
 
-  /* if commonParent is a file, update tqparent directory */
+  /* if commonParent is a file, update parent directory */
   if ( !((Inode*)commonParent)->isDir() ) {
-    commonParent = commonParent->tqparent();
+    commonParent = commonParent->parent();
     if (!commonParent) return;
   }
 
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 2328e21..5d3545f 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -87,7 +87,7 @@ class FSViewPart : public KParts::ReadOnlyPart
   TQ_PROPERTY( bool supportsUndo READ supportsUndo )
 public:
   FSViewPart(TQWidget *parentWidget, const char *widgetName,
-             TQObject *tqparent, const char *name, const TQStringList &args);
+             TQObject *parent, const char *name, const TQStringList &args);
 
   virtual ~FSViewPart();
 
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp
index 849877e..d4875c2 100644
--- a/konq-plugins/fsview/inode.cpp
+++ b/konq-plugins/fsview/inode.cpp
@@ -40,12 +40,12 @@ Inode::Inode()
   init("");
 }
 
-Inode::Inode(ScanDir* d, Inode* tqparent)
-  : TreeMapItem(tqparent)
+Inode::Inode(ScanDir* d, Inode* parent)
+  : TreeMapItem(parent)
 {
   TQString absPath;
-  if (tqparent) {
-    absPath = tqparent->path();
+  if (parent) {
+    absPath = parent->path();
     if (!absPath.endsWith("/")) absPath += "/";
   }
   absPath += d->name();
@@ -56,12 +56,12 @@ Inode::Inode(ScanDir* d, Inode* tqparent)
   init(absPath);
 }
 
-Inode::Inode(ScanFile* f, Inode* tqparent)
-  : TreeMapItem(tqparent)
+Inode::Inode(ScanFile* f, Inode* parent)
+  : TreeMapItem(parent)
 {
   TQString absPath;
-  if (tqparent)
-    absPath = tqparent->path() + "/";
+  if (parent)
+    absPath = parent->path() + "/";
   absPath += f->name();
 
   _dirPeer = 0;
diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp
index c79ff99..1d3d06a 100644
--- a/konq-plugins/fsview/scan.cpp
+++ b/konq-plugins/fsview/scan.cpp
@@ -80,8 +80,8 @@ void ScanManager::startScan(ScanDir* from)
   if (scanRunning()) stopScan();
 
   from->clear();
-  if (from->tqparent())
-    from->tqparent()->setupChildRescan();
+  if (from->parent())
+    from->parent()->setupChildRescan();
 
   _list.append(new ScanItem(from->path(),from));
 }
diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h
index 6d570f7..ca4ce4f 100644
--- a/konq-plugins/fsview/scan.h
+++ b/konq-plugins/fsview/scan.h
@@ -179,7 +179,7 @@ class ScanDir
    */
   void setupChildRescan();
 
-  /* Absolute path. Warning: Slow, loops to top tqparent. */
+  /* Absolute path. Warning: Slow, loops to top parent. */
   TQString path();
 
   /* get integer data attribute */
@@ -192,7 +192,7 @@ class ScanDir
   KIO::fileoffset_t size() { update(); return _size; }
   unsigned int fileCount() { update(); return _fileCount; }
   unsigned int dirCount() { update(); return _dirCount; }
-  ScanDir* tqparent() { return _parent; }
+  ScanDir* parent() { return _parent; }
   bool scanStarted() { return (_dirsFinished >= 0); }
   bool scanFinished() { return (_dirsFinished == (int)_dirs.count()); }
   bool scanRunning() { return scanStarted() && !scanFinished(); }
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index f77b37f..fc83601 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -717,11 +717,11 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 )
   bool ascending;
   int result;
 
-  TreeMapItem* tqparent = ((TreeMapItem*)item1)->tqparent();
+  TreeMapItem* parent = ((TreeMapItem*)item1)->parent();
   // shouldn't happen
-  if (!tqparent) return 0;
+  if (!parent) return 0;
 
-  int textNo = tqparent->sorting(&ascending);
+  int textNo = parent->sorting(&ascending);
 
   if (textNo < 0) {
     double diff = ((TreeMapItem*)item1)->value() -
@@ -738,22 +738,22 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 )
 
 TreeMapItem* TreeMapItemList::commonParent()
 {
-  TreeMapItem* tqparent, *item;
-  tqparent = first();
-  if (tqparent)
+  TreeMapItem* parent, *item;
+  parent = first();
+  if (parent)
     while( (item = next()) != 0)
-      tqparent = tqparent->commonParent(item);
+      parent = parent->commonParent(item);
 
-  return tqparent;
+  return parent;
 }
 
 
 // TreeMapItem
 
-TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value)
+TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
 {
   _value = value;
-  _parent = tqparent;
+  _parent = parent;
 
   _sum = 0;
   _tqchildren = 0;
@@ -764,7 +764,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value)
   _freeRects = 0;
 
   if (_parent) {
-    // take sorting from tqparent
+    // take sorting from parent
     _sortTextNo = _parent->sorting(&_sortAscending);
     _parent->addItem(this);
   }
@@ -775,12 +775,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value)
 }
 
 
-TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value,
+TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
                          TQString text1, TQString text2,
                          TQString text3, TQString text4)
 {
   _value = value;
-  _parent = tqparent;
+  _parent = parent;
 
   // this resizes the text vector only if needed
   if (!text4.isEmpty()) setText(3, text4);
@@ -829,7 +829,7 @@ bool TreeMapItem::isChildOf(TreeMapItem* item)
 TreeMapItem* TreeMapItem::commonParent(TreeMapItem* item)
 {
   while (item && !isChildOf(item)) {
-    item = item->tqparent();
+    item = item->parent();
   }
   return item;
 }
@@ -1103,8 +1103,8 @@ void TreeMapTip::maybeTip( const TQPoint& pos )
 // TreeMapWidget
 
 TreeMapWidget::TreeMapWidget(TreeMapItem* base,
-			     TQWidget* tqparent, const char* name)
-    : TQWidget(tqparent, name)
+			     TQWidget* parent, const char* name)
+    : TQWidget(parent, name)
 {
     _base = base;
     _base->setWidget(this);
@@ -1446,9 +1446,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i)
 
   // don't redraw a deleted item
   if (_needsRefresh == i) {
-    // we can savely redraw the tqparent, as deleting order is
-    // from child to tqparent; i.e. i->tqparent() is existing. 
-    _needsRefresh = i->tqparent();
+    // we can savely redraw the parent, as deleting order is
+    // from child to parent; i.e. i->parent() is existing. 
+    _needsRefresh = i->parent();
   }
 }
 
@@ -1468,7 +1468,7 @@ TQString TreeMapWidget::tipString(TreeMapItem* i) const
 
       tip += itemTip;
     }
-    i = i->tqparent();
+    i = i->parent();
   }
   return tip;
 }
@@ -1530,7 +1530,7 @@ TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const
     if (_maxSelectDepth>=0) {
       int depth = i->depth();
       while(i && depth > _maxSelectDepth) {
-        i = i->tqparent();
+        i = i->parent();
         depth--;
       }
     }
@@ -1544,7 +1544,7 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
     /* Must have a visible area */
     while(i && ((i->tqitemRect().width() <1) ||
                 (i->tqitemRect().height() <1))) {
-      TreeMapItem* p = i->tqparent();
+      TreeMapItem* p = i->parent();
       if (!p) break;
       int idx = p->tqchildren()->findRef(i);
       idx--;
@@ -1644,13 +1644,13 @@ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected)
 }
 
 
-bool TreeMapWidget::clearSelection(TreeMapItem* tqparent)
+bool TreeMapWidget::clearSelection(TreeMapItem* parent)
 {
   TreeMapItemList old = _selection;
 
   TreeMapItem* i=_selection.first();
   while (i) {
-    if (i->isChildOf(tqparent)) {
+    if (i->isChildOf(parent)) {
       _selection.remove();
       i = _selection.current();
     }
@@ -1738,11 +1738,11 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
   TreeMapItem* commonParent = i1;
   while (commonParent && !i2->isChildOf(commonParent)) {
     i1 = commonParent;
-    commonParent = commonParent->tqparent();
+    commonParent = commonParent->parent();
   }
   if (!commonParent) return changed;
-  while (i2 && i2->tqparent() != commonParent)
-    i2 = i2->tqparent();
+  while (i2 && i2->parent() != commonParent)
+    i2 = i2->parent();
   if (!i2) return changed;
 
   TreeMapItemList* list = commonParent->tqchildren();
@@ -1935,7 +1935,7 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 /* returns -1 if nothing visible found */
 int nextVisible(TreeMapItem* i)
 {
-  TreeMapItem* p = i->tqparent();
+  TreeMapItem* p = i->parent();
   if (!p || p->tqitemRect().isEmpty()) return -1;
 
   int idx = p->tqchildren()->findRef(i);
@@ -1953,7 +1953,7 @@ int nextVisible(TreeMapItem* i)
 /* returns -1 if nothing visible found */
 int prevVisible(TreeMapItem* i)
 {
-  TreeMapItem* p = i->tqparent();
+  TreeMapItem* p = i->parent();
   if (!p || p->tqitemRect().isEmpty()) return -1;
 
   int idx = p->tqchildren()->findRef(i);
@@ -2024,7 +2024,7 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
   }
 
   TreeMapItem* old = _current,  *newItem;
-  TreeMapItem* p = _current->tqparent();
+  TreeMapItem* p = _current->parent();
 
   bool goBack;
   if (_current->sorting(&goBack) == -1) {
@@ -2184,7 +2184,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
   TreeMapItem* i;
 
   if (_markNo>0) {
-      for(i = item;i;i=i->tqparent())
+      for(i = item;i;i=i->parent())
 	  if (i->isMarked(_markNo)) break;
 
       isSelected = (i!=0);
@@ -2906,7 +2906,7 @@ void TreeMapWidget::selectionActivated(int id)
   TreeMapItem* i = _menuItem;
   id -= _selectionID;
   while (id>0 && i) {
-    i=i->tqparent();
+    i=i->parent();
     id--;
   }
   if (i)
@@ -2928,7 +2928,7 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup,
     TQString name = i->text(0);
     if (name.isEmpty()) break;
     popup->insertItem(i->text(0), id++);
-    i = i->tqparent();
+    i = i->parent();
   }
 }
 
@@ -2939,7 +2939,7 @@ void TreeMapWidget::fieldStopActivated(int id)
     TreeMapItem* i = _menuItem;
     id -= _fieldStopID+1;
     while (id>0 && i) {
-      i=i->tqparent();
+      i=i->parent();
       id--;
     }
     if (i)
@@ -2971,7 +2971,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
         popup->setItemChecked(id, true);
         foundFieldStop = true;
       }
-      i = i->tqparent();
+      i = i->parent();
     }
   }
 
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 8ce6aca..0aa5a9d 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -237,8 +237,8 @@ public:
                    HAlternate, VAlternate,
                    Horizontal, Vertical };
 
-  TreeMapItem(TreeMapItem* tqparent = 0, double value = 1.0 );
-  TreeMapItem(TreeMapItem* tqparent, double value,
+  TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 );
+  TreeMapItem(TreeMapItem* parent, double value,
               TQString text1, TQString text2 = TQString(),
               TQString text3 = TQString(), TQString text4 = TQString());
   virtual ~TreeMapItem();
@@ -261,9 +261,9 @@ public:
   bool initialized();
 
   /**
-   * Adds an item to a tqparent.
+   * Adds an item to a parent.
    * When no sorting is used, the item is appended (drawn at bottom).
-   * This is only needed if the tqparent was not already specified in the
+   * This is only needed if the parent was not already specified in the
    * construction of the item.
    */
   void addItem(TreeMapItem*);
@@ -282,7 +282,7 @@ public:
   /**
    * Parent Item
    */
-  TreeMapItem* tqparent() const { return _parent; }
+  TreeMapItem* parent() const { return _parent; }
 
   /**
    * Temporary rectangle used for drawing this item the last time.
@@ -401,7 +401,7 @@ public:
    */
   enum SelectionMode { Single, Multi, Extended, NoSelection };
 
-  TreeMapWidget(TreeMapItem* base, TQWidget* tqparent=0, const char* name=0);
+  TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0);
   ~TreeMapWidget();
 
   /**
@@ -428,7 +428,7 @@ public:
 
   /**
    * Returns the item possible for selection. this returns the
-   * given item itself or a tqparent thereof,
+   * given item itself or a parent thereof,
    * depending on setting of maxSelectDepth().
    */
   TreeMapItem* possibleSelection(TreeMapItem*) const;
@@ -453,17 +453,17 @@ public:
 
   /**
    * Clear selection of all selected items which are tqchildren of
-   * tqparent. When tqparent == 0, clears whole selection
+   * parent. When parent == 0, clears whole selection
    * Returns true if selection changed.
    */
-  bool clearSelection(TreeMapItem* tqparent = 0);
+  bool clearSelection(TreeMapItem* parent = 0);
 
   /**
    * Selects or unselects items in a range.
    * This is needed internally for Shift-Click in Extented mode.
    * Range means for a hierarchical widget:
    * - select/unselect i1 and i2 according selected
-   * - search common tqparent of i1 and i2, and select/unselect the
+   * - search common parent of i1 and i2, and select/unselect the
    *   range of direct tqchildren between but excluding the child
    *   leading to i1 and the child leading to i2.
    */
@@ -520,12 +520,12 @@ public:
    * If a tqchildren value() is almost the parents sum(),
    * it can happen that the border to be drawn for visibilty of
    * nesting relations takes to much space, and the
-   * tqparent/child size relation can not be mapped to a correct
+   * parent/child size relation can not be mapped to a correct
    * area size relation.
    *
    * Either
    * (1) Ignore the incorrect drawing, or
-   * (2) Skip drawing of the tqparent level alltogether.
+   * (2) Skip drawing of the parent level alltogether.
    */
   void setSkipIncorrectBorder(bool enable = true);
   bool skipIncorrectBorder() const { return _skipIncorrectBorder; }