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

diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index c25b29097..3ddb93f39 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -86,11 +86,11 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
   if (folder) {
     folder->open("imapjobdest");
   }
-  KMFolder *msg_tqparent = msg->tqparent();
-  if (msg_tqparent) {
-    msg_tqparent->open("imapjobsrc");
+  KMFolder *msg_parent = msg->parent();
+  if (msg_parent) {
+    msg_parent->open("imapjobsrc");
   }
-  mSrcFolder = msg_tqparent;
+  mSrcFolder = msg_parent;
   // If there is a destination folder, this is a copy, move or put to an
   // imap folder, use its account for keeping track of the job. Otherwise,
   // this is a get job and the src folder is an imap one. Use its account
@@ -99,8 +99,8 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
   if (folder) {
     account = folder->account();
   } else {
-    if ( msg_tqparent && msg_tqparent->storage() )
-      account = static_cast<KMFolderImap*>(msg_tqparent->storage())->account();
+    if ( msg_parent && msg_parent->storage() )
+      account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
   }
   if ( !account ||
        account->makeConnection() == ImapAccountBase::Error ) {
@@ -125,7 +125,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       TQString flags = KMFolderImap::statusToFlags( curMsg->status(), folder->permanentFlags() );
       url.setPath( folder->imapPath() + ";SECTION=" + flags );
       ImapAccountBase::jobData jd;
-      jd.tqparent = 0; jd.offset = 0; jd.done = 0;
+      jd.parent = 0; jd.offset = 0; jd.done = 0;
       jd.total = ( curMsg->msgSizeServer() > 0 ) ?
         curMsg->msgSizeServer() : curMsg->msgSize();
       jd.msgList.append( curMsg );
@@ -175,10 +175,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
     KURL url = account->getUrl();
     KURL destUrl = account->getUrl();
     destUrl.setPath(folder->imapPath());
-    KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_tqparent->storage());
+    KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_parent->storage());
     url.setPath( imapDestFolder->imapPath() + ";UID=" + sets );
     ImapAccountBase::jobData jd;
-    jd.tqparent = 0; jd.offset = 0;
+    jd.parent = 0; jd.offset = 0;
     jd.total = 1; jd.done = 0;
     jd.msgList = msgList;
 
@@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
                           "ImapJobCopyMove"+ProgressManager::getUniqueID(),
                           i18n("Server operation"),
                           i18n("Source folder: %1 - Destination folder: %2")
-                            .tqarg( TQStyleSheet::escape( msg_tqparent->prettyURL() ),
+                            .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ),
                                   TQStyleSheet::escape( mDestFolder->prettyURL() ) ),
                           true,
                           account->useSSL() || account->useTLS() );
@@ -285,7 +285,7 @@ void ImapJob::slotGetNextMessage()
   KURL url = account->getUrl();
   TQString path = msgParent->imapPath() + ";UID=" + TQString::number(msg->UID());
   ImapAccountBase::jobData jd;
-  jd.tqparent = 0; jd.offset = 0;
+  jd.parent = 0; jd.offset = 0;
   jd.total = 1; jd.done = 0;
   jd.msgList.append( msg );
   if ( !mPartSpecifier.isEmpty() )
@@ -347,15 +347,15 @@ void ImapJob::slotGetNextMessage()
 void ImapJob::slotGetMessageResult( KIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
-  if (!msg || !msg->tqparent() || !job) {
+  if (!msg || !msg->parent() || !job) {
     emit messageRetrieved( 0 );
     deleteLater();
     return;
   }
-  KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
+  KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
   if (msg->transferInProgress())
     msg->setTransferInProgress( false );
-  KMAcctImap *account = tqparent->account();
+  KMAcctImap *account = parent->account();
   if ( !account ) {
     emit messageRetrieved( 0 );
     deleteLater();
@@ -397,10 +397,10 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
         // During the construction of the message from the byteArray it does
         // not have a uid. Therefore we have to make sure that no connected
         // slots are called, since they would operate on uid == 0.
-        msg->tqparent()->storage()->blockSignals( true );
+        msg->parent()->storage()->blockSignals( true );
         msg->fromByteArray( (*it).data );
         // now let others react
-        msg->tqparent()->storage()->blockSignals( false );
+        msg->parent()->storage()->blockSignals( false );
         if ( size > 0 && msg->msgSizeServer() == 0 ) {
           msg->setMsgSizeServer(size);
         }
@@ -447,9 +447,9 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
       /* we got an answer but not data
        * this means that the msg is not on the server anymore so delete it */
       emit messageRetrieved( 0 );
-      tqparent->ignoreJobsForMessage( msg );
-      int idx = tqparent->find( msg );
-      if (idx != -1) tqparent->removeMsg( idx, true );
+      parent->ignoreJobsForMessage( msg );
+      int idx = parent->find( msg );
+      if (idx != -1) parent->removeMsg( idx, true );
       // the removeMsg will unGet the message, which will delete all
       // jobs, including this one
       return;
@@ -464,14 +464,14 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
 void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
-  if (!msg || !msg->tqparent() || !job) {
+  if (!msg || !msg->parent() || !job) {
     deleteLater();
     return;
   }
-  KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
+  KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
   if (msg->transferInProgress())
     msg->setTransferInProgress( false );
-  KMAcctImap *account = tqparent->account();
+  KMAcctImap *account = parent->account();
   if ( !account ) {
     deleteLater();
     return;
@@ -678,9 +678,9 @@ void ImapJob::execute()
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::setParentFolder( const KMFolderImap* tqparent )
+void ImapJob::setParentFolder( const KMFolderImap* parent )
 {
-  mParentFolder = const_cast<KMFolderImap*>( tqparent );
+  mParentFolder = const_cast<KMFolderImap*>( parent );
 }
 
 //-----------------------------------------------------------------------------
@@ -690,13 +690,13 @@ void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
   if (!msg || !job) {
     return;
   }
-  KMFolderImap* tqparent = 0;
-  if ( msg->tqparent() && msg->tqparent()->folderType() == KMFolderTypeImap )
-    tqparent = static_cast<KMFolderImap*>(msg->tqparent()->storage());
+  KMFolderImap* parent = 0;
+  if ( msg->parent() && msg->parent()->folderType() == KMFolderTypeImap )
+    parent = static_cast<KMFolderImap*>(msg->parent()->storage());
   else if (mDestFolder) // put
-    tqparent = static_cast<KMFolderImap*>(mDestFolder->storage());
-  if (!tqparent) return;
-  KMAcctImap *account = tqparent->account();
+    parent = static_cast<KMFolderImap*>(mDestFolder->storage());
+  if (!parent) return;
+  KMAcctImap *account = parent->account();
   if ( !account ) return;
   ImapAccountBase::JobIterator it = account->findJob( job );
   if ( it == account->jobsEnd() ) return;