diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kparts/part.cpp | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kparts/part.cpp')
-rw-r--r-- | kparts/part.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 ) |