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 --- kicker/proxy/extensionproxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kicker/proxy/extensionproxy.cpp') diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index a2fc35ecc..23289c633 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) TDEApplication a; a.disableSessionManagement(); - KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); // setup proxy object @@ -134,7 +134,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); + df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } TQFile file(df); -- cgit v1.2.3