diff options
Diffstat (limited to 'cervisia/diffdlg.cpp')
-rw-r--r-- | cervisia/diffdlg.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp index ef6c725c..1bbcd711 100644 --- a/cervisia/diffdlg.cpp +++ b/cervisia/diffdlg.cpp @@ -91,7 +91,7 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo nofnlabel = new TQLabel(mainWidget); // avoids auto resize when the text is changed - nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000))); + nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").arg(10000))); backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget); connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) ); @@ -189,18 +189,18 @@ static TQString regionAsString(int linenoA, int linecountA, int linenoB, int lin int lineendB = linenoB+linecountB-1; TQString res; if (linecountB == 0) - res = TQString("%1,%2d%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB-1); + res = TQString("%1,%2d%3").arg(linenoA).arg(lineendA).arg(linenoB-1); else if (linecountA == 0) - res = TQString("%1a%2,%3").tqarg(linenoA-1).tqarg(linenoB).tqarg(lineendB); + res = TQString("%1a%2,%3").arg(linenoA-1).arg(linenoB).arg(lineendB); else if (linenoA == lineendA) if (linenoB == lineendB) - res = TQString("%1c%2").tqarg(linenoA).tqarg(linenoB); + res = TQString("%1c%2").arg(linenoA).arg(linenoB); else - res = TQString("%1c%2,%3").tqarg(linenoA).tqarg(linenoB).tqarg(lineendB); + res = TQString("%1c%2,%3").arg(linenoA).arg(linenoB).arg(lineendB); else if (linenoB == lineendB) - res = TQString("%1,%2c%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB); + res = TQString("%1,%2c%3").arg(linenoA).arg(lineendA).arg(linenoB); else - res = TQString("%1,%2c%3,%4").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB).tqarg(lineendB); + res = TQString("%1,%2c%3,%4").arg(linenoA).arg(lineendA).arg(linenoB).arg(lineendB); return res; @@ -222,7 +222,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName TQStringList linesA, linesB; int linenoA, linenoB; - setCaption(i18n("CVS Diff: %1").tqarg(fileName)); + setCaption(i18n("CVS Diff: %1").arg(fileName)); revlabel1->setText( revA.isEmpty()? i18n("Repository:") : i18n("Revision ")+revA+":" ); @@ -408,9 +408,9 @@ void DiffDialog::updateNofN() { TQString str; if (markeditem >= 0) - str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count()); + str = i18n("%1 of %2").arg(markeditem+1).arg(items.count()); else - str = i18n("%1 differences").tqarg(items.count()); + str = i18n("%1 differences").arg(items.count()); nofnlabel->setText(str); itemscombo->setCurrentItem(markeditem==-2? 0 : markeditem+1); @@ -443,8 +443,8 @@ void DiffDialog::updateHighlight(int newitem) diff1->setCenterLine(item->linenoA); diff2->setCenterLine(item->linenoB); } - diff1->tqrepaint(); - diff2->tqrepaint(); + diff1->repaint(); + diff2->repaint(); updateNofN(); } |