diff options
| author | Timothy Pearson <[email protected]> | 2011-12-15 15:30:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-15 15:30:18 -0600 |
| commit | f3372e7bea9bbc288e039d85d660450220a637d8 (patch) | |
| tree | a67f22c6994e07957a7d7053caa39c3808128f07 /kdiff3plugin/kdiff3plugin.cpp | |
| parent | b6e4d65c272eed16b317a7f8fed20d05b7bd8236 (diff) | |
| download | kdiff3-f3372e7bea9bbc288e039d85d660450220a637d8.tar.gz kdiff3-f3372e7bea9bbc288e039d85d660450220a637d8.zip | |
Rename a number of old tq methods that are no longer tq specific
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 53360b6..ec008f1 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").tqarg( historyCount>0 ? s_pHistory->front() : TQString() ); + s = i18n("Compare with %1").arg( 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").tqarg( historyCount>0 ? s_pHistory->front() : TQString() ); + s = i18n("Merge with %1").arg( 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").tqarg( ( m_list.front() ) ); + s = i18n("Save '%1' for later").arg( ( m_list.front() ) ); pAction = new KAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection()); pAction->setEnabled( m_list.count()>0 ); pActionMenu->insert(pAction); |