Remove additional unneeded tq method conversions

1 files changed, 13 insertions, 13 deletions

diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
index a222a14..dea1407 100644
--- a/src/mergeresultwindow.cpp
+++ b/src/mergeresultwindow.cpp
@@ -134,7 +134,7 @@ void MergeResultWindow::init(
    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
    if (m_pStatusBar)
       m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
-         .tqarg(nofUnsolved).tqarg(wsc) );
+         .arg(nofUnsolved).arg(wsc) );
 }
 
 void MergeResultWindow::reset()
@@ -809,12 +809,12 @@ void MergeResultWindow::showNrOfConflicts()
    else  if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC )
       totalInfo += i18n("All input files contain the same text.");
    else {
-      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");
+      if    ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("B");
+      else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("B");
+      if    ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("C");
+      else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("C");
+      if    ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("B").arg("C");
+      else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("B").arg("C");
    }
 
    int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts();
@@ -948,7 +948,7 @@ void MergeResultWindow::choose( int selector )
    int wsc;
    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
-         .tqarg(nofUnsolved).tqarg(wsc) );
+         .arg(nofUnsolved).arg(wsc) );
 }
 
 // bConflictsOnly: automatically choose for conflicts only (true) or for everywhere (false)
@@ -962,7 +962,7 @@ void MergeResultWindow::chooseGlobal(int selector, bool bConflictsOnly, bool bWh
    int wsc;
    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
-         .tqarg(nofUnsolved).tqarg(wsc) );
+         .arg(nofUnsolved).arg(wsc) );
 }
 
 void MergeResultWindow::slotAutoSolve()
@@ -974,7 +974,7 @@ void MergeResultWindow::slotAutoSolve()
    int wsc;
    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
-         .tqarg(nofUnsolved).tqarg(wsc) );
+         .arg(nofUnsolved).arg(wsc) );
 }
 
 void MergeResultWindow::slotUnsolve()
@@ -986,7 +986,7 @@ void MergeResultWindow::slotUnsolve()
    int wsc;
    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
-         .tqarg(nofUnsolved).tqarg(wsc) );
+         .arg(nofUnsolved).arg(wsc) );
 }
 
 static TQString calcHistoryLead(const TQString& s )
@@ -2105,9 +2105,9 @@ void MergeResultWindow::slotCursorUpdate()
       int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset;
 
       if (!m_pOptionDialog->m_bRightToLeftLanguage)
-         tqrepaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
+         repaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
       else
-         tqrepaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
+         repaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
 
       m_bCursorUpdate=false;
    }