diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/kcontrol/modules.cpp | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol/modules.cpp')
| -rw-r--r-- | kcontrol/kcontrol/modules.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 592eb52c2..047fa75e6 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -47,7 +47,7 @@ template class TQPtrList<ConfigModule>; ConfigModule::ConfigModule(const KService::Ptr &s) - : KCModuleInfo(s), _changed(false), _module(0), _embedWidget(0), + : TDECModuleInfo(s), _changed(false), _module(0), _embedWidget(0), _rootProcess(0), _embedLayout(0), _embedFrame(0), _embedStack(0) { } @@ -64,12 +64,12 @@ ProxyWidget *ConfigModule::module() bool run_as_root = needsRootPrivileges() && (getuid() != 0); - KCModule *modWidget = 0; + TDECModule *modWidget = 0; if (run_as_root && isHiddenByDefault()) modWidget = new KCRootOnly(0, "root_only"); else - modWidget = KCModuleLoader::loadModule(*this); + modWidget = TDECModuleLoader::loadModule(*this); if (modWidget) { @@ -110,7 +110,7 @@ void ConfigModule::deleteClient() delete _embedLayout; _embedLayout = 0; - KCModuleLoader::unloadModule(*this); + TDECModuleLoader::unloadModule(*this); _changed = false; } |