1 files changed, 18 insertions, 18 deletions

diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp
index 740e6c121..de305212d 100644
--- a/libkdepim/progressmanager.cpp
+++ b/libkdepim/progressmanager.cpp
@@ -35,10 +35,10 @@ KPIM::ProgressManager * KPIM::ProgressManager::mInstance = 0;
 unsigned int KPIM::ProgressManager::uID = 42;
 
 ProgressItem::ProgressItem(
-       ProgressItem* parent, const TQString& id,
+       ProgressItem* tqparent, const TQString& id,
        const TQString& label, const TQString& status, bool canBeCanceled,
        bool usesCrypto )
-       :mId( id ), mLabel( label ), mStatus( status ), mParent( parent ),
+       :mId( id ), mLabel( label ), mtqStatus( status ), mParent( tqparent ),
         mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ),
         mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ),
         mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false )
@@ -56,8 +56,8 @@ void ProgressItem::setComplete()
      if ( !mCanceled )
        setProgress( 100 );
      emit progressItemCompleted( this );
-     if ( parent() )
-       parent()->removeChild( this );
+     if ( tqparent() )
+       tqparent()->removeChild( this );
      deleteLater();
    } else {
      mWaitingForKids = true;
@@ -84,7 +84,7 @@ void ProgressItem::cancel()
    if ( mCanceled || !mCanBeCanceled ) return;
    kdDebug(5300) << "ProgressItem::cancel() - " << label() << endl;
    mCanceled = true;
-   // Cancel all children.
+   // Cancel all tqchildren.
    TQValueList<ProgressItem*> kids = mChildren.keys();
    TQValueList<ProgressItem*>::Iterator it( kids.begin() );
    TQValueList<ProgressItem*>::Iterator end( kids.end() );
@@ -93,7 +93,7 @@ void ProgressItem::cancel()
      if ( kid->canBeCanceled() )
        kid->cancel();
    }
-   seStatus( i18n( "Aborting..." ) );
+   setqStatus( i18n( "Aborting..." ) );
    emit progressItemCanceled( this );
 }
 
@@ -111,10 +111,10 @@ void ProgressItem::setLabel( const TQString& v )
   emit progressItemLabel( this, mLabel );
 }
 
-void ProgressItem::seStatus( const TQString& v )
+void ProgressItem::setqStatus( const TQString& v )
 {
-  mStatus = v;
-  emit progressItemStatus( this, mStatus );
+  mtqStatus = v;
+  emit progressItemtqStatus( this, mtqStatus );
 }
 
 void ProgressItem::setUsesCrypto( bool v )
@@ -147,16 +147,16 @@ ProgressManager* ProgressManager::instance()
 }
 
 ProgressItem* ProgressManager::createProgressItemImpl(
-     ProgressItem* parent, const TQString& id,
+     ProgressItem* tqparent, const TQString& id,
      const TQString &label, const TQString &status,
      bool cancellable, bool usesCrypto )
 {
    ProgressItem *t = 0;
    if ( !mTransactions[ id ] ) {
-     t = new ProgressItem ( parent, id, label, status, cancellable, usesCrypto );
+     t = new ProgressItem ( tqparent, id, label, status, cancellable, usesCrypto );
      mTransactions.insert( id, t );
-     if ( parent ) {
-       ProgressItem *p = mTransactions[ parent->id() ];
+     if ( tqparent ) {
+       ProgressItem *p = mTransactions[ tqparent->id() ];
        if ( p ) {
          p->addChild( t );
        }
@@ -170,8 +170,8 @@ ProgressItem* ProgressManager::createProgressItemImpl(
                this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) );
      connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ),
                this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) );
-     connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ),
-               this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) );
+     connect ( t, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ),
+               this, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ) );
      connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ),
                this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) );
      connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ),
@@ -188,11 +188,11 @@ ProgressItem* ProgressManager::createProgressItemImpl(
 }
 
 ProgressItem* ProgressManager::createProgressItemImpl(
-     const TQString& parent, const TQString &id,
+     const TQString& tqparent, const TQString &id,
      const TQString &label, const TQString& status,
      bool canBeCanceled, bool usesCrypto )
 {
-   ProgressItem * p = mTransactions[parent];
+   ProgressItem * p = mTransactions[tqparent];
    return createProgressItemImpl( p, id, label, status, canBeCanceled, usesCrypto );
 }
 
@@ -225,7 +225,7 @@ ProgressItem* ProgressManager::singleItem() const
     if ( (*it)->usesBusyIndicator() )
       return 0;
 
-    if ( !(*it)->parent() ) {             // if it's a top level one, only those count
+    if ( !(*it)->tqparent() ) {             // if it's a top level one, only those count
       if ( item )
         return 0; // we found more than one
       else