From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libkonq/konq_popupmenu.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libkonq/konq_popupmenu.cc') diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 129542952..9e2f0bf53 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -356,7 +356,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) bool isTrashLink = false; m_lstPopupURLs.clear(); int id = 0; - setFont(KGlobalSettings::menuFont()); + setFont(TDEGlobalSettings::menuFont()); m_pluginList.setAutoDelete( true ); m_ownActions.setHighlightingEnabled( true ); @@ -706,7 +706,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) } // findAllResources() also removes duplicates - const TQStringList entries = KGlobal::dirs()->findAllResources("data", + const TQStringList entries = TDEGlobal::dirs()->findAllResources("data", "konqueror/servicemenus/*.desktop", false /* recursive */, true /* unique */); -- cgit v1.2.1