summaryrefslogtreecommitdiffstats
path: root/kmail/kmstartup.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/kmstartup.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmstartup.cpp')
-rw-r--r--kmail/kmstartup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 6c041b0f1..43346fbcf 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -123,8 +123,8 @@ void checkConfigUpdates() {
static const int numUpdates = sizeof updates / sizeof *updates;
// Warning: do not remove entries in the above array, or the update-level check below will break
- KConfig * config = KMKernel::config();
- KConfigGroup startup( config, "Startup" );
+ TDEConfig * config = KMKernel::config();
+ TDEConfigGroup startup( config, "Startup" );
const int configUpdateLevel = startup.readNumEntry( "update-level", 0 );
if ( configUpdateLevel == numUpdates ) // Optimize for the common case that everything is OK
return;