summaryrefslogtreecommitdiffstats
path: root/ksmserver/main.cpp
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 /ksmserver/main.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver/main.cpp')
-rw-r--r--ksmserver/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 0f7d699d0..402f395e5 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -225,7 +225,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
IceSetIOErrorHandler( IoErrorHandler );
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "General" );
int realScreenCount = ScreenCount( tqt_xdisplay() );