diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:04 -0600 |
| commit | 303e108109ce526c414e8770119134dcc2f2d7bd (patch) | |
| tree | 16e7fdb1b604f30ac7b9cb7bbaeae90c34f438a6 /kdiff3plugin/kdiff3plugin.cpp | |
| parent | f3372e7bea9bbc288e039d85d660450220a637d8 (diff) | |
| download | kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.tar.gz kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
Diffstat (limited to 'kdiff3plugin/kdiff3plugin.cpp')
| -rwxr-xr-x | kdiff3plugin/kdiff3plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |