summaryrefslogtreecommitdiffstats
path: root/kcmshell
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kcmshell
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcmshell')
-rw-r--r--kcmshell/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 2ef0ac781..5d71fbaa7 100644
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -106,7 +106,7 @@ static KService::Ptr locateModule(const TQCString& module)
if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
return locateModule( "kde-" + module );
- if(!KCModuleLoader::testModule( module ))
+ if(!TDECModuleLoader::testModule( module ))
{
kdDebug(780) << "According to \"" << module << "\"'s test function, it should Not be loaded." << endl;
return 0;
@@ -301,7 +301,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
id = args->getOption( "embed-proxy" ).toInt(&idValid);
if( idValid )
{
- KCModuleProxy *module = new KCModuleProxy( modules.first()->desktopEntryName() );
+ TDECModuleProxy *module = new TDECModuleProxy( modules.first()->desktopEntryName() );
module->realModule();
QXEmbed::embedClientIntoWindow( module, id);
app.exec();
@@ -318,7 +318,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
i18n("Configure - %1").arg(kapp->caption()), 0, "", true );
for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it)
- dlg->addModule(KCModuleInfo(*it));
+ dlg->addModule(TDECModuleInfo(*it));
if ( args->isSet( "embed" ))
{
@@ -339,7 +339,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
if (kapp->iconName() != kapp->name())
setIcon(dlg, kapp->iconName());
else if ( modules.count() == 1 )
- setIcon(dlg, KCModuleInfo( modules.first()).icon());
+ setIcon(dlg, TDECModuleInfo( modules.first()).icon());
dlg->exec();
delete dlg;