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 /kcontrol/keys | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/keys')
| -rw-r--r-- | kcontrol/keys/commandShortcuts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/keys/shortcuts.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index c31aaf85f..9f5a49040 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -130,7 +130,7 @@ void CommandShortcutsModule::initGUI() void CommandShortcutsModule::launchMenuEditor() { - if ( KApplication::startServiceByDesktopName( "kmenuedit", + if ( TDEApplication::startServiceByDesktopName( "kmenuedit", TQString() /*url*/, 0 /*error*/, 0 /*dcopservice*/, diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index a854479e8..265f25564 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -81,7 +81,7 @@ void ShortcutsModule::save() m_actionsGeneral.writeActions( "Global Shortcuts", 0, true, true ); m_actionsSequence.writeActions( "Global Shortcuts", 0, true, true ); - KIPC::sendMessageAll( KIPC::SettingsChanged, KApplication::SETTINGS_SHORTCUTS ); + KIPC::sendMessageAll( KIPC::SettingsChanged, TDEApplication::SETTINGS_SHORTCUTS ); } void ShortcutsModule::defaults() |