summaryrefslogtreecommitdiffstats
path: root/khotkeys
diff options
context:
space:
mode:
Diffstat (limited to 'khotkeys')
-rw-r--r--khotkeys/TODO2
-rw-r--r--khotkeys/app/app.cpp2
-rw-r--r--khotkeys/app/kded.cpp2
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp8
-rw-r--r--khotkeys/kcontrol/menuedit.cpp12
-rw-r--r--khotkeys/kcontrol/windowselector.cpp6
-rw-r--r--khotkeys/shared/actions.cpp6
-rw-r--r--khotkeys/shared/gestures.cpp6
-rw-r--r--khotkeys/update/update.cpp2
9 files changed, 23 insertions, 23 deletions
diff --git a/khotkeys/TODO b/khotkeys/TODO
index d8e7fd352..00e84a7cc 100644
--- a/khotkeys/TODO
+++ b/khotkeys/TODO
@@ -11,7 +11,7 @@ SOON :
pri modify gestures vymazat stav
nektere simple akce by mely mit i conditions (nebo alespon jedno okno)
QPtrList -> QValueList
-pouzit Q/KApp( nogui ? ) v daemonu ?
+pouzit Q/TDEApp( nogui ? ) v daemonu ?
class Condition + tab 'Windows' -> 'Conditions'
- asi rozdelit Command/URL na Command/URL a SwitchToWindow
- nebo udelat, ze Command_url_action_data ( atd. ) maji jen jednu shortcut a tak, tj. dalsi zjednoduseni UI ?
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 54d25b465..64da17c14 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -78,7 +78,7 @@ void KHotKeysApp::reread_configuration()
void KHotKeysApp::quit()
{
- kapp->quit();
+ tdeApp->quit();
}
} // namespace KHotKeys
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index c78504919..debb08d80 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -39,7 +39,7 @@ TDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj )
{
// Check if khotkeys is already running as a stand alone application.
// In such case just exit.
- if (kapp->dcopClient()->isApplicationRegistered("khotkeys"))
+ if (tdeApp->dcopClient()->isApplicationRegistered("khotkeys"))
{
kdWarning(1217) << "khotkeys [kded module] is already running as a standalone application. Exiting." << endl;
return nullptr;
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 );
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index 180935f27..563a4a5dc 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -124,7 +124,7 @@ void Command_url_action::execute()
static bool sm_ready = false;
if( !sm_ready )
{
- kapp->propagateSessionManager();
+ tdeApp->propagateSessionManager();
sm_ready = true;
}
// int space_pos = command_url().find( ' ' );
@@ -149,7 +149,7 @@ void Command_url_action::execute()
}
case KURIFilterData::EXECUTABLE:
{
- if (!kapp->authorize("shell_access"))
+ if (!tdeApp->authorize("shell_access"))
return;
if( !uri.hasArgsAndOptions())
{
@@ -167,7 +167,7 @@ void Command_url_action::execute()
}
case KURIFilterData::SHELL:
{
- if (!kapp->authorize("shell_access"))
+ if (!tdeApp->authorize("shell_access"))
return;
if( !KRun::runCommand(
cmd + ( uri.hasArgsAndOptions() ? uri.argsAndOptions() : "" ),
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 5777f9a4f..d38d4f023 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -86,15 +86,15 @@ void Gesture::update_grab()
if( _enabled && handlers.count() > 0
&& ( exclude == NULL || !exclude->match( Window_data( windows_handler->active_window()))))
{
- kapp->removeX11EventFilter( this ); // avoid being installed twice
- kapp->installX11EventFilter( this );
+ tdeApp->removeX11EventFilter( this ); // avoid being installed twice
+ tdeApp->installX11EventFilter( this );
// CHECKME at se grabuje jen kdyz je alespon jedno gesto?
grab_mouse( true );
}
else
{
grab_mouse( false );
- kapp->removeX11EventFilter( this );
+ tdeApp->removeX11EventFilter( this );
}
}
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 19e503ac5..58fd42050 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -57,6 +57,6 @@ int main( int argc, char* argv[] )
}
settings.write_settings();
TQByteArray data;
- kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
+ tdeApp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
return 0;
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-12 11:55:53 +0000