diff options
Diffstat (limited to 'src/mergeresultwindow.cpp')
| -rw-r--r-- | src/mergeresultwindow.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index 119294f..a222a14 100644 --- a/src/mergeresultwindow.cpp +++ b/src/mergeresultwindow.cpp @@ -72,7 +72,7 @@ MergeResultWindow::MergeResultWindow( m_sizeC = 0; m_pDiff3LineList = 0; - m_pTotalDifftqStatus = 0; + m_pTotalDiffStatus = 0; m_pStatusBar = pStatusBar; m_pOptionDialog = pOptionDialog; @@ -97,7 +97,7 @@ void MergeResultWindow::init( const LineData* pLineDataB, int sizeB, const LineData* pLineDataC, int sizeC, const Diff3LineList* pDiff3LineList, - TotalDifftqStatus* pTotalDifftqStatus + TotalDiffStatus* pTotalDiffStatus ) { m_firstLine = 0; @@ -118,7 +118,7 @@ void MergeResultWindow::init( m_sizeC = sizeC; m_pDiff3LineList = pDiff3LineList; - m_pTotalDifftqStatus = pTotalDifftqStatus; + m_pTotalDiffStatus = pTotalDiffStatus; m_selection.reset(); m_cursorXPos=0; @@ -140,7 +140,7 @@ void MergeResultWindow::init( void MergeResultWindow::reset() { m_pDiff3LineList = 0; - m_pTotalDifftqStatus = 0; + m_pTotalDiffStatus = 0; m_pldA = 0; m_pldB = 0; m_pldC = 0; @@ -467,9 +467,9 @@ void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConfli ++nrOfWhiteSpaceConflicts; } - m_pTotalDifftqStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts; - m_pTotalDifftqStatus->nofSolvedConflicts = nrOfSolvedConflicts; - m_pTotalDifftqStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts; + m_pTotalDiffStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts; + m_pTotalDiffStatus->nofSolvedConflicts = nrOfSolvedConflicts; + m_pTotalDiffStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts; m_cursorXPos=0; @@ -804,17 +804,17 @@ void MergeResultWindow::showNrOfConflicts() ++nrOfConflicts; } TQString totalInfo; - if ( m_pTotalDifftqStatus->bBinaryAEqB && m_pTotalDifftqStatus->bBinaryAEqC ) + if ( m_pTotalDiffStatus->bBinaryAEqB && m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("All input files are binary equal."); - else if ( m_pTotalDifftqStatus->bTextAEqB && m_pTotalDifftqStatus->bTextAEqC ) + else if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("All input files contain the same text."); else { - if ( m_pTotalDifftqStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B"); - else if ( m_pTotalDifftqStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B"); - if ( m_pTotalDifftqStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C"); - else if ( m_pTotalDifftqStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C"); - if ( m_pTotalDifftqStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C"); - else if ( m_pTotalDifftqStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C"); + if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B"); + else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B"); + if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C"); + else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C"); + if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C"); + else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C"); } int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts(); @@ -1661,12 +1661,12 @@ void MergeResultWindow::writeLine( if( m_selection.lineWithin( line+1 ) ) p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset, - width(), fontHeight, tqcolorGroup().highlight() ); + width(), fontHeight, colorGroup().highlight() ); else if ( lengthInLine2>0 ) p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset, - fontWidth*lengthInLine2, fontHeight, tqcolorGroup().highlight() ); + fontWidth*lengthInLine2, fontHeight, colorGroup().highlight() ); - p.setPen( tqcolorGroup().highlightedText() ); + p.setPen( colorGroup().highlightedText() ); p.drawText( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset+fontAscent, s.mid(firstPosInLine2,lengthInLine2), true ); } @@ -3072,7 +3072,7 @@ WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog, TQWidget* pPar m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this); pHLayout->addWidget( m_pModifiedLabel ); - m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->tqsizeHint() ); + m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->sizeHint() ); m_pModifiedLabel->setText(""); pHLayout->addStretch(1); @@ -3137,7 +3137,7 @@ void WindowTitleWidget::setEncodings( TQTextCodec* pCodecForA, TQTextCodec* pCod m_codecMap[i]=it->second; ++i; } - m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->tqsizeHint() ); + m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->sizeHint() ); if ( pCodecForC && pCodecForB && pCodecForA ) { |