summaryrefslogtreecommitdiffstats
path: root/khotkeys/update
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /khotkeys/update
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication 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 5387382fa..00649d854 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
"KHotKeys update utility", "1.0" );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
+ TDEApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
TQCString id = args->getOption( "id" );
TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );