summaryrefslogtreecommitdiffstats
path: root/kcontrol/joystick/joywidget.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol/joystick/joywidget.cpp
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
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
Diffstat (limited to 'kcontrol/joystick/joywidget.cpp')
-rw-r--r--kcontrol/joystick/joywidget.cpp10
1 files changed, 5 insertions, 5 deletions
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);