diff options
Diffstat (limited to 'khotkeys/kcontrol')
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.cpp | 8 | ||||
| -rw-r--r-- | khotkeys/kcontrol/menuedit.cpp | 12 | ||||
| -rw-r--r-- | khotkeys/kcontrol/windowselector.cpp | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 406a29e35..0d326b225 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -122,18 +122,18 @@ void Module::save() tab_widget->save_current_action_changes(); settings.actions = _actions_root; settings.write_settings(); - if(kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) + if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" )) { // khotkeys running as a standalone application TQByteArray data; kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl; - kapp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data ); + tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data ); } else { TQCString replyType; TQByteArray replyData; - if (kapp->dcopClient()->call("kded", "kded", "loadedModules()", + if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()", TQByteArray(), replyType, replyData)) { if (replyType == "QCStringList") @@ -146,7 +146,7 @@ void Module::save() // khotkeys running as a kded service TQByteArray data; kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl; - kapp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data ); + tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data ); } } } diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 80c632d5b..12191ff63 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -189,20 +189,20 @@ KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P ) void khotkeys_send_reread_config() { TQByteArray data; - if( !kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); - if(kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) + if( !tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); + if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" )) { // khotkeys running as a standalone application TQByteArray data; kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl; - kapp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data ); + tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data ); } else { TQCString replyType; TQByteArray replyData; - if (kapp->dcopClient()->call("kded", "kded", "loadedModules()", + if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()", TQByteArray(), replyType, replyData)) { if (replyType == "QCStringList") @@ -215,7 +215,7 @@ void khotkeys_send_reread_config() // khotkeys running as a kded service TQByteArray data; kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl; - kapp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data ); + tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data ); } } } diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index d5a1f4859..0b3389fbe 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/khotkeys/kcontrol/windowselector.cpp @@ -34,15 +34,15 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P ) void WindowSelector::select() { - kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor )); - kapp->installX11EventFilter( this ); + tdeApp->desktop()->grabMouse( TQCursor( TQt::crossCursor )); + tdeApp->installX11EventFilter( this ); } bool WindowSelector::x11Event( XEvent* e ) { if( e->type != ButtonPress ) return false; - kapp->desktop()->releaseMouse(); + tdeApp->desktop()->releaseMouse(); if( e->xbutton.button == Button1 ) { WId window = findRealWindow( e->xbutton.subwindow ); |