summaryrefslogtreecommitdiffstats
path: root/tdeinit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /tdeinit
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdeinit')
-rw-r--r--tdeinit/phase1.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index 467aa9b4..4790db56 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
TDEApplication::disableAutoDcopRegistration();
TDEApplication app;
- KConfig config("twinrc", true);
+ TDEConfig config("twinrc", true);
config.setGroup( "ThirdPartyWM" );
TQString wmToLaunch = config.readEntry("WMExecutable", "");
TQString wmArguments = config.readEntry("WMAdditionalArguments", "");