summaryrefslogtreecommitdiffstats
path: root/khotkeys/kcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'khotkeys/kcontrol')
-rw-r--r--khotkeys/kcontrol/CMakeL10n.txt7
-rw-r--r--khotkeys/kcontrol/CMakeLists.txt9
-rw-r--r--khotkeys/kcontrol/Makefile.am7
-rw-r--r--khotkeys/kcontrol/action_group_tab.cpp20
-rw-r--r--khotkeys/kcontrol/action_group_tab.h2
-rw-r--r--khotkeys/kcontrol/action_list_widget.cpp20
-rw-r--r--khotkeys/kcontrol/action_list_widget.h14
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.cpp8
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.h4
-rw-r--r--khotkeys/kcontrol/command_url_widget.cpp4
-rw-r--r--khotkeys/kcontrol/command_url_widget.h2
-rw-r--r--khotkeys/kcontrol/condition_list_widget.cpp22
-rw-r--r--khotkeys/kcontrol/condition_list_widget.h6
-rw-r--r--khotkeys/kcontrol/dcop_widget.cpp16
-rw-r--r--khotkeys/kcontrol/dcop_widget.h2
-rw-r--r--khotkeys/kcontrol/general_settings_tab.cpp13
-rw-r--r--khotkeys/kcontrol/general_settings_tab.h4
-rw-r--r--khotkeys/kcontrol/general_tab.cpp32
-rw-r--r--khotkeys/kcontrol/general_tab.h2
-rw-r--r--khotkeys/kcontrol/gesture_triggers_tab.cpp16
-rw-r--r--khotkeys/kcontrol/gesture_triggers_tab.h4
-rw-r--r--khotkeys/kcontrol/gesturedrawer.h2
-rw-r--r--khotkeys/kcontrol/gesturerecorder.cpp4
-rw-r--r--khotkeys/kcontrol/gesturerecorder.h2
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.cpp8
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.h2
-rw-r--r--khotkeys/kcontrol/gestures_settings_tab.cpp12
-rw-r--r--khotkeys/kcontrol/gestures_settings_tab.h2
-rw-r--r--khotkeys/kcontrol/info_tab.h2
-rw-r--r--khotkeys/kcontrol/init.cpp47
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp53
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.h17
-rw-r--r--khotkeys/kcontrol/keyboard_input_widget.cpp20
-rw-r--r--khotkeys/kcontrol/keyboard_input_widget.h2
-rw-r--r--khotkeys/kcontrol/khotkeys.desktop3
-rw-r--r--khotkeys/kcontrol/main_buttons_widget.cpp20
-rw-r--r--khotkeys/kcontrol/main_buttons_widget.h2
-rw-r--r--khotkeys/kcontrol/menuedit.cpp35
-rw-r--r--khotkeys/kcontrol/menuedit.h16
-rw-r--r--khotkeys/kcontrol/menuentry_widget.cpp4
-rw-r--r--khotkeys/kcontrol/menuentry_widget.h2
-rw-r--r--khotkeys/kcontrol/tab_widget.cpp14
-rw-r--r--khotkeys/kcontrol/tab_widget.h2
-rw-r--r--khotkeys/kcontrol/triggers_tab.cpp38
-rw-r--r--khotkeys/kcontrol/triggers_tab.h12
-rw-r--r--khotkeys/kcontrol/ui/action_group_tab_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/action_list_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/command_url_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/condition_list_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/dcop_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/general_settings_tab_ui.ui12
-rw-r--r--khotkeys/kcontrol/ui/general_tab_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/menuentry_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/triggers_tab_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/voice_input_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/voice_settings_tab.cpp2
-rw-r--r--khotkeys/kcontrol/voice_settings_tab.h2
-rw-r--r--khotkeys/kcontrol/voicerecorder.cpp8
-rw-r--r--khotkeys/kcontrol/voicerecorder.h2
-rw-r--r--khotkeys/kcontrol/voicerecordpage.cpp8
-rw-r--r--khotkeys/kcontrol/voicerecordpage.h2
-rw-r--r--khotkeys/kcontrol/waiting_widget.cpp4
-rw-r--r--khotkeys/kcontrol/waiting_widget.h2
-rw-r--r--khotkeys/kcontrol/window_trigger_widget.cpp16
-rw-r--r--khotkeys/kcontrol/window_trigger_widget.h2
-rw-r--r--khotkeys/kcontrol/windowdef_list_widget.cpp26
-rw-r--r--khotkeys/kcontrol/windowdef_list_widget.h4
-rw-r--r--khotkeys/kcontrol/windowdef_simple_widget.cpp52
-rw-r--r--khotkeys/kcontrol/windowdef_simple_widget.h2
-rw-r--r--khotkeys/kcontrol/windowselector.cpp8
-rw-r--r--khotkeys/kcontrol/windowselector.h4
75 files changed, 330 insertions, 413 deletions
diff --git a/khotkeys/kcontrol/CMakeL10n.txt b/khotkeys/kcontrol/CMakeL10n.txt
deleted file mode 100644
index a51e4afa8..000000000
--- a/khotkeys/kcontrol/CMakeL10n.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_create_template(
- CATALOG "desktop_files/khotkeys.desktop/"
- SOURCES khotkeys.desktop
- DESTINATION "${CMAKE_SOURCE_DIR}/translations"
-)
diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt
index 902c5a0e6..b1bd06bdd 100644
--- a/khotkeys/kcontrol/CMakeLists.txt
+++ b/khotkeys/kcontrol/CMakeLists.txt
@@ -47,12 +47,3 @@ tde_add_kpart( kcm_khotkeys AUTOMOC
LINK ui-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-
-
-##### kcm_khotkeys_init (module) ################
-
-tde_add_kpart( kcm_khotkeys_init AUTOMOC
- SOURCES init.cpp
- LINK tdecore-shared
- DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/khotkeys/kcontrol/Makefile.am b/khotkeys/kcontrol/Makefile.am
index 03a728ae3..8f0a18480 100644
--- a/khotkeys/kcontrol/Makefile.am
+++ b/khotkeys/kcontrol/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = ui
-kde_module_LTLIBRARIES = kcm_khotkeys.la kcm_khotkeys_init.la
+kde_module_LTLIBRARIES = kcm_khotkeys.la
kcm_khotkeys_la_SOURCES = \
menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp \
@@ -15,11 +15,6 @@ kcm_khotkeys_la_SOURCES = \
kcm_khotkeys_la_LIBADD = ui/libui.la $(LIB_TDEUI) $(LIB_ARTS)
kcm_khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_khotkeys_init_la_SOURCES = init.cpp
-
-kcm_khotkeys_init_la_LIBADD = $(LIB_TDECORE)
-kcm_khotkeys_init_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-
noinst_HEADERS = menuedit.h window_trigger_widget.h \
tab_widget.h main_buttons_widget.h actions_listview_widget.h menuentry_widget.h \
general_tab.h action_group_tab.h kcmkhotkeys.h windowdef_list_widget.h \
diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp
index 1bdeffd75..8ba35f323 100644
--- a/khotkeys/kcontrol/action_group_tab.cpp
+++ b/khotkeys/kcontrol/action_group_tab.cpp
@@ -36,18 +36,18 @@ Action_group_tab::Action_group_tab( TQWidget* parent_P , const char* name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( disable_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
- module, TQT_SLOT( changed()));
+ connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( disable_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( comment_multilineedit, TQ_SIGNAL( textChanged()),
+ module, TQ_SLOT( changed()));
}
void Action_group_tab::clear_data()
{
- disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
- TQT_SLOT( action_group_name_changed( const TQString& )));
+ disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this,
+ TQ_SLOT( action_group_name_changed( const TQString& )));
action_name_lineedit->clear();
action_name_lineedit->setReadOnly( false );
disable_checkbox->setChecked( false );
@@ -71,8 +71,8 @@ void Action_group_tab::set_data( const Action_data_group* data_P )
else
disable_checkbox->setText( i18n( "&Disable" ));
comment_multilineedit->setText( data_P->comment());
- connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
- TQT_SLOT( action_group_name_changed( const TQString& )));
+ connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this,
+ TQ_SLOT( action_group_name_changed( const TQString& )));
system_group = data_P->system_group();
}
diff --git a/khotkeys/kcontrol/action_group_tab.h b/khotkeys/kcontrol/action_group_tab.h
index 970f16379..5b1435346 100644
--- a/khotkeys/kcontrol/action_group_tab.h
+++ b/khotkeys/kcontrol/action_group_tab.h
@@ -23,7 +23,7 @@ class Windowdef_list;
class Action_group_tab
: public Action_group_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Action_group_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Action_data_group* data_P );
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index d007ab5f5..2f87132d8 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -50,7 +50,7 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION );
popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION );
popup->insertItem( i18n( "Waiting..." ), TYPE_WAITING_ACTION );
- connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+ connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
new_button->setPopup( popup );
actions_listview->header()->hide();
actions_listview->addColumn( "" );
@@ -60,17 +60,17 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
modify_button->setEnabled( false );
delete_button->setEnabled( false );
clear_data();
- connect( actions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
- this, TQT_SLOT( modify_pressed() ) );
+ connect( actions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQ_SLOT( modify_pressed() ) );
// KHotKeys::Module::changed()
- connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)), module, TQT_SLOT(changed()));
+ connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)), module, TQ_SLOT(changed()));
}
Action_list_widget::~Action_list_widget()
diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h
index 91bee9417..eb3ca7995 100644
--- a/khotkeys/kcontrol/action_list_widget.h
+++ b/khotkeys/kcontrol/action_list_widget.h
@@ -35,7 +35,7 @@ class Action_list_item;
class Action_list_widget
: public Action_list_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Action_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Action_list_widget();
@@ -89,7 +89,7 @@ class Action_dialog
class Command_url_action_dialog
: public KDialogBase, public Action_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Command_url_action_dialog( Command_url_action* action_P );
virtual Action* edit_action();
@@ -102,7 +102,7 @@ class Command_url_action_dialog
class Menuentry_action_dialog
: public KDialogBase, public Action_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Menuentry_action_dialog( Menuentry_action* action_P );
virtual Action* edit_action();
@@ -115,7 +115,7 @@ class Menuentry_action_dialog
class Dcop_action_dialog
: public KDialogBase, public Action_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Dcop_action_dialog( Dcop_action* action_P );
virtual Action* edit_action();
@@ -128,7 +128,7 @@ class Dcop_action_dialog
class Keyboard_input_action_dialog
: public KDialogBase, public Action_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Keyboard_input_action_dialog( Keyboard_input_action* action_P );
virtual Action* edit_action();
@@ -141,7 +141,7 @@ class Keyboard_input_action_dialog
class Activate_window_action_dialog
: public KDialogBase, public Action_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Activate_window_action_dialog( Activate_window_action* action_P );
virtual Action* edit_action();
@@ -154,7 +154,7 @@ class Activate_window_action_dialog
class Waiting_action_dialog
: public KDialogBase, public Action_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Waiting_action_dialog( Waiting_action* action_P );
virtual Action* edit_action();
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index 1b6c7a743..9fe4716c2 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -39,10 +39,10 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char
actions_listview->header()->hide();
actions_listview->addColumn( "" );
actions_listview->setRootIsDecorated( true ); // CHECKME
- connect( actions_listview, TQT_SIGNAL( current_changed( TQListViewItem* )),
- TQT_SLOT( current_changed( TQListViewItem* )));
- connect( actions_listview, TQT_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )),
- TQT_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
+ connect( actions_listview, TQ_SIGNAL( current_changed( TQListViewItem* )),
+ TQ_SLOT( current_changed( TQListViewItem* )));
+ connect( actions_listview, TQ_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )),
+ TQ_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
// KHotKeys::Module::changed()
}
diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h
index e380791ee..cfad501f5 100644
--- a/khotkeys/kcontrol/actions_listview_widget.h
+++ b/khotkeys/kcontrol/actions_listview_widget.h
@@ -28,7 +28,7 @@ class Action_data_base;
class Actions_listview_widget
: public Actions_listview_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Actions_listview_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
Action_listview_item* current_action() const;
@@ -56,7 +56,7 @@ class Actions_listview_widget
class Actions_listview
: public KHListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
Actions_listview( TQWidget* parent_P = NULL, const char* name_P = NULL );
Actions_listview_widget* widget();
diff --git a/khotkeys/kcontrol/command_url_widget.cpp b/khotkeys/kcontrol/command_url_widget.cpp
index 133913360..5d06c1a16 100644
--- a/khotkeys/kcontrol/command_url_widget.cpp
+++ b/khotkeys/kcontrol/command_url_widget.cpp
@@ -37,8 +37,8 @@ Command_url_widget::Command_url_widget( TQWidget* parent_P, const char* name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( command_url_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect( command_url_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
}
void Command_url_widget::clear_data()
diff --git a/khotkeys/kcontrol/command_url_widget.h b/khotkeys/kcontrol/command_url_widget.h
index af9a9dc2a..3465bfa96 100644
--- a/khotkeys/kcontrol/command_url_widget.h
+++ b/khotkeys/kcontrol/command_url_widget.h
@@ -22,7 +22,7 @@ class Action_data;
class Command_url_widget
: public Command_url_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Command_url_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Command_url_action* data_P );
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 817602a12..f0a43cb93 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -49,10 +49,10 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
popup->insertItem( i18n( "Not_condition", "Not" ), TYPE_NOT );
popup->insertItem( i18n( "And_condition", "And" ), TYPE_AND );
popup->insertItem( i18n( "Or_condition", "Or" ), TYPE_OR );
- connect( conditions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
- this, TQT_SLOT( modify_pressed() ) );
+ connect( conditions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQ_SLOT( modify_pressed() ) );
- connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+ connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
new_button->setPopup( popup );
conditions_listview->header()->hide();
conditions_listview->addColumn( "" );
@@ -66,14 +66,14 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
move_down_button->setEnabled( false );
clear_data();
// KHotKeys::Module::changed()
- connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
- connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
- connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
- connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)),
- module, TQT_SLOT(changed()));
+ connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed()));
+ connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed()));
+ connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+ connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)),
+ module, TQ_SLOT(changed()));
}
Condition_list_widget::~Condition_list_widget()
diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h
index 04c9d3deb..35f401205 100644
--- a/khotkeys/kcontrol/condition_list_widget.h
+++ b/khotkeys/kcontrol/condition_list_widget.h
@@ -30,7 +30,7 @@ class Condition_list_item;
class Condition_list_widget
: public Condition_list_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Condition_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Condition_list_widget();
@@ -87,7 +87,7 @@ class Condition_dialog
class Active_window_condition_dialog
: public KDialogBase, public Condition_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Active_window_condition_dialog( Active_window_condition* condition_P );
virtual Condition* edit_condition();
@@ -100,7 +100,7 @@ class Active_window_condition_dialog
class Existing_window_condition_dialog
: public KDialogBase, public Condition_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Existing_window_condition_dialog( Existing_window_condition* condition_P );
virtual Condition* edit_condition();
diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp
index bee149860..d986e5a51 100644
--- a/khotkeys/kcontrol/dcop_widget.cpp
+++ b/khotkeys/kcontrol/dcop_widget.cpp
@@ -36,14 +36,14 @@ Dcop_widget::Dcop_widget( TQWidget* parent_P, const char* name_P )
clear_data();
try_button->setText( i18n( "to try", "&Try" )); // Qt designer can't do this
// KHotKeys::Module::changed()
- connect( remote_app_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( remote_object_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( called_function_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( arguments_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect( remote_app_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( remote_object_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( called_function_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( arguments_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
}
void Dcop_widget::clear_data()
diff --git a/khotkeys/kcontrol/dcop_widget.h b/khotkeys/kcontrol/dcop_widget.h
index 43523f00d..a7b6f1bca 100644
--- a/khotkeys/kcontrol/dcop_widget.h
+++ b/khotkeys/kcontrol/dcop_widget.h
@@ -22,7 +22,7 @@ class Action_data;
class Dcop_widget
: public Dcop_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Dcop_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Dcop_action* data_P );
diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp
index cf2337446..07382c4ed 100644
--- a/khotkeys/kcontrol/general_settings_tab.cpp
+++ b/khotkeys/kcontrol/general_settings_tab.cpp
@@ -26,9 +26,6 @@ namespace KHotKeys
General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name_P )
: General_settings_tab_ui( parent_P, name_P )
{
- // KHotKeys::Module::changed()
- connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
}
void General_settings_tab::import_clicked()
@@ -36,16 +33,6 @@ void General_settings_tab::import_clicked()
module->import();
}
-void General_settings_tab::write_data() const
- {
- module->set_daemon_disabled( disable_daemon_checkbox->isChecked());
- }
-
-void General_settings_tab::read_data()
- {
- disable_daemon_checkbox->setChecked( module->daemon_disabled());
- }
-
void General_settings_tab::clear_data()
{
// "global" tab, not action specific, do nothing
diff --git a/khotkeys/kcontrol/general_settings_tab.h b/khotkeys/kcontrol/general_settings_tab.h
index 8bcd5cd21..962111b36 100644
--- a/khotkeys/kcontrol/general_settings_tab.h
+++ b/khotkeys/kcontrol/general_settings_tab.h
@@ -19,11 +19,9 @@ namespace KHotKeys
class General_settings_tab
: public General_settings_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
General_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
- void read_data();
- void write_data() const;
public slots:
void clear_data();
protected slots:
diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp
index 1cd98d461..21ca6f952 100644
--- a/khotkeys/kcontrol/general_tab.cpp
+++ b/khotkeys/kcontrol/general_tab.cpp
@@ -73,22 +73,22 @@ General_tab::General_tab( TQWidget* parent_P, const char* name_P )
}
clear_data();
// KHotKeys::Module::changed()
- connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( disable_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
- module, TQT_SLOT( changed()));
- connect( action_type_combo, TQT_SIGNAL( activated( int )),
- module, TQT_SLOT( changed()));
+ connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( disable_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( comment_multilineedit, TQ_SIGNAL( textChanged()),
+ module, TQ_SLOT( changed()));
+ connect( action_type_combo, TQ_SIGNAL( activated( int )),
+ module, TQ_SLOT( changed()));
}
void General_tab::clear_data()
{
- disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- this, TQT_SLOT( action_name_changed( const TQString& )));
- disconnect( action_type_combo, TQT_SIGNAL( activated( int )),
- this, TQT_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
+ disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ this, TQ_SLOT( action_name_changed( const TQString& )));
+ disconnect( action_type_combo, TQ_SIGNAL( activated( int )),
+ this, TQ_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
action_name_lineedit->clear();
disable_checkbox->setChecked( false );
disable_checkbox->setText( i18n( "&Disable" ));
@@ -113,10 +113,10 @@ void General_tab::set_data( const Action_data* data_P )
comment_multilineedit->setText( data_P->comment());
action_type_combo->setCurrentItem( Tab_widget::type( data_P ));
// module->set_action_type( data_P->type());
- connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- TQT_SLOT( action_name_changed( const TQString& )));
- connect( action_type_combo, TQT_SIGNAL( activated( int )),
- TQT_SIGNAL( action_type_changed( int )));
+ connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ TQ_SLOT( action_name_changed( const TQString& )));
+ connect( action_type_combo, TQ_SIGNAL( activated( int )),
+ TQ_SIGNAL( action_type_changed( int )));
}
void General_tab::get_data( TQString& name_O, TQString& comment_O, bool& enabled_O )
diff --git a/khotkeys/kcontrol/general_tab.h b/khotkeys/kcontrol/general_tab.h
index 58f670a68..bd738f6a1 100644
--- a/khotkeys/kcontrol/general_tab.h
+++ b/khotkeys/kcontrol/general_tab.h
@@ -25,7 +25,7 @@ class Action_list;
class General_tab
: public General_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
General_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Action_data* data_P );
diff --git a/khotkeys/kcontrol/gesture_triggers_tab.cpp b/khotkeys/kcontrol/gesture_triggers_tab.cpp
index b00f60963..52c41cd9e 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.cpp
+++ b/khotkeys/kcontrol/gesture_triggers_tab.cpp
@@ -35,12 +35,12 @@ Gesture_triggers_tab::Gesture_triggers_tab( TQWidget* parent_P, const char* name
{
clear_data();
// KHotKeys::Module::changed()
- connect( gesture_edit_button1, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( gesture_edit_button2, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( gesture_edit_button3, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
+ connect( gesture_edit_button1, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( gesture_edit_button2, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( gesture_edit_button3, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
}
void Gesture_triggers_tab::clear_data()
@@ -142,8 +142,8 @@ Gesture_edit_dialog::Gesture_edit_dialog( const TQString& gesture_P )
_page = new GestureRecordPage( _gesture,
this, "GestureRecordPage");
-// connect(_page, TQT_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
-// this, TQT_SLOT(enableButtonOK(bool)));
+// connect(_page, TQ_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
+// this, TQ_SLOT(enableButtonOK(bool)));
setMainWidget( _page );
}
diff --git a/khotkeys/kcontrol/gesture_triggers_tab.h b/khotkeys/kcontrol/gesture_triggers_tab.h
index c11787d03..95bdebe94 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.h
+++ b/khotkeys/kcontrol/gesture_triggers_tab.h
@@ -26,7 +26,7 @@ class Action_data;
class Gesture_triggers_tab
: public Gesture_triggers_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Gesture_triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Trigger_list* triggers_P );
@@ -46,7 +46,7 @@ class GestureRecordPage;
class Gesture_edit_dialog
: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
Gesture_edit_dialog( const TQString& gesture_P );
TQString edit_gesture();
diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h
index ee3af6809..c3476348e 100644
--- a/khotkeys/kcontrol/gesturedrawer.h
+++ b/khotkeys/kcontrol/gesturedrawer.h
@@ -24,7 +24,7 @@ namespace KHotKeys
class GestureDrawer : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
GestureDrawer(TQWidget *parent, const char *name);
~GestureDrawer();
diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp
index 6e4395a5b..db946cf06 100644
--- a/khotkeys/kcontrol/gesturerecorder.cpp
+++ b/khotkeys/kcontrol/gesturerecorder.cpp
@@ -32,7 +32,7 @@ GestureRecorder::~GestureRecorder()
void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
{
- if (ev->button() == Qt::LeftButton)
+ if (ev->button() == TQt::LeftButton)
{
_mouseButtonDown = true;
stroke.reset();
@@ -43,7 +43,7 @@ void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev)
{
- if ((ev->button() == Qt::LeftButton) && (_mouseButtonDown))
+ if ((ev->button() == TQt::LeftButton) && (_mouseButtonDown))
{
TQPoint pos = ev->pos();
stroke.record(pos.x(), pos.y());
diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h
index e42de2c0e..07e5f88a4 100644
--- a/khotkeys/kcontrol/gesturerecorder.h
+++ b/khotkeys/kcontrol/gesturerecorder.h
@@ -24,7 +24,7 @@ namespace KHotKeys
class GestureRecorder : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
GestureRecorder(TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp
index e9e768bb0..bc254a878 100644
--- a/khotkeys/kcontrol/gesturerecordpage.cpp
+++ b/khotkeys/kcontrol/gesturerecordpage.cpp
@@ -49,8 +49,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
_recorder = new GestureRecorder(this, "recorder");
_recorder->setMinimumHeight(150);
setStretchFactor(_recorder, 1);
- connect(_recorder, TQT_SIGNAL(recorded(const TQString &)),
- this, TQT_SLOT(slotRecorded(const TQString &)));
+ connect(_recorder, TQ_SIGNAL(recorded(const TQString &)),
+ this, TQ_SLOT(slotRecorded(const TQString &)));
TQHBox *hBox = new TQHBox(this, "hbox");
@@ -62,8 +62,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
hBox->setStretchFactor(spacer, 1);
_resetButton = new TQPushButton(i18n("&Reset"), hBox, "resetButton");
- connect(_resetButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotResetClicked()));
+ connect(_resetButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotResetClicked()));
diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h
index 306710c0e..5b498577c 100644
--- a/khotkeys/kcontrol/gesturerecordpage.h
+++ b/khotkeys/kcontrol/gesturerecordpage.h
@@ -28,7 +28,7 @@ class GestureRecorder;
class GestureRecordPage : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
GestureRecordPage(const TQString &gesture,
diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp
index 8585fedbc..200fa6b97 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.cpp
+++ b/khotkeys/kcontrol/gestures_settings_tab.cpp
@@ -39,12 +39,12 @@ Gestures_settings_tab::Gestures_settings_tab( TQWidget* parent_P, const char* na
mouse_button_combo->insertItem( i18n( "Button 8 (if available)" ), 6 );
mouse_button_combo->insertItem( i18n( "Button 9 (if available)" ), 7 );
// KHotKeys::Module::changed()
- connect( mouse_gestures_globally, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( mouse_button_combo, TQT_SIGNAL( activated( int )),
- module, TQT_SLOT( changed()));
- connect( timeout_input, TQT_SIGNAL( valueChanged( int )),
- module, TQT_SLOT( changed()));
+ connect( mouse_gestures_globally, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( mouse_button_combo, TQ_SIGNAL( activated( int )),
+ module, TQ_SLOT( changed()));
+ connect( timeout_input, TQ_SIGNAL( valueChanged( int )),
+ module, TQ_SLOT( changed()));
}
void Gestures_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/gestures_settings_tab.h b/khotkeys/kcontrol/gestures_settings_tab.h
index 813209439..bf4b2611b 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.h
+++ b/khotkeys/kcontrol/gestures_settings_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
class Gestures_settings_tab
: public Gestures_settings_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Gestures_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
void read_data();
diff --git a/khotkeys/kcontrol/info_tab.h b/khotkeys/kcontrol/info_tab.h
index 32212ae98..451f58514 100644
--- a/khotkeys/kcontrol/info_tab.h
+++ b/khotkeys/kcontrol/info_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
class Info_tab
: public Info_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Info_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
public slots:
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
deleted file mode 100644
index 9b34b2686..000000000
--- a/khotkeys/kcontrol/init.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-
- KHotKeys
-
- Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
-
- Distributed under the terms of the GNU General Public License version 2.
-
-****************************************************************************/
-
-#define _INIT_CPP_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dcopref.h>
-#include <tdeapplication.h>
-#include <tdeconfig.h>
-#include <kdebug.h>
-#include <stdlib.h>
-
-extern "C"
-{
- KDE_EXPORT void init_khotkeys()
- {
- TDEConfig cfg( "khotkeysrc", true );
- cfg.setGroup( "Main" );
- if( !cfg.readBoolEntry( "Autostart", false ))
- return;
- // Non-xinerama multhead support in KDE is just a hack
- // involving forking apps per-screen. Don't bother with
- // kded modules in such case.
- TQCString multiHead = getenv("TDE_MULTIHEAD");
- if (multiHead.lower() == "true")
- kapp->tdeinitExec( "khotkeys" );
- else
- {
- DCOPRef ref( "kded", "kded" );
- if( !ref.call( "loadModule", TQCString( "khotkeys" )))
- {
- kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl;
- kapp->tdeinitExec( "khotkeys" );
- }
- }
- }
-}
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 85dbaaaa8..80c50d56c 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <tdemessagebox.h>
#include <tdeglobal.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdefiledialog.h>
#include <dcopref.h>
#include <klibloader.h>
@@ -48,7 +48,7 @@
extern "C"
{
- KDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
+ TDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
{
// sleep( 20 ); // CHECKME DEBUG
TDEGlobal::locale()->insertCatalogue("khotkeys");
@@ -67,7 +67,7 @@ Module::Module( TQWidget* parent_P, const char* )
{
setButtons( Help | Cancel | Apply | Ok );
module = this;
- init_global_data( false, TQT_TQOBJECT(this) ); // don't grab keys
+ init_global_data( false, this ); // don't grab keys
init_arts();
TQVBoxLayout* vbox = new TQVBoxLayout( this );
vbox->setSpacing( 6 );
@@ -78,12 +78,12 @@ Module::Module( TQWidget* parent_P, const char* )
vbox->addWidget( splt );
buttons_widget = new Main_buttons_widget( this );
vbox->addWidget( buttons_widget );
- connect( actions_listview_widget, TQT_SIGNAL( current_action_changed()),
- TQT_SLOT( listview_current_action_changed()));
- connect( buttons_widget, TQT_SIGNAL( new_action_pressed()), TQT_SLOT( new_action()));
- connect( buttons_widget, TQT_SIGNAL( new_action_group_pressed()), TQT_SLOT( new_action_group()));
- connect( buttons_widget, TQT_SIGNAL( delete_action_pressed()), TQT_SLOT( delete_action()));
- connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings()));
+ connect( actions_listview_widget, TQ_SIGNAL( current_action_changed()),
+ TQ_SLOT( listview_current_action_changed()));
+ connect( buttons_widget, TQ_SIGNAL( new_action_pressed()), TQ_SLOT( new_action()));
+ connect( buttons_widget, TQ_SIGNAL( new_action_group_pressed()), TQ_SLOT( new_action_group()));
+ connect( buttons_widget, TQ_SIGNAL( delete_action_pressed()), TQ_SLOT( delete_action()));
+ connect( buttons_widget, TQ_SIGNAL( global_settings_pressed()), TQ_SLOT( global_settings()));
// listview_current_action_changed(); // init
TDEAboutData* about = new TDEAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION,
@@ -122,24 +122,33 @@ void Module::save()
tab_widget->save_current_action_changes();
settings.actions = _actions_root;
settings.write_settings();
- if( daemon_disabled())
+ if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{
+ // khotkeys running as a standalone application
TQByteArray data;
- kapp->dcopClient()->send( "khotkeys*", "khotkeys", "quit()", data );
- kdDebug( 1217 ) << "disabling khotkeys daemon" << endl;
+ kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
+ tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
}
else
{
- if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
+ TQCString replyType;
+ TQByteArray replyData;
+ if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
+ TQByteArray(), replyType, replyData))
{
- kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
- TDEApplication::tdeinitExec( "khotkeys" );
- }
- else
- {
- TQByteArray data;
- kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
- kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
+ if (replyType == "QCStringList")
+ {
+ TQDataStream reply(replyData, IO_ReadOnly);
+ QCStringList modules;
+ reply >> modules;
+ if (modules.contains("khotkeys"))
+ {
+ // khotkeys running as a kded service
+ TQByteArray data;
+ kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
+ tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
+ }
+ }
}
}
emit TDECModule::changed( false );
@@ -276,7 +285,7 @@ void Module::import()
i18n( "Select File with Actions to Be Imported" ));
if( file.isEmpty())
return;
- KSimpleConfig cfg( file, true );
+ TDESimpleConfig cfg( file, true );
if( !settings.import( cfg, true ))
{
KMessageBox::error( topLevelWidget(),
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index 2fffc2b16..46e28ecd9 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -30,7 +30,7 @@ class Main_buttons_widget;
class Module
: public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
Module( TQWidget *parent_P, const char *name_P );
virtual ~Module();
@@ -51,8 +51,6 @@ class Module
int gesture_timeout() const;
void set_gestures_exclude( Windowdef_list* windows );
const Windowdef_list* gestures_exclude() const;
- void set_daemon_disabled( bool disable );
- bool daemon_disabled() const;
void import();
TDEShortcut voice_shortcut() const;
void set_voice_shortcut( const TDEShortcut&) ;
@@ -140,19 +138,6 @@ const Windowdef_list* Module::gestures_exclude() const
}
inline
-void Module::set_daemon_disabled( bool disabled_P )
- {
- settings.daemon_disabled = disabled_P;
- }
-
-inline
-bool Module::daemon_disabled() const
- {
- return settings.daemon_disabled;
- }
-
-
-inline
void Module::set_voice_shortcut( const TDEShortcut& cut)
{
settings.voice_shortcut=cut;
diff --git a/khotkeys/kcontrol/keyboard_input_widget.cpp b/khotkeys/kcontrol/keyboard_input_widget.cpp
index 4d5727482..a518fa02d 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.cpp
+++ b/khotkeys/kcontrol/keyboard_input_widget.cpp
@@ -36,16 +36,16 @@ Keyboard_input_widget::Keyboard_input_widget( TQWidget* parent_P, const char* na
{
clear_data();
// KHotKeys::Module::changed()
- connect( action_window_radio, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( active_window_radio, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( specific_window_radio, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( keyboard_input_multilineedit, TQT_SIGNAL( textChanged()),
- module, TQT_SLOT( changed()));
- connect( modify_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
+ connect( action_window_radio, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( active_window_radio, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( specific_window_radio, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( keyboard_input_multilineedit, TQ_SIGNAL( textChanged()),
+ module, TQ_SLOT( changed()));
+ connect( modify_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
}
void Keyboard_input_widget::clear_data()
diff --git a/khotkeys/kcontrol/keyboard_input_widget.h b/khotkeys/kcontrol/keyboard_input_widget.h
index 32690f44e..1d1a141bd 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.h
+++ b/khotkeys/kcontrol/keyboard_input_widget.h
@@ -22,7 +22,7 @@ class Action_data;
class Keyboard_input_widget
: public Keyboard_input_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Keyboard_input_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Keyboard_input_action* data_P );
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index 4394e36b6..d9e0c5af2 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -5,8 +5,7 @@ Type=Application
X-DocPath=kcontrol/khotkeys/index.html
X-TDE-ModuleType=Library
X-TDE-Library=khotkeys
-X-TDE-Init-Library=khotkeys_init
-X-TDE-Init=khotkeys
+X-TDE-StartupNotify=false
Categories=Qt;TDE;X-TDE-settings-accessibility;
Name=Input Actions
diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp
index 3532cc13f..4a1e258b5 100644
--- a/khotkeys/kcontrol/main_buttons_widget.cpp
+++ b/khotkeys/kcontrol/main_buttons_widget.cpp
@@ -26,18 +26,18 @@ namespace KHotKeys
Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P )
: Main_buttons_widget_ui( parent_P, name_P )
{
- connect( new_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_pressed()));
- connect( new_action_group_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_group_pressed()));
- connect( delete_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( delete_action_pressed()));
- connect( global_settings_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( global_settings_pressed()));
+ connect( new_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_pressed()));
+ connect( new_action_group_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_group_pressed()));
+ connect( delete_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( delete_action_pressed()));
+ connect( global_settings_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( global_settings_pressed()));
enable_delete( false );
// KHotKeys::Module::changed()
- connect( new_action_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( new_action_group_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( delete_action_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
+ connect( new_action_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( new_action_group_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( delete_action_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why
}
diff --git a/khotkeys/kcontrol/main_buttons_widget.h b/khotkeys/kcontrol/main_buttons_widget.h
index e4410d9d0..ce08570bf 100644
--- a/khotkeys/kcontrol/main_buttons_widget.h
+++ b/khotkeys/kcontrol/main_buttons_widget.h
@@ -19,7 +19,7 @@ namespace KHotKeys
class Main_buttons_widget
: public Main_buttons_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Main_buttons_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void enable_delete( bool enable_P );
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 08b8a3c22..12191ff63 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -189,18 +189,36 @@ 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" ))
{
- kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
- TDEApplication::tdeinitExec( "khotkeys" );
+ // khotkeys running as a standalone application
+ TQByteArray data;
+ kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
+ tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
}
else
{
- TQByteArray data;
- kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
- kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
+ TQCString replyType;
+ TQByteArray replyData;
+ if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
+ TQByteArray(), replyType, replyData))
+ {
+ if (replyType == "QCStringList")
+ {
+ TQDataStream reply(replyData, IO_ReadOnly);
+ QCStringList modules;
+ reply >> modules;
+ if (modules.contains("khotkeys"))
+ {
+ // khotkeys running as a kded service
+ TQByteArray data;
+ kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
+ tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
+ }
+ }
+ }
}
}
@@ -303,7 +321,6 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
return "";
}
entry->reparent( khotkeys_get_menu_root( settings.actions ));
- settings.daemon_disabled = false; // #91782
settings.write_settings();
khotkeys_send_reread_config();
return shortcut;
diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h
index f7aa43436..776076e1d 100644
--- a/khotkeys/kcontrol/menuedit.h
+++ b/khotkeys/kcontrol/menuedit.h
@@ -21,24 +21,24 @@ extern "C"
{
// initializes khotkeys DSO - loads i18n catalogue
// handled automatically by KHotKeys wrapper class in kmenuedit
-KDE_EXPORT void khotkeys_init( void );
+TDE_EXPORT void khotkeys_init( void );
// clean up khotkeys DSO
// handled automatically by KHotKeys wrapper class in kmenuedit
-KDE_EXPORT void khotkeys_cleanup( void );
+TDE_EXPORT void khotkeys_cleanup( void );
// return keyboard shortcut ( e.g. "ALT+T" ) for given menu entry ( e.g.
// "System/Konsole.desktop"
-KDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P );
+TDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P );
// changes assigned shortcut to menu entry a updates config file
-KDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
+TDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
const TQString& shortcut_P );
// menu entry was moved in TDE Menu
-KDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P );
+TDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P );
// menu entry was removed
-KDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P );
+TDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P );
// List of all hotkeys in use
-KDE_EXPORT TQStringList khotkeys_get_all_shortcuts( );
+TDE_EXPORT TQStringList khotkeys_get_all_shortcuts( );
// Find menu entry that uses shortcut
-KDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P );
+TDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P );
} // extern "C"
#endif
diff --git a/khotkeys/kcontrol/menuentry_widget.cpp b/khotkeys/kcontrol/menuentry_widget.cpp
index 9b313d20d..8fac287b8 100644
--- a/khotkeys/kcontrol/menuentry_widget.cpp
+++ b/khotkeys/kcontrol/menuentry_widget.cpp
@@ -37,8 +37,8 @@ Menuentry_widget::Menuentry_widget( TQWidget* parent_P, const char* name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( menuentry_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect( menuentry_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
}
void Menuentry_widget::clear_data()
diff --git a/khotkeys/kcontrol/menuentry_widget.h b/khotkeys/kcontrol/menuentry_widget.h
index f4b61677d..c9cc8e36c 100644
--- a/khotkeys/kcontrol/menuentry_widget.h
+++ b/khotkeys/kcontrol/menuentry_widget.h
@@ -22,7 +22,7 @@ class Action_data;
class Menuentry_widget
: public Menuentry_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Menuentry_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Menuentry_action* data_P );
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index d3ca4afbe..9f9bba39c 100644
--- a/khotkeys/kcontrol/tab_widget.cpp
+++ b/khotkeys/kcontrol/tab_widget.cpp
@@ -59,8 +59,8 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P )
pages[ TAB_GESTURES_SETTINGS ] = new Gestures_settings_tab;
General_tab* general_tab;
pages[ TAB_GENERAL ] = general_tab = new General_tab;
- connect( general_tab, TQT_SIGNAL( action_type_changed( int )),
- TQT_SLOT( set_action_type_slot( int )));
+ connect( general_tab, TQ_SIGNAL( action_type_changed( int )),
+ TQ_SLOT( set_action_type_slot( int )));
pages[ TAB_GROUP_GENERAL ] = new Action_group_tab;
pages[ TAB_CONDITIONS ] = new Condition_list_tab;
pages[ TAB_ACTIONS ] = new Action_list_tab;
@@ -76,7 +76,7 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P )
for( tab_pos_t i = TAB_FIRST;
i < TAB_END;
++i )
- connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+ connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
#ifdef HAVE_ARTS
if( haveArts())
show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
@@ -103,7 +103,6 @@ void Tab_widget::save_current_action_changes()
if( current_type == NONE ) // info, global settings
{
static_cast< Gestures_settings_tab* >( pages[ TAB_GESTURES_SETTINGS ] )->write_data(); // saves
- static_cast< General_settings_tab* >( pages[ TAB_GENERAL_SETTINGS ] )->write_data(); // saves
static_cast< Voice_settings_tab* >( pages[ TAB_VOICE_SETTINGS ] )->write_data(); // saves
}
else if( current_type == GROUP )
@@ -235,7 +234,6 @@ void Tab_widget::load_current_action()
{
static_cast< Gestures_settings_tab* >( pages[ TAB_GESTURES_SETTINGS ] )->read_data(); // loads
static_cast< Voice_settings_tab* >( pages[ TAB_VOICE_SETTINGS ] )->read_data(); // loads
- static_cast< General_settings_tab* >( pages[ TAB_GENERAL_SETTINGS ] )->read_data(); // loads
}
else if( current_type == GROUP )
{
@@ -441,18 +439,18 @@ void Tab_widget::show_pages( const Pages_set& pages_P )
{
removePage( pages[ i ] );
if( pages_P.is_set( i )) // don't clear page contents if it stays visible
- disconnect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+ disconnect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
}
clear_pages();
// reconnect all pages to this signal
- disconnect( this, TQT_SIGNAL( clear_pages_signal()), NULL, NULL );
+ disconnect( this, TQ_SIGNAL( clear_pages_signal()), NULL, NULL );
for( tab_pos_t i = TAB_FIRST;
i < TAB_END;
++i )
{
if( pages_P.is_set( i ))
addTab( pages[ i ], i18n( tab_labels[ i ] ));
- connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+ connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
}
show();
}
diff --git a/khotkeys/kcontrol/tab_widget.h b/khotkeys/kcontrol/tab_widget.h
index 81fb9e4ad..1439864f1 100644
--- a/khotkeys/kcontrol/tab_widget.h
+++ b/khotkeys/kcontrol/tab_widget.h
@@ -21,7 +21,7 @@ namespace KHotKeys
class Tab_widget
: public TQTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum action_type_t
{
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index d4f7ff9d3..d3773c3f3 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -55,9 +55,9 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
if( haveArts())
popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER );
#endif
- connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
- connect( triggers_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
- this, TQT_SLOT( modify_pressed() ) );
+ connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
+ connect( triggers_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQ_SLOT( modify_pressed() ) );
new_button->setPopup( popup );
copy_button->setEnabled( false );
@@ -69,16 +69,16 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
triggers_listview->setForceSelect( true );
clear_data();
// KHotKeys::Module::changed()
- connect( new_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( copy_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( modify_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( delete_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect( new_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( copy_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( modify_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( delete_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
}
Triggers_tab::~Triggers_tab()
@@ -227,11 +227,11 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
lay->addWidget( lbl );
lay->addSpacing( 10 );
bt = new KKeyButton( this );
- lay->addWidget( bt, 0 , Qt::AlignHCenter );
+ lay->addWidget( bt, 0 , TQt::AlignHCenter );
lay->addStretch();
clear_data();
- connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )),
- this, TQT_SLOT( capturedShortcut( const TDEShortcut& )));
+ connect( bt, TQ_SIGNAL( capturedShortcut( const TDEShortcut& )),
+ this, TQ_SLOT( capturedShortcut( const TDEShortcut& )));
}
void Shortcut_trigger_widget::clear_data()
@@ -320,8 +320,8 @@ Gesture_trigger_dialog::Gesture_trigger_dialog( Gesture_trigger* trigger_P )
_page = new GestureRecordPage( _trigger->gesturecode(),
this, "GestureRecordPage");
- connect(_page, TQT_SIGNAL(gestureRecorded(bool)),
- this, TQT_SLOT(enableButtonOK(bool)));
+ connect(_page, TQ_SIGNAL(gestureRecorded(bool)),
+ this, TQ_SLOT(enableButtonOK(bool)));
setMainWidget( _page );
}
@@ -343,7 +343,7 @@ _trigger( trigger_P ), _page( NULL )
{
_page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : TQString::null , this, "VoiceRecordPage");
- connect(_page, TQT_SIGNAL(voiceRecorded(bool)), this, TQT_SLOT(enableButtonOK(bool)));
+ connect(_page, TQ_SIGNAL(voiceRecorded(bool)), this, TQ_SLOT(enableButtonOK(bool)));
setMainWidget( _page );
}
diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h
index c4d6160fe..dc99bda5c 100644
--- a/khotkeys/kcontrol/triggers_tab.h
+++ b/khotkeys/kcontrol/triggers_tab.h
@@ -35,7 +35,7 @@ class KHotKeysShortcutList;
class Triggers_tab
: public Triggers_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Triggers_tab();
@@ -82,7 +82,7 @@ class Trigger_dialog
class Shortcut_trigger_widget
: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
Shortcut_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Shortcut_trigger* trigger_P );
@@ -100,7 +100,7 @@ typedef Shortcut_trigger_widget Shortcut_trigger_tab;
class Shortcut_trigger_dialog
: public KDialogBase, public Trigger_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Shortcut_trigger_dialog( Shortcut_trigger* trigger_P );
virtual Trigger* edit_trigger();
@@ -113,7 +113,7 @@ class Shortcut_trigger_dialog
class Window_trigger_dialog
: public KDialogBase, public Trigger_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Window_trigger_dialog( Window_trigger* trigger_P );
virtual Trigger* edit_trigger();
@@ -128,7 +128,7 @@ class GestureRecordPage;
class Gesture_trigger_dialog
: public KDialogBase, public Trigger_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Gesture_trigger_dialog( Gesture_trigger* trigger_P );
virtual Trigger* edit_trigger();
@@ -144,7 +144,7 @@ class VoiceRecordPage;
class Voice_trigger_dialog
: public KDialogBase, public Trigger_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Voice_trigger_dialog( Voice_trigger* trigger_P );
virtual Trigger* edit_trigger();
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index 69d51ef55..5e56226a9 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -98,9 +98,9 @@
</widget>
</vbox>
</widget>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">action_group_name_changed( const TQString&amp; )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">ktextedit.h</include>
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index 2895e5752..12537d770 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -185,14 +185,14 @@
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
<slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
<slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index 5a285b32e..375ae4138 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -50,9 +50,9 @@
</widget>
</vbox>
</widget>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index 269b889ce..98b13c653 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -184,14 +184,14 @@
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
<slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
<slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
index feeae535d..a9dc2e8c6 100644
--- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
@@ -261,10 +261,10 @@
<tabstop>try_button</tabstop>
<tabstop>PushButton1</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">run_kdcop_pressed()</slot>
<slot access="protected" specifier="pure virtual">try_pressed()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
index 9dc10309e..e119c8512 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -16,14 +16,6 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQCheckBox">
- <property name="name">
- <cstring>disable_daemon_checkbox</cstring>
- </property>
- <property name="text">
- <string>Disable KHotKeys daemon</string>
- </property>
- </widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout1</cstring>
@@ -107,9 +99,9 @@
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">kpushbutton.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">import_clicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index 9deef2245..b422d09cc 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -133,10 +133,10 @@
</widget>
</vbox>
</widget>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">action_name_changed( const TQString&amp; )</slot>
<slot access="protected" specifier="pure virtual">action_type_changed(int)</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">ktextedit.h</include>
diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
index 068806a02..c848ef4fe 100644
--- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
@@ -506,11 +506,11 @@
<slot>edit_gesture_pressed3()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">edit_gesture_pressed1()</slot>
<slot access="protected" specifier="pure virtual">edit_gesture_pressed2()</slot>
<slot access="protected" specifier="pure virtual">edit_gesture_pressed3()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
index 521e44f46..ff00fbf6e 100644
--- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
@@ -183,9 +183,9 @@
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">ktextedit.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
index 6af0aefc6..a24d36665 100644
--- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
@@ -89,9 +89,9 @@
<slot>browse_pressed()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
index 557be7dd4..e1d110522 100644
--- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
@@ -157,12 +157,12 @@
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
index bcd113c57..8ccb8a9e2 100644
--- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
@@ -90,11 +90,11 @@
<slot>slotPlayPressed()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">slotRecordPressed()</slot>
<slot access="protected" specifier="pure virtual">slotPlayPressed()</slot>
<slot access="protected" specifier="pure virtual">slotStopPressed()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
index aaa52e891..78a106a81 100644
--- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
@@ -156,12 +156,12 @@
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
index d15dab5df..a21633852 100644
--- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
@@ -480,11 +480,11 @@
<tabstop>window_role_lineedit</tabstop>
<tabstop>autodetect_button</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">window_class_combo_changed(int)</slot>
<slot access="protected" specifier="pure virtual">window_role_combo_changed(int)</slot>
<slot access="protected" specifier="pure virtual">window_title_combo_changed(int)</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp
index 1d97d69ab..952cc0dbe 100644
--- a/khotkeys/kcontrol/voice_settings_tab.cpp
+++ b/khotkeys/kcontrol/voice_settings_tab.cpp
@@ -26,7 +26,7 @@ namespace KHotKeys
Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P )
: Voice_settings_tab_ui( parent_P, name_P )
{
- connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& )));
+ connect( keyButton , TQ_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQ_SLOT(slotCapturedKey( const TDEShortcut& )));
}
void Voice_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h
index c59a911a2..57b5905c5 100644
--- a/khotkeys/kcontrol/voice_settings_tab.h
+++ b/khotkeys/kcontrol/voice_settings_tab.h
@@ -21,7 +21,7 @@ namespace KHotKeys
class Voice_settings_tab
: public Voice_settings_tab_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Voice_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
void read_data();
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index fc231a82c..daef922c9 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -24,7 +24,7 @@
#include <tqpainter.h>
#include <tdemessagebox.h>
#include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -46,13 +46,13 @@ bool VoiceRecorder::init( KLibrary* lib )
}
VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name)
- : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(TQT_TQOBJECT(this))) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId)
+ : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId)
{
_sound=sound_P;
buttonPlay->setEnabled(sound_P.size() > 50);
buttonStop->setEnabled(false);
- connect (_recorder , TQT_SIGNAL(recorded(const Sound& )) , this , TQT_SLOT(slotSoundRecorded(const Sound& ) ));
+ connect (_recorder , TQ_SIGNAL(recorded(const Sound& )) , this , TQ_SLOT(slotSoundRecorded(const Sound& ) ));
//if(voiceid_P.isEmpty())
emit recorded(false);
@@ -168,7 +168,7 @@ bool VoiceRecorder::drawSound()
uint lx=0;
uint ly=height/2;
- /*** DRAW THE TQT_SIGNAL ******/
+ /*** DRAW THE TQ_SIGNAL ******/
for(uint f=1; f<length; f++)
{
uint nx=f*width/length;
diff --git a/khotkeys/kcontrol/voicerecorder.h b/khotkeys/kcontrol/voicerecorder.h
index 30d03acdc..6edb20f37 100644
--- a/khotkeys/kcontrol/voicerecorder.h
+++ b/khotkeys/kcontrol/voicerecorder.h
@@ -30,7 +30,7 @@ namespace KHotKeys
class VoiceRecorder : public Voice_input_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index 1c7f8c938..d34ef7fad 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -12,7 +12,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <klineedit.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
@@ -59,9 +59,9 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c
setStretchFactor(spacer, 1);
- connect(_recorder1, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
- connect(_recorder2, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
- connect(_lineEdit , TQT_SIGNAL( textChanged (const TQString&)) , this , TQT_SLOT(slotChanged()));
+ connect(_recorder1, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged()));
+ connect(_recorder2, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged()));
+ connect(_lineEdit , TQ_SIGNAL( textChanged (const TQString&)) , this , TQ_SLOT(slotChanged()));
}
diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h
index 9cb934b61..970ccf83b 100644
--- a/khotkeys/kcontrol/voicerecordpage.h
+++ b/khotkeys/kcontrol/voicerecordpage.h
@@ -31,7 +31,7 @@ class VoiceSignature;
class VoiceRecordPage : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
VoiceRecordPage(const TQString &voiceip_P, TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/waiting_widget.cpp b/khotkeys/kcontrol/waiting_widget.cpp
index 6f1c0c657..135261e30 100644
--- a/khotkeys/kcontrol/waiting_widget.cpp
+++ b/khotkeys/kcontrol/waiting_widget.cpp
@@ -33,8 +33,8 @@ Waiting_widget::Waiting_widget( TQWidget* parent_P, const char* name_P )
: Waiting_widget_ui( parent_P, name_P )
{
// KHotKeys::Module::changed()
- connect(waiting_spinbox, TQT_SIGNAL(valueChanged(int)),
- module, TQT_SLOT(changed()));
+ connect(waiting_spinbox, TQ_SIGNAL(valueChanged(int)),
+ module, TQ_SLOT(changed()));
}
void Waiting_widget::set_data( const Waiting_action* data_P )
diff --git a/khotkeys/kcontrol/waiting_widget.h b/khotkeys/kcontrol/waiting_widget.h
index 520e7742e..a339e2b98 100644
--- a/khotkeys/kcontrol/waiting_widget.h
+++ b/khotkeys/kcontrol/waiting_widget.h
@@ -22,7 +22,7 @@ class Action_data;
class Waiting_widget
: public Waiting_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Waiting_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Waiting_action* data_P );
diff --git a/khotkeys/kcontrol/window_trigger_widget.cpp b/khotkeys/kcontrol/window_trigger_widget.cpp
index c897cf14a..ad8871504 100644
--- a/khotkeys/kcontrol/window_trigger_widget.cpp
+++ b/khotkeys/kcontrol/window_trigger_widget.cpp
@@ -33,14 +33,14 @@ Window_trigger_widget::Window_trigger_widget( TQWidget* parent_P, const char* na
{
clear_data();
// KHotKeys::Module::changed()
- connect( window_appears_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( window_disappears_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( window_activates_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( window_deactivates_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
+ connect( window_appears_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( window_disappears_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( window_activates_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( window_deactivates_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
}
void Window_trigger_widget::clear_data()
diff --git a/khotkeys/kcontrol/window_trigger_widget.h b/khotkeys/kcontrol/window_trigger_widget.h
index c012a0bca..60efdf317 100644
--- a/khotkeys/kcontrol/window_trigger_widget.h
+++ b/khotkeys/kcontrol/window_trigger_widget.h
@@ -22,7 +22,7 @@ class Action_data;
class Window_trigger_widget
: public Window_trigger_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Window_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Window_trigger* trigger_P );
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index dc16d780f..b36e46e0d 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -43,10 +43,10 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na
{
TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work
popup->insertItem( i18n( "Simple Window..." ), TYPE_WINDOWDEF_SIMPLE );
- connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+ connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
- connect( windows_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
- this, TQT_SLOT( modify_pressed() ) );
+ connect( windows_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQ_SLOT( modify_pressed() ) );
new_button->setPopup( popup );
windows_listview->header()->hide();
windows_listview->addColumn( "" );
@@ -57,16 +57,16 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na
delete_button->setEnabled( false );
clear_data();
// KHotKeys::Module::changed()
- connect( new_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( copy_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( modify_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( delete_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect( new_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( copy_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( modify_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( delete_button, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
}
Windowdef_list_widget::~Windowdef_list_widget()
diff --git a/khotkeys/kcontrol/windowdef_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h
index 6e923c902..972bbdb05 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.h
+++ b/khotkeys/kcontrol/windowdef_list_widget.h
@@ -30,7 +30,7 @@ class Windowdef_list_item;
class Windowdef_list_widget
: public Windowdef_list_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Windowdef_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Windowdef_list_widget();
@@ -84,7 +84,7 @@ class Windowdef_dialog
class Windowdef_simple_dialog
: public KDialogBase, public Windowdef_dialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P, const char* slot_P );
virtual Windowdef* edit_windowdef();
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp
index e0a6671e7..381287166 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp
@@ -37,31 +37,31 @@ Windowdef_simple_widget::Windowdef_simple_widget( TQWidget* parent_P, const char
window_title_lineedit->setEnabled( false );
window_class_lineedit->setEnabled( false );
window_role_lineedit->setEnabled( false );
- connect( autodetect_button, TQT_SIGNAL( clicked()), TQT_SLOT( autodetect_clicked()));
+ connect( autodetect_button, TQ_SIGNAL( clicked()), TQ_SLOT( autodetect_clicked()));
clear_data();
// KHotKeys::Module::changed()
- connect( window_title_combo, TQT_SIGNAL( activated( int )),
- module, TQT_SLOT( changed()));
- connect( window_title_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( window_class_combo, TQT_SIGNAL( activated( int )),
- module, TQT_SLOT( changed()));
- connect( window_class_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( window_role_combo, TQT_SIGNAL( activated( int )),
- module, TQT_SLOT( changed()));
- connect( window_role_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
- connect( type_normal_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( type_dialog_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( type_dock_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( type_desktop_checkbox, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect( window_title_combo, TQ_SIGNAL( activated( int )),
+ module, TQ_SLOT( changed()));
+ connect( window_title_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( window_class_combo, TQ_SIGNAL( activated( int )),
+ module, TQ_SLOT( changed()));
+ connect( window_class_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( window_role_combo, TQ_SIGNAL( activated( int )),
+ module, TQ_SLOT( changed()));
+ connect( window_role_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
+ connect( type_normal_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( type_dialog_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( type_dock_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( type_desktop_checkbox, TQ_SIGNAL( clicked()),
+ module, TQ_SLOT( changed()));
+ connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+ module, TQ_SLOT( changed()));
}
void Windowdef_simple_widget::clear_data()
@@ -144,9 +144,9 @@ void Windowdef_simple_widget::window_title_combo_changed( int item_P )
void Windowdef_simple_widget::set_autodetect( TQObject* obj_P, const char* slot_P )
{
- disconnect( TQT_SIGNAL( autodetect_signal()));
+ disconnect( TQ_SIGNAL( autodetect_signal()));
if( obj_P != NULL )
- connect( this, TQT_SIGNAL( autodetect_signal()), obj_P, slot_P );
+ connect( this, TQ_SIGNAL( autodetect_signal()), obj_P, slot_P );
}
void Windowdef_simple_widget::autodetect_clicked()
@@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked()
void Windowdef_simple_widget::autodetect()
{
- WindowSelector* sel = new WindowSelector( TQT_TQOBJECT(this), TQT_SLOT( autodetect_window_selected( WId )));
+ WindowSelector* sel = new WindowSelector( this, TQ_SLOT( autodetect_window_selected( WId )));
sel->select();
}
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.h b/khotkeys/kcontrol/windowdef_simple_widget.h
index 26db6fd87..0c21d3b2d 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.h
+++ b/khotkeys/kcontrol/windowdef_simple_widget.h
@@ -22,7 +22,7 @@ class Windowdef_list_item;
class Windowdef_simple_widget
: public Windowdef_simple_widget_ui
{
- Q_OBJECT
+ TQ_OBJECT
public:
Windowdef_simple_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Windowdef_simple* data_P );
diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index d1cbe8f5f..0b3389fbe 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -29,20 +29,20 @@ namespace KHotKeys
WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
{
- connect( this, TQT_SIGNAL( selected_signal( WId )), receiver_P, slot_P );
+ connect( this, TQ_SIGNAL( selected_signal( WId )), receiver_P, slot_P );
}
void WindowSelector::select()
{
- kapp->desktop()->grabMouse( TQCursor( tqcrossCursor ));
- kapp->installX11EventFilter( TQT_TQWIDGET(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/kcontrol/windowselector.h b/khotkeys/kcontrol/windowselector.h
index 4f52312ea..0abb41811 100644
--- a/khotkeys/kcontrol/windowselector.h
+++ b/khotkeys/kcontrol/windowselector.h
@@ -17,9 +17,9 @@ namespace KHotKeys
{
class WindowSelector
- : public QWidget
+ : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
WindowSelector( TQObject* receiver, const char* slot );
void select();