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 /tdeui/kcmodule.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 'tdeui/kcmodule.cpp')
-rw-r--r-- | tdeui/kcmodule.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp index a047fe6b8..bba0e5247 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/kcmodule.cpp @@ -65,10 +65,10 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &) init(); if (name && strlen(name)) { d->_instance = new TDEInstance(name); - KGlobal::locale()->insertCatalogue(name); + TDEGlobal::locale()->insertCatalogue(name); } else d->_instance = new TDEInstance("kcmunnamed"); - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); d->managers.setAutoDelete( true ); @@ -82,11 +82,11 @@ KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & if (instance) { - KGlobal::locale()->insertCatalogue(instance->instanceName()); + TDEGlobal::locale()->insertCatalogue(instance->instanceName()); } d->_hasOwnInstance = false; - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); } void KCModule::init() |