Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a4241b7911d2e0b36edfb02f616b8b282050c0ec)

34 files changed, 236 insertions, 236 deletions

diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp
index 0fdc48ab9..22732fa97 100644
--- a/khotkeys/arts/soundrecorder_arts.cpp
+++ b/khotkeys/arts/soundrecorder_arts.cpp
@@ -61,7 +61,7 @@ SoundRecorderArts::SoundRecorderArts(TQObject *parent, const char *name)
         ( void ) check;
 
 	m_recStream->usePolling( false );
-	connect( m_recStream, TQT_SIGNAL(data (TQByteArray &)), this, TQT_SLOT(slotDataReceived(TQByteArray& )));
+	connect( m_recStream, TQ_SIGNAL(data (TQByteArray &)), this, TQ_SLOT(slotDataReceived(TQByteArray& )));
 }
 
 SoundRecorderArts::~SoundRecorderArts()
@@ -80,7 +80,7 @@ void SoundRecorderArts::start()
 void SoundRecorderArts::stop()
 {
 	m_recStream->stop();
-	TQTimer::singleShot(400,this,TQT_SLOT(slotEmitSignal()));
+	TQTimer::singleShot(400,this,TQ_SLOT(slotEmitSignal()));
 }
 
 void SoundRecorderArts::abort()
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_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/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/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/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/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/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp
index cf2337446..a0e1e84c7 100644
--- a/khotkeys/kcontrol/general_settings_tab.cpp
+++ b/khotkeys/kcontrol/general_settings_tab.cpp
@@ -27,8 +27,8 @@ General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name
     : General_settings_tab_ui( parent_P, name_P )
     {
     // KHotKeys::Module::changed()
-    connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( disable_daemon_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     }
 
 void General_settings_tab::import_clicked()
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/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/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/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/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index cd394a6e6..48349a65c 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -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,
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/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/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/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index d3ca4afbe..236d755d2 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 ));
@@ -441,18 +441,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/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 947a148b8..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()
@@ -230,8 +230,8 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
     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/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/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index 763e096e8..9af645045 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -52,7 +52,7 @@ VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWi
 	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/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index 1c7f8c938..c450abe44 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -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/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/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/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_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp
index f79d81ea1..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( 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/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index 3202c2241..d5a1f4859 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -29,7 +29,7 @@ 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()
diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp
index b09284b44..1d9f37b9c 100644
--- a/khotkeys/shared/conditions.cpp
+++ b/khotkeys/shared/conditions.cpp
@@ -257,8 +257,8 @@ Active_window_condition::Active_window_condition( TDEConfig& cfg_P, Condition_li
 
 void Active_window_condition::init()
     {
-    connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-        this, TQT_SLOT( active_window_changed( WId )));
+    connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+        this, TQ_SLOT( active_window_changed( WId )));
     }
 
 bool Active_window_condition::match() const
@@ -323,8 +323,8 @@ Existing_window_condition::Existing_window_condition( TDEConfig& cfg_P, Conditio
 
 void Existing_window_condition::init()
     {
-    connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
     }
 
 bool Existing_window_condition::match() const
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 9933ba74f..5777f9a4f 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -49,9 +49,9 @@ Gesture::Gesture( bool /*enabled_P*/, TQObject* parent_P )
     (void) new DeleteObject( this, parent_P );
     assert( gesture_handler == NULL );
     gesture_handler = this;
-    connect( &nostroke_timer, TQT_SIGNAL( timeout()), TQT_SLOT( stroke_timeout()));
-    connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-        TQT_SLOT( active_window_changed( WId )));
+    connect( &nostroke_timer, TQ_SIGNAL( timeout()), TQ_SLOT( stroke_timeout()));
+    connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+        TQ_SLOT( active_window_changed( WId )));
     }
       
 Gesture::~Gesture()
@@ -108,7 +108,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P )
     if( handlers.contains( receiver_P ))
         return;
     handlers[ receiver_P ] = true;
-    connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+    connect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
         receiver_P, slot_P );
     if( handlers.count() == 1 )
         update_grab();
@@ -119,7 +119,7 @@ void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P )
     if( !handlers.contains( receiver_P ))
         return;
     handlers.remove( receiver_P );
-    disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+    disconnect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
         receiver_P, slot_P );
     if( handlers.count() == 0 )
         update_grab();
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 7b9696c7e..96338b055 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -106,12 +106,12 @@ void Kbd::grab_shortcut( const TDEShortcut& shortcut_P )
         // CHECKME ugly ugly hack
         TQString name = ' ' + TQString::number( keycode_P );
         kga->insertItem( "", name, keycode_P );
-        kga->connectItem( name, this, TQT_SLOT( key_slot( int )));
+        kga->connectItem( name, this, TQ_SLOT( key_slot( int )));
 #endif
         TQString name = ' ' + shortcut_P.toStringInternal();
         kga->insert( name, name, TQString::null, shortcut_P, shortcut_P,
-            this, TQT_SLOT( key_slot( TQString )));
-        TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+            this, TQ_SLOT( key_slot( TQString )));
+        TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
         }
     }
     
@@ -129,7 +129,7 @@ void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P )
 #endif
         kga->remove( ' ' + shortcut_P.toStringInternal());
         grabs.remove( shortcut_P );
-        TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+        TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
         }
     }
 
