From 303e108109ce526c414e8770119134dcc2f2d7bd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:04 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8. --- kdiff3plugin/kdiff3plugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kdiff3plugin/kdiff3plugin.cpp') diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp index ec008f1..53360b6 100755 --- a/kdiff3plugin/kdiff3plugin.cpp +++ b/kdiff3plugin/kdiff3plugin.cpp @@ -101,17 +101,17 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T if(m_list.count() == 1) { int historyCount = s_pHistory ? s_pHistory->count() : 0; - s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); + s = i18n("Compare with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() ); pAction = new KAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pActionMenu->insert (pAction); - s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); + s = i18n("Merge with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() ); pAction = new KAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pActionMenu->insert (pAction); - s = i18n("Save '%1' for later").arg( ( m_list.front() ) ); + s = i18n("Save '%1' for later").tqarg( ( m_list.front() ) ); pAction = new KAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection()); pAction->setEnabled( m_list.count()>0 ); pActionMenu->insert(pAction); -- cgit v1.2.3