From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/joystick/caldialog.cpp | 4 ++-- kcontrol/joystick/joystick.cpp | 2 +- kcontrol/joystick/joywidget.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kcontrol/joystick') diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp index 84135bb66..095f18f41 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -65,7 +65,7 @@ void CalDialog::calibrate() do { - tqApp->processEvents(2000); + qApp->processEvents(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 { - tqApp->processEvents(100); + qApp->processEvents(100); if ( joydev->getEvent(type, number, value) ) { diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 87b6f4e05..3ffc0e1d7 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->tqminimumSize()); + setMinimumSize(joyWidget->minimumSize()); setButtons(KCModule::Default); } diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index d460eaf3c..cfc293b89 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->tqsizeHint()); + icon->setFixedSize(icon->sizeHint()); message = new TQLabel(messageBox); messageBox->hide(); } -- cgit v1.2.1