diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:34 -0600 |
commit | f78838f2f736acc2b235d8b680f3379a07a6d372 (patch) | |
tree | 81d92708252929f5199fbaf6bc03f5a57c0e3ad8 /cervisia/resolvedlg.cpp | |
parent | 1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f (diff) | |
download | tdesdk-f78838f2f736acc2b235d8b680f3379a07a6d372.tar.gz tdesdk-f78838f2f736acc2b235d8b680f3379a07a6d372.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'cervisia/resolvedlg.cpp')
-rw-r--r-- | cervisia/resolvedlg.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp index a2aceced..dacb0d0f 100644 --- a/cervisia/resolvedlg.cpp +++ b/cervisia/resolvedlg.cpp @@ -222,7 +222,7 @@ bool ResolveDialog::parseFile(const TQString &name) int advanced1, advanced2; enum { Normal, VersionA, VersionB } state; - setCaption(i18n("CVS Resolve: %1").tqarg(name)); + setCaption(i18n("CVS Resolve: %1").arg(name)); fname = name; @@ -383,9 +383,9 @@ void ResolveDialog::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 conflicts").tqarg(items.count()); + str = i18n("%1 conflicts").arg(items.count()); nofnlabel->setText(str); backbutton->setEnabled(markeditem != -1); @@ -424,9 +424,9 @@ void ResolveDialog::updateHighlight(int newitem) diff2->setCenterLine(item->linenoB); merge->setCenterOffset(item->offsetM); } - diff1->tqrepaint(); - diff2->tqrepaint(); - merge->tqrepaint(); + diff1->repaint(); + diff2->repaint(); + merge->repaint(); updateNofN(); } @@ -456,7 +456,7 @@ void ResolveDialog::updateMergedVersion(ResolveItem* item, while ( (item = items.next()) != 0 ) item->offsetM += difference; - merge->tqrepaint(); + merge->repaint(); } @@ -562,9 +562,9 @@ void ResolveDialog::editClicked() } delete dlg; - diff1->tqrepaint(); - diff2->tqrepaint(); - merge->tqrepaint(); + diff1->repaint(); + diff2->repaint(); + merge->repaint(); } |