diff --git a/khotkeys/shared/khlistbox.cpp b/khotkeys/shared/khlistbox.cpp
index ff6d96221..f0080d6de 100644
--- a/khotkeys/shared/khlistbox.cpp
+++ b/khotkeys/shared/khlistbox.cpp
@@ -25,15 +25,15 @@ KHListBox::KHListBox( TQWidget* parent_P, const char* name_P )
     : TQListBox( parent_P, name_P ), saved_current_item( NULL ),
         in_clear( false ), force_select( false )
     {
-    connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
-        TQT_SLOT( slot_selection_changed( TQListBoxItem* )));
-    connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
-        TQT_SLOT( slot_current_changed( TQListBoxItem* )));
+    connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* )),
+        TQ_SLOT( slot_selection_changed( TQListBoxItem* )));
+    connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem* )),
+        TQ_SLOT( slot_current_changed( TQListBoxItem* )));
     // CHECKME grrr
-    connect( this, TQT_SIGNAL( selectionChanged()),
-        TQT_SLOT( slot_selection_changed()));
-    connect( &insert_select_timer, TQT_SIGNAL( timeout()),
-        TQT_SLOT( slot_insert_select()));
+    connect( this, TQ_SIGNAL( selectionChanged()),
+        TQ_SLOT( slot_selection_changed()));
+    connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+        TQ_SLOT( slot_insert_select()));
     }
 
 void KHListBox::slot_selection_changed()
diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp
index ae348af33..a9943996a 100644
--- a/khotkeys/shared/khlistview.cpp
+++ b/khotkeys/shared/khlistview.cpp
@@ -25,15 +25,15 @@ KHListView::KHListView( TQWidget* parent_P, const char* name_P )
     : TDEListView( parent_P, name_P ), saved_current_item( NULL ),
         in_clear( false ), ignore( false ), force_select( false )
     {
-    connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )),
-        TQT_SLOT( slot_selection_changed( TQListViewItem* )));
-    connect( this, TQT_SIGNAL( currentChanged( TQListViewItem* )),
-        TQT_SLOT( slot_current_changed( TQListViewItem* )));
+    connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem* )),
+        TQ_SLOT( slot_selection_changed( TQListViewItem* )));
+    connect( this, TQ_SIGNAL( currentChanged( TQListViewItem* )),
+        TQ_SLOT( slot_current_changed( TQListViewItem* )));
     // CHECKME grrr
-    connect( this, TQT_SIGNAL( selectionChanged()),
-        TQT_SLOT( slot_selection_changed()));
-    connect( &insert_select_timer, TQT_SIGNAL( timeout()),
-        TQT_SLOT( slot_insert_select()));
+    connect( this, TQ_SIGNAL( selectionChanged()),
+        TQ_SLOT( slot_selection_changed()));
+    connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+        TQ_SLOT( slot_insert_select()));
     }
 
 void KHListView::slot_selection_changed()
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 5bd8dbe3e..1b6e903b7 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -197,13 +197,13 @@ Window_trigger::~Window_trigger()
 void Window_trigger::init()
     {
     kdDebug( 1217 ) << "Window_trigger::init()" << endl;
-    connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
     if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ ))
-        connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-            this, TQT_SLOT( active_window_changed( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_changed( WId, unsigned int )),
-        this, TQT_SLOT( window_changed( WId, unsigned int )));
+        connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+            this, TQ_SLOT( active_window_changed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_changed( WId, unsigned int )),
+        this, TQ_SLOT( window_changed( WId, unsigned int )));
     }
 
 void Window_trigger::activate( bool activate_P )
@@ -335,7 +335,7 @@ Gesture_trigger::Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P )
 
 Gesture_trigger::~Gesture_trigger()
     {
-    gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+    gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     }
 
 void Gesture_trigger::cfg_write( TDEConfig& cfg_P ) const
@@ -368,9 +368,9 @@ void Gesture_trigger::handle_gesture( const TQString &gesture_P, WId window_P )
 void Gesture_trigger::activate( bool activate_P )
     {
     if( activate_P )
-        gesture_handler->register_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+        gesture_handler->register_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     else
-        gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+        gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     }
 
 
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index a31ac8237..031f75c78 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -95,7 +95,7 @@ void Voice::record_start()
 	if(!_recorder)
 	{
 		_recorder= SoundRecorder::create(this);
-		connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& )));
+		connect(_recorder, TQ_SIGNAL(recorded(const Sound& )), this, TQ_SLOT(slot_sound_recorded(const Sound& )));
 	}
 
 	_recorder->start();
@@ -208,7 +208,7 @@ void Voice::set_shortcut( const TDEShortcut &shortcut)
         _kga = new TDEGlobalAccel( this );	
     _kga->remove("voice");
 
-	_kga->insert( "voice", i18n("Voice"), TQString::null,  shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;
+	_kga->insert( "voice", i18n("Voice"), TQString::null,  shortcut, 0, this, TQ_SLOT(slot_key_pressed())) ;
         _kga->updateConnections();
 }
 
@@ -224,7 +224,7 @@ void Voice::slot_key_pressed()
 		if(!_timer)
 		{
 			_timer=new TQTimer(this);
-			connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout()));
+			connect(_timer, TQ_SIGNAL(timeout()) , this, TQ_SLOT(slot_timeout()));
 		}
 		
 		_timer->start(1000*20,true);
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index 077bf7b1d..e91e41df3 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -45,10 +45,10 @@ Windows::Windows( bool enable_signal_P, TQObject* parent_P )
     windows_handler = this;
     if( signals_enabled )
         {
-        connect( twin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId )));
-        connect( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId )));
-        connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )),
-            TQT_SLOT( active_window_changed_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( window_added_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( windowRemoved( WId )), TQ_SLOT( window_removed_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( activeWindowChanged( WId )),
+            TQ_SLOT( active_window_changed_slot( WId )));
         }
     }