rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 9 insertions, 9 deletions

diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index ada2eb4..2a993cf 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -1177,11 +1177,11 @@ static TQListViewItem* treeIterator( TQListViewItem* p, bool bVisitChildren=true
          else if ( p->nextSibling() !=0 ) p = p->nextSibling();
          else
          {
-            p = p->tqparent();
+            p = p->parent();
             while ( p!=0 )
             {
                if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; }
-               else                      { p = p->tqparent();             }
+               else                      { p = p->parent();             }
             }
          }
       }
@@ -1269,7 +1269,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
       }
       else
       {
-         MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart, m_bCaseSensitive)]; // tqparent
+         MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart, m_bCaseSensitive)]; // parent
          assert(dirMfi.m_pDMI!=0);
          new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi );
          mfi.m_pParent = &dirMfi;
@@ -1303,7 +1303,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
       TQListViewItem* p = firstChild();
       while( p!=0 && firstChild() != 0 )
       {
-         TQListViewItem* pParent = p->tqparent();
+         TQListViewItem* pParent = p->parent();
          TQListViewItem* pNextSibling = p->nextSibling();
 
          DirMergeItem* pDMI = static_cast<DirMergeItem*>(p);
@@ -1323,7 +1323,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
             while ( p!=0 )
             {
                if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; }
-               else                      { p = p->tqparent();             }
+               else                      { p = p->parent();             }
             }
          }
       }
@@ -2283,10 +2283,10 @@ void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose)
          TQListViewItem* pPrevItem = pCurrentItemForOperation;
          ++m_currentItemForOperation;
          pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation;
-         if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->tqparent()!=pPrevItem->tqparent()) && pPrevItem->tqparent()!=0 )
+         if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->parent()!=pPrevItem->parent()) && pPrevItem->parent()!=0 )
          {
-            // Check if the tqparent may be set to "Done"
-            TQListViewItem* pParent = pPrevItem->tqparent();
+            // Check if the parent may be set to "Done"
+            TQListViewItem* pParent = pPrevItem->parent();
             bool bDone = true;
             while ( bDone && pParent!=0 )
             {
@@ -2309,7 +2309,7 @@ void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose)
                      static_cast<DirMergeItem*>(pParent)->m_pMFI->m_bOperationComplete = bDone;
                   }
                }
-               pParent = pParent->tqparent();
+               pParent = pParent->parent();
             }
          }
       }