1 files changed, 15 insertions, 15 deletions

diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index 7565e20..0520af3 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -387,7 +387,7 @@ static TQPixmap pixCombiner2( const TQPixmap* pm1, const TQPixmap* pm2 )
    return pix;
 }
 
-static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
+static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
                            int& nofDirs, int& nofEqualFiles, int& nofManualMerges )
 {
    if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC )
@@ -408,7 +408,7 @@ static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
       }
    }
    for( TQListViewItem* p = i->firstChild();  p!=0; p = p->nextSibling() )
-      calcDirtqStatus( bThreeDirs, static_cast<DirMergeItem*>(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
+      calcDirStatus( bThreeDirs, static_cast<DirMergeItem*>(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
 }
 
 static TQString sortString(const TQString& s, bool bCaseSensitive)
@@ -698,7 +698,7 @@ bool DirectoryMergeWindow::init
       int nofEqualFiles=0;
       int nofManualMerges=0;
       for( TQListViewItem* p = firstChild();  p!=0; p = p->nextSibling() )
-         calcDirtqStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(p),
+         calcDirStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(p),
                         nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
 
       TQString s;
@@ -915,10 +915,10 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
             mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : TQString(""),
             mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : TQString(""),
             "",
-            "","","",&mfi.m_totalDifftqStatus
+            "","","",&mfi.m_totalDiffStatus
             );
-         int nofNonwhiteConflicts = mfi.m_totalDifftqStatus.nofUnsolvedConflicts + 
-            mfi.m_totalDifftqStatus.nofSolvedConflicts - mfi.m_totalDifftqStatus.nofWhitespaceConflicts;
+         int nofNonwhiteConflicts = mfi.m_totalDiffStatus.nofUnsolvedConflicts + 
+            mfi.m_totalDiffStatus.nofSolvedConflicts - mfi.m_totalDiffStatus.nofWhitespaceConflicts;
 
          if (m_pOptions->m_bDmWhiteSpaceEqual && nofNonwhiteConflicts == 0)
          {
@@ -928,25 +928,25 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
          }
          else
          {
-            mfi.m_bEqualAB = mfi.m_totalDifftqStatus.bBinaryAEqB;
-            mfi.m_bEqualBC = mfi.m_totalDifftqStatus.bBinaryBEqC;
-            mfi.m_bEqualAC = mfi.m_totalDifftqStatus.bBinaryAEqC;
+            mfi.m_bEqualAB = mfi.m_totalDiffStatus.bBinaryAEqB;
+            mfi.m_bEqualBC = mfi.m_totalDiffStatus.bBinaryBEqC;
+            mfi.m_bEqualAC = mfi.m_totalDiffStatus.bBinaryAEqC;
          }
       }
    }
    else
    {
       bool bError;
-      TQString eqtqStatus;
+      TQString eqStatus;
       if( mfi.m_bExistsInA && mfi.m_bExistsInB )
       {
          if( mfi.m_bDirA ) mfi.m_bEqualAB=true;
-         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqtqStatus );
+         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus );
       }
       if( mfi.m_bExistsInA && mfi.m_bExistsInC )
       {
          if( mfi.m_bDirA ) mfi.m_bEqualAC=true;
-         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqtqStatus );
+         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus );
       }
       if( mfi.m_bExistsInB && mfi.m_bExistsInC )
       {
@@ -955,7 +955,7 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
          else
          {
             if( mfi.m_bDirB ) mfi.m_bEqualBC=true;
-            else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqtqStatus );
+            else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus );
          }
       }
    }
@@ -1723,7 +1723,7 @@ void DirMergeItem::init(MergeFileInfos* pMFI)
 {
    pMFI->m_pDMI = this;
    m_pMFI = pMFI;
-   TotalDifftqStatus& tds = pMFI->m_totalDifftqStatus;
+   TotalDiffStatus& tds = pMFI->m_totalDiffStatus;
    if ( m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC )
    {
    }
@@ -2820,7 +2820,7 @@ TQTextStream& operator<<( TQTextStream& ts, MergeFileInfos& mfi )
    //FileAccess m_fileInfoB;
    //FileAccess m_fileInfoC;
 
-   //TotalDifftqStatus m_totalDifftqStatus;
+   //TotalDiffStatus m_totalDiffStatus;
    
    vm.save(ts);