From 672c9c39de40e4da2849acbacf0b943dd26a31ac Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:19 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdiff3plugin/kdiff3plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kdiff3plugin') 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(); -- cgit v1.2.1