7 files changed, 14 insertions, 14 deletions
diff --git a/kcontrol/joystick/caldialog.h b/kcontrol/joystick/caldialog.h
index 202296f2b..519e98526 100644
--- a/kcontrol/joystick/caldialog.h
+++ b/kcontrol/joystick/caldialog.h
@@ -31,7 +31,7 @@ class JoyDevice;
 
 class CalDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     CalDialog(TQWidget *parent, JoyDevice *joy);
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index d0521d81e..05e431af9 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY(kcm_joystick, JoystickFactory("joystick"))
 
 extern "C"
 {
-  KDE_EXPORT bool test_joystick()
+  TDE_EXPORT bool test_joystick()
   { /* Code stolen from JoyWidget::init() */
     int i;
     char dev[30];
diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h
index 8ef9e966e..233656537 100644
--- a/kcontrol/joystick/joystick.h
+++ b/kcontrol/joystick/joystick.h
@@ -27,7 +27,7 @@ class JoyWidget;
 
 class joystick: public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     joystick(TQWidget *parent = 0, const char *name = 0, const TQStringList &list = TQStringList());
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index 5d104006b..c88f6d217 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -65,7 +65,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
   new TQLabel(i18n("Device:"), devHbox);
   device = new TQComboBox(true, devHbox);
   device->setInsertionPolicy(TQComboBox::NoInsertion);
-  connect(device, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(deviceChanged(const TQString &)));
+  connect(device, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(deviceChanged(const TQString &)));
   devHbox->setStretchFactor(device, 3);
 
   TQHBox *hbox = new TQHBox(mainVbox);
@@ -77,7 +77,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
   new TQLabel(i18n("Position:"), vboxLeft);
   xyPos = new PosWidget(vboxLeft);
   trace = new TQCheckBox(i18n("Show trace"), mainVbox);
-  connect(trace, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(traceChanged(bool)));
+  connect(trace, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(traceChanged(bool)));
 
   TQVBox *vboxMid = new TQVBox(hbox);
   vboxMid->setSpacing(KDialog::spacingHint());
@@ -111,12 +111,12 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
 
   // calibrate button
   calibrate = new TQPushButton(i18n("Calibrate"), mainVbox);
-  connect(calibrate, TQT_SIGNAL(clicked()), this, TQT_SLOT(calibrateDevice()));
+  connect(calibrate, TQ_SIGNAL(clicked()), this, TQ_SLOT(calibrateDevice()));
   calibrate->setEnabled(false);
 
   // set up a timer for idle processing of joystick events
   idle = new TQTimer(this);
-  connect(idle, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkDevice()));
+  connect(idle, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkDevice()));
 
   // check which devicefiles we have
   init();
diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h
index 45291d275..057a8bd9e 100644
--- a/kcontrol/joystick/joywidget.h
+++ b/kcontrol/joystick/joywidget.h
@@ -37,7 +37,7 @@ class TQHBox;
 // the widget which displays all buttons, values, etc.
 class JoyWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     JoyWidget(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp
index af8609070..5eb249f58 100644
--- a/kcontrol/joystick/poswidget.cpp
+++ b/kcontrol/joystick/poswidget.cpp
@@ -32,7 +32,7 @@ PosWidget::PosWidget(TQWidget *parent, const char *name)
 {
   setMinimumSize(XY_WIDTH, XY_WIDTH);
   setMaximumSize(XY_WIDTH, XY_WIDTH);
-  setPaletteBackgroundColor(Qt::white);
+  setPaletteBackgroundColor(TQt::white);
 }
 
 //-----------------------------------------------------------------
@@ -42,7 +42,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
   TQPainter paint(this);
 
   paint.drawRect(0, 0, width(), height());
-  paint.setPen(Qt::gray);
+  paint.setPen(TQt::gray);
 
   // draw a center grid
   paint.drawLine(XY_WIDTH/2, 1,
@@ -52,7 +52,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
                  XY_WIDTH - 2, XY_WIDTH/2);
 
   // draw the current position marker
-  paint.setPen(Qt::blue);
+  paint.setPen(TQt::blue);
 
   paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
                  x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -111,7 +111,7 @@ void PosWidget::eraseOld()
   //paint.eraseRect(x - MARK_WIDTH/2, y - MARK_WIDTH/2, MARK_WIDTH + 1, MARK_WIDTH + 1);
 
   // erase previous cross (don't use eraseRect() so that trace flags will be not destroyed so much)
-  paint.setPen(Qt::white);
+  paint.setPen(TQt::white);
 
   paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
                  x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -121,7 +121,7 @@ void PosWidget::eraseOld()
 
   if ( trace )  // show previous position with a smaller black cross
   {
-    paint.setPen(Qt::black);
+    paint.setPen(TQt::black);
 
     paint.drawLine(x - 2, y - 2,
                    x + 2, y + 2);
diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h
index 324ee1da2..3ee85a912 100644
--- a/kcontrol/joystick/poswidget.h
+++ b/kcontrol/joystick/poswidget.h
@@ -28,7 +28,7 @@
 */
 class PosWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     PosWidget(TQWidget *parent = 0, const char *name = 0);