From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:17:06 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kcontrol/keys/commandShortcuts.cpp | 2 +- kcontrol/keys/shortcuts.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kcontrol/keys') 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() -- cgit v1.2.3