Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 10 insertions, 10 deletions

diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp
index 095f18f41..4b6d5fc9b 100644
--- a/kcontrol/joystick/caldialog.cpp
+++ b/kcontrol/joystick/caldialog.cpp
@@ -65,7 +65,7 @@ void CalDialog::calibrate()
 
   do
   {
-    qApp->processEvents(2000);
+    tqApp->tqprocessEvents(2000);
   }
   while ( ti.isActive() && (result() != TQDialog::Rejected) );
 
@@ -165,7 +165,7 @@ void CalDialog::waitButton(int axis, bool press, int &lastVal)
   // loop until the user presses a button on the device or on the dialog
   do
   {
-    qApp->processEvents(100);
+    tqApp->tqprocessEvents(100);
 
     if ( joydev->getEvent(type, number, value) )
     {
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 3ffc0e1d7..87b6f4e05 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -95,7 +95,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
 
   joyWidget = new JoyWidget(this);
 
-  setMinimumSize(joyWidget->minimumSize());
+  setMinimumSize(joyWidget->tqminimumSize());
 
   setButtons(KCModule::Default);
 }
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index cfc293b89..0f2349050 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -56,7 +56,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
     TQLabel *icon = new TQLabel(messageBox);
     icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
                                                     KIcon::SizeMedium, KIcon::DefaultState, 0, true));
-    icon->setFixedSize(icon->sizeHint());
+    icon->setFixedSize(icon->tqsizeHint());
     message = new TQLabel(messageBox);
     messageBox->hide();
   }
@@ -170,7 +170,7 @@ void JoyWidget::init()
 
     // we found one
 
-    device->insertItem(TQString("%1 (%2)").arg(joy->text()).arg(joy->device()));
+    device->insertItem(TQString("%1 (%2)").tqarg(joy->text()).tqarg(joy->device()));
 
     // display values for first device
     if ( first )
@@ -213,7 +213,7 @@ void JoyWidget::restoreCurrDev()
   {
     // try to find the current open device in the combobox list
     TQListBoxItem *item;
-    item = device->listBox()->findItem(joydev->device(), Qt::Contains);
+    item = device->listBox()->tqfindItem(joydev->device(), TQt::Contains);
 
     if ( !item )  // the current open device is one the user entered (not in the list)
       device->setCurrentText(joydev->device());
@@ -230,7 +230,7 @@ void JoyWidget::deviceChanged(const TQString &dev)
   int start, stop;
   TQString devName;
 
-  if ( (start = dev.find("/dev")) == -1 )
+  if ( (start = dev.tqfind("/dev")) == -1 )
   {
     KMessageBox::sorry(this,
       i18n("The given device name is invalid (does not contain /dev).\n"
@@ -241,7 +241,7 @@ void JoyWidget::deviceChanged(const TQString &dev)
     return;
   }
 
-  if ( (stop = dev.find(")", start)) != -1 )  // seems to be text selected from our list
+  if ( (stop = dev.tqfind(")", start)) != -1 )  // seems to be text selected from our list
     devName = dev.mid(start, stop - start);
   else
     devName = dev.mid(start);
diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h
index 06b05a4ba..47261408d 100644
--- a/kcontrol/joystick/joywidget.h
+++ b/kcontrol/joystick/joywidget.h
@@ -35,7 +35,7 @@ class TQCheckBox;
 class TQHBox;
 
 // the widget which displays all buttons, values, etc.
-class JoyWidget : public QWidget
+class JoyWidget : public TQWidget
 {
   Q_OBJECT
   
diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h
index a4d57117e..abe1785c3 100644
--- a/kcontrol/joystick/poswidget.h
+++ b/kcontrol/joystick/poswidget.h
@@ -26,7 +26,7 @@
 /**
   Widget to display the joystick-selected (x,y) position
 */
-class PosWidget : public QWidget
+class PosWidget : public TQWidget
 {
   Q_OBJECT