rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 15 insertions, 15 deletions

diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h
index 3edffd0d5..7798162d3 100644
--- a/libkdepim/progressmanager.h
+++ b/libkdepim/progressmanager.h
@@ -52,9 +52,9 @@ class KDE_EXPORT ProgressItem : public TQObject
     const TQString& id() const { return mId; }
 
     /**
-     * @return The tqparent item of this one, if there is one.
+     * @return The parent item of this one, if there is one.
      */
-    ProgressItem *tqparent() const { return mParent; }
+    ProgressItem *parent() const { return mParent; }
 
     /**
      * @return The user visible string to be used to represent this item.
@@ -217,7 +217,7 @@ signals:
 
   protected:
     /* Only to be used by our good friend the ProgressManager */
-    ProgressItem( ProgressItem* tqparent,
+    ProgressItem( ProgressItem* parent,
                              const TQString& id,
                              const TQString& label,
                              const TQString& status,
@@ -288,7 +288,7 @@ class KDE_EXPORT ProgressManager : public TQObject
      /**
       * Creates a ProgressItem with a unique id and the given label.
       * This is the simplest way to aquire a progress item. It will not
-      * have a tqparent and will be set to be cancellable and not using crypto.
+      * have a parent and will be set to be cancellable and not using crypto.
       *
       * @param label The text to be displayed by progress handlers. It will be
       *              interpreted as rich text, so it might have to be escaped.
@@ -299,10 +299,10 @@ class KDE_EXPORT ProgressManager : public TQObject
      }
 
     /**
-     * Creates a new progressItem with the given tqparent, id, label and initial
+     * Creates a new progressItem with the given parent, id, label and initial
      * status.
      *
-     * @param tqparent Specify an already existing item as the tqparent of this one.
+     * @param parent Specify an already existing item as the parent of this one.
      * @param id Used to identify this operation for cancel and progress info.
      * @param label The text to be displayed by progress handlers. It will be
      *              interpreted as rich text, so it might have to be escaped.
@@ -310,36 +310,36 @@ class KDE_EXPORT ProgressManager : public TQObject
      *               interpreted as rich text, so it might have to be escaped.
      * @param canBeCanceled can the user cancel this operation?
      * @param usesCrypto does the operation use secure transports (SSL)
-     * Cancelling the tqparent will cancel the tqchildren as well (if they can be
+     * Cancelling the parent will cancel the tqchildren as well (if they can be
      * cancelled) and ongoing tqchildren prevent parents from finishing.
      * @return The ProgressItem representing the operation.
      */
-     static ProgressItem * createProgressItem( ProgressItem* tqparent,
+     static ProgressItem * createProgressItem( ProgressItem* parent,
                                                const TQString& id,
                                                const TQString& label,
                                                const TQString& status = TQString(),
                                                bool canBeCanceled = true,
                                                bool usesCrypto = false ) {
-       return instance()->createProgressItemImpl( tqparent, id, label, status,
+       return instance()->createProgressItemImpl( parent, id, label, status,
                                                   canBeCanceled, usesCrypto );
      }
 
      /**
-      * Use this version if you have the id string of the tqparent and want to
+      * Use this version if you have the id string of the parent and want to
       * add a subjob to it.
       */
-     static ProgressItem * createProgressItem( const TQString& tqparent,
+     static ProgressItem * createProgressItem( const TQString& parent,
                                                const TQString& id,
                                                const TQString& label,
                                                const TQString& status = TQString(),
                                                bool canBeCanceled = true,
                                                bool usesCrypto = false ) {
-       return instance()->createProgressItemImpl( tqparent, id, label,
+       return instance()->createProgressItemImpl( parent, id, label,
                                                  status, canBeCanceled, usesCrypto );
      }
 
      /**
-      * Version without a tqparent.
+      * Version without a parent.
       */
      static ProgressItem * createProgressItem( const TQString& id,
                                                const TQString& label,
@@ -419,11 +419,11 @@ class KDE_EXPORT ProgressManager : public TQObject
     ProgressManager( const ProgressManager& );
 
     virtual ProgressItem* createProgressItemImpl(
-                ProgressItem* tqparent, const TQString& id,
+                ProgressItem* parent, const TQString& id,
                 const TQString& label, const TQString& status,
                 bool cancellable, bool usesCrypto );
     virtual ProgressItem* createProgressItemImpl(
-                const TQString& tqparent,  const TQString& id,
+                const TQString& parent,  const TQString& id,
                 const TQString& label, const TQString& status,
                 bool cancellable, bool usesCrypto );
     void emitShowProgressDialogImpl();