From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kparts/part.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kparts/part.cpp') diff --git a/kparts/part.cpp b/kparts/part.cpp index d2efbeeac..68e9dbbf2 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -110,9 +110,9 @@ void PartBase::setInstance( TDEInstance *inst ) void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins ) { KXMLGUIClient::setInstance( inst ); - KGlobal::locale()->insertCatalogue( inst->instanceName() ); + TDEGlobal::locale()->insertCatalogue( inst->instanceName() ); // install 'instancename'data resource type - KGlobal::dirs()->addResourceType( inst->instanceName() + "data", + TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data", KStandardDirs::kde_default( "data" ) + TQString::fromLatin1( inst->instanceName() ) + '/' ); if ( bLoadPlugins ) -- cgit v1.2.1