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 --- konqueror/konq_main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'konqueror/konq_main.cc') diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 7e7a11ae4..9be0b538d 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -62,7 +62,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) KonquerorIface *kiface = new KonquerorIface; app.dcopClient()->setDefaultObject( kiface->objId() ); - KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq + TDEGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq KImageIO::registerFormats(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -87,7 +87,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { if (args->isSet("profiles")) { - TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); + TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true); profiles.sort(); for(TQStringList::ConstIterator it = profiles.begin(); it != profiles.end(); ++it) -- cgit v1.2.1