12 files changed, 16 insertions, 16 deletions
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index b32daca1f..95aa7db89 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -42,7 +42,7 @@ namespace KHotKeys
 Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
     : Action_list_widget_ui( parent_P, name_P ), selected_item( NULL )
     {
-    TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+    TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work
     popup->insertItem( i18n( "Command/URL..." ), TYPE_COMMAND_URL_ACTION );
     popup->insertItem( i18n( "K-Menu Entry..." ), TYPE_MENUENTRY_ACTION );
     popup->insertItem( i18n( "DCOP Call..." ), TYPE_DCOP_ACTION );
diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h
index b2d35c693..a5a810aa1 100644
--- a/khotkeys/kcontrol/actions_listview_widget.h
+++ b/khotkeys/kcontrol/actions_listview_widget.h
@@ -17,7 +17,7 @@
 
 #include <actions_listview_widget_ui.h>
 
-class QDragObject;
+class TQDragObject;
 
 namespace KHotKeys
 {
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 0cce085ec..86ff8f47c 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -43,7 +43,7 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
     : Condition_list_widget_ui( parent_P, name_P ), selected_item( NULL )
     {
     conditions.setAutoDelete( true );
-    TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+    TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work
     popup->insertItem( i18n( "Active Window..." ), TYPE_ACTIVE_WINDOW );
     popup->insertItem( i18n( "Existing Window..." ), TYPE_EXISTING_WINDOW );
     popup->insertItem( i18n( "Not_condition", "Not" ), TYPE_NOT );
diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h
index a995a5531..d8ca34a72 100644
--- a/khotkeys/kcontrol/gesturerecorder.h
+++ b/khotkeys/kcontrol/gesturerecorder.h
@@ -17,7 +17,7 @@
 
 #include <gestures.h>
 
-class QMouseEvent;
+class TQMouseEvent;
 
 namespace KHotKeys
 {
diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h
index 1b95b86fe..99242c518 100644
--- a/khotkeys/kcontrol/gesturerecordpage.h
+++ b/khotkeys/kcontrol/gesturerecordpage.h
@@ -16,9 +16,9 @@
 
 #include "gesturedrawer.h"
 
-class QWidget;
-class QPushButton;
-class QLabel;
+class TQWidget;
+class TQPushButton;
+class TQLabel;
 
 namespace KHotKeys
 {
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 78de7dee6..199f59750 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -42,7 +42,7 @@ void khotkeys_init()
     KGlobal::locale()->insertCatalogue("khotkeys");
     // CHECKME hack
     assert( owner == NULL );
-    owner = new QObject;
+    owner = new TQObject;
     init_global_data( false, owner );
     }
 
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 39ff6933f..2533b58a0 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -47,7 +47,7 @@ namespace KHotKeys
 Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
     : Triggers_tab_ui( parent_P, name_P ), selected_item( NULL )
     {
-    TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+    TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work
     popup->insertItem( i18n( "Shortcut Trigger..." ), TYPE_SHORTCUT_TRIGGER );
     popup->insertItem( i18n( "Gesture Trigger..." ), TYPE_GESTURE_TRIGGER );
     popup->insertItem( i18n( "Window Trigger..." ), TYPE_WINDOW_TRIGGER );
diff --git a/khotkeys/kcontrol/voicerecorder.h b/khotkeys/kcontrol/voicerecorder.h
index c1ac57b85..30d03acdc 100644
--- a/khotkeys/kcontrol/voicerecorder.h
+++ b/khotkeys/kcontrol/voicerecorder.h
@@ -16,7 +16,7 @@
 #include <tqmemarray.h>
 
 #include "sound.h"
-class QMouseEvent;
+class TQMouseEvent;
 class  KAudioRecordStream ;
 class KArtsServer;
 class KTempFile;
diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h
index a4a7e4d71..57d585bb9 100644
--- a/khotkeys/kcontrol/voicerecordpage.h
+++ b/khotkeys/kcontrol/voicerecordpage.h
@@ -15,9 +15,9 @@
 
 
 
-class QWidget;
-class QPushButton;
-class QLabel;
+class TQWidget;
+class TQPushButton;
+class TQLabel;
 class KLineEdit;
 
 
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index c0bfb1529..471aab743 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -41,7 +41,7 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na
     : Windowdef_list_widget_ui( parent_P, name_P ), autodetect_object( NULL ),
         autodetect_slot( NULL ), selected_item( NULL )
     {
-    TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+    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 )));
 
diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h
index 9ca469584..53be7c039 100644
--- a/khotkeys/shared/khotkeysglobal.h
+++ b/khotkeys/shared/khotkeysglobal.h
@@ -23,7 +23,7 @@
 #include <klocale.h>
 
 class KConfig;
-class QObject;
+class TQObject;
 
 namespace KHotKeys
 {
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index 89329ba5d..f03d2b040 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -15,7 +15,7 @@
 #include <kshortcut.h>
 
 class Sound;
-class QTimer;
+class TQTimer;
 class KGlobalAccel;
 
 namespace KHotKeys