summaryrefslogtreecommitdiffstats
path: root/khotkeys/update
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 /khotkeys/update
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/update')
-rw-r--r--khotkeys/update/update.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 00649d854..1d4f26b45 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -49,7 +49,7 @@ int main( int argc, char* argv[] )
init_global_data( false, TQT_TQOBJECT(&app) );
Settings settings;
settings.read_settings( true );
- KConfig cfg( file, true );
+ TDEConfig cfg( file, true );
if( !settings.import( cfg, false ))
{
kdWarning() << "Import of " << id << " failed!" << endl;