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

diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 19f0410a9..342b0fb3f 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1465,7 +1465,7 @@ void KMReaderWin::displayMessage() {
   htmlWriter()->begin( mCSSHelper->cssDefinitions( isFixedFont() ) );
   htmlWriter()->queue( mCSSHelper->htmlHead( isFixedFont() ) );
 
-  if (!tqparent())
+  if (!parent())
     setCaption(msg->subject());
 
   removeTempFiles();
@@ -1592,7 +1592,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
 
 kdDebug(5006) << "\n\n\nKMReaderWin::parseMsg()  -  special post-encryption handling:\n1." << endl;
 kdDebug(5006) << "(aMsg == msg) = "                               << (aMsg == message()) << endl;
-kdDebug(5006) << "aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() = " << (aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder()) << endl;
+kdDebug(5006) << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " << (aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder()) << endl;
 kdDebug(5006) << "message_was_saved_decrypted_before( aMsg ) = " << message_was_saved_decrypted_before( aMsg ) << endl;
 kdDebug(5006) << "this->decryptMessage() = " << decryptMessage() << endl;
 kdDebug(5006) << "otp.hasPendingAsyncJobs() = " << otp.hasPendingAsyncJobs() << endl;
@@ -1602,7 +1602,7 @@ kdDebug(5006) << "|| (KMMsgPartiallyEncrypted == encryptionState) = " << (KMMsgP
          // double click on the message (==not running in a separate window)
   if(    (aMsg == message())
          // don't remove encryption in the outbox folder :)
-      && ( aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() )
+      && ( aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() )
          // only proceed if this message was not saved encryptedly before
       && !message_was_saved_decrypted_before( aMsg )
          // only proceed if the message has actually been decrypted
@@ -1814,7 +1814,7 @@ void KMReaderWin::slotTouchMessage()
        message()->encryptionState() != KMMsgEncryptionStateUnknown )
     return;
 
-  KMFolder *folder = message()->tqparent();
+  KMFolder *folder = message()->parent();
   if (folder &&
      (folder->isOutbox() || folder->isSent() || folder->isTrash() ||
       folder->isDrafts() || folder->isTemplates() ) )
@@ -1940,7 +1940,7 @@ void KMReaderWin::slotUrlPopup(const TQString &aUrl, const TQPoint& aPos)
   }
 }
 
-// Checks if the given node has a tqparent node that is a DIV which has an ID attribute
+// Checks if the given node has a parent node that is a DIV which has an ID attribute
 // with the value specified here
 static bool hasParentDivWithId( const DOM::Node &start, const TQString &id )
 {
@@ -1971,7 +1971,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
   menu->insertItem(i18n("to view something", "View"), 3);
   menu->insertItem(SmallIcon("filesaveas"),i18n("Save As..."), 4);
   menu->insertItem(SmallIcon("editcopy"), i18n("Copy"), 9 );
-  const bool canChange = message()->tqparent() ? !message()->tqparent()->isReadOnly() : false;
+  const bool canChange = message()->parent() ? !message()->parent()->isReadOnly() : false;
   if ( GlobalSettings::self()->allowAttachmentEditing() && canChange )
     menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 );
   if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange )
@@ -2084,7 +2084,7 @@ void KMReaderWin::atmViewMsg( KMMessagePart* aMsgPart, int nodeId )
   assert(msg != 0);
   msg->setMsgSerNum( 0 ); // because lookups will fail
   // some information that is needed for imap messages with LOD
-  msg->setParent( message()->tqparent() );
+  msg->setParent( message()->parent() );
   msg->setUID(message()->UID());
   msg->setReadyToShow(true);
   KMReaderMainWin *win = new KMReaderMainWin();
@@ -2476,8 +2476,8 @@ void KMReaderWin::slotUrlClicked()
 {
   KMMainWidget *mainWidget = dynamic_cast<KMMainWidget*>(mMainWindow);
   uint identity = 0;
-  if ( message() && message()->tqparent() ) {
-    identity = message()->tqparent()->identity();
+  if ( message() && message()->parent() ) {
+    identity = message()->parent()->identity();
   }
 
   KMCommand *command = new KMUrlClickedCommand( mClickedUrl, identity, this,