diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:19 -0600 |
| commit | 672c9c39de40e4da2849acbacf0b943dd26a31ac (patch) | |
| tree | 4e7c5dc2fdb4ad4a5965f155d637469539f5756f /kdiff3plugin | |
| parent | f6fa7358bce15f669048effe68b8fb77ed6ffb58 (diff) | |
| download | kdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.tar.gz kdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdiff3plugin')
| -rwxr-xr-x | kdiff3plugin/kdiff3plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp index 02fa72d..1d518cc 100755 --- a/kdiff3plugin/kdiff3plugin.cpp +++ b/kdiff3plugin/kdiff3plugin.cpp @@ -72,7 +72,7 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T m_pParentWidget = pPopupmenu->parentWidget(); - KGlobal::locale()->insertCatalogue("kdiff3_plugin"); + TDEGlobal::locale()->insertCatalogue("kdiff3_plugin"); // remember currently selected files (copy to a TQStringList) KFileItemList itemList = pPopupmenu->fileItemList(); |