diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /khotkeys/kcontrol | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/kcontrol')
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/menuedit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 84b0458b9..bd3a055ca 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -133,7 +133,7 @@ void Module::save() if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) { kdDebug( 1217 ) << "launching new khotkeys daemon" << endl; - KApplication::tdeinitExec( "khotkeys" ); + TDEApplication::tdeinitExec( "khotkeys" ); } else { diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 3880fc093..2d0d23b13 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -194,7 +194,7 @@ void khotkeys_send_reread_config() if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) { kdDebug( 1217 ) << "launching new khotkeys daemon" << endl; - KApplication::tdeinitExec( "khotkeys" ); + TDEApplication::tdeinitExec( "khotkeys" ); } else { |