From f138d74fe16092003b06f5bde9663841929cde7f Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 22:17:08 +0000 Subject: TQt4 port kdeaccessibility This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1237325 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmousetool/kmousetool/kmousetool.cpp | 6 ++--- kmousetool/kmousetool/kmousetool.h | 8 +++--- kmousetool/kmousetool/kmousetoolui.ui | 50 +++++++++++++++++------------------ 3 files changed, 33 insertions(+), 31 deletions(-) (limited to 'kmousetool') diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index c54da8a..3e03e23 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -147,7 +147,7 @@ void KMouseTool::timerEvent( TQTimerEvent * ) return; if (!continue_timer) { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); return; } @@ -250,7 +250,7 @@ void KMouseTool::playTickSound() // TQSound::play(mSoundFileName); } -KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent, name) +KMouseTool::KMouseTool(TQWidget *tqparent, const char *name) : KMouseToolUI(tqparent, name) { init_vars(); resetSettings(); @@ -608,7 +608,7 @@ void KMouseTool::aboutSelected() -KMouseToolTray::KMouseToolTray (TQWidget *parent, const char *name) : KSystemTray (parent, name) +KMouseToolTray::KMouseToolTray (TQWidget *tqparent, const char *name) : KSystemTray (tqparent, name) { startStopId = contextMenu()->insertItem (i18n("&Start"), this, TQT_SIGNAL(startStopSelected())); contextMenu()->insertSeparator(); diff --git a/kmousetool/kmousetool/kmousetool.h b/kmousetool/kmousetool/kmousetool.h index 7f6fa0b..fde5566 100644 --- a/kmousetool/kmousetool/kmousetool.h +++ b/kmousetool/kmousetool/kmousetool.h @@ -55,6 +55,7 @@ class KMouseToolTray; class KMouseTool : public KMouseToolUI { Q_OBJECT + TQ_OBJECT private: MTStroke stroke; @@ -77,7 +78,7 @@ private: TQString autostartdirname; TQString rcfilename; TQString appfilename; - QString mSoundFileName; + TQString mSoundFileName; KAudioPlayer *mplayer; KMouseToolTray *trayIcon; @@ -186,7 +187,7 @@ public: /** * construtor */ - KMouseTool(TQWidget* parent=0, const char *name=0); + KMouseTool(TQWidget* tqparent=0, const char *name=0); /** destructor */ ~KMouseTool(); @@ -194,9 +195,10 @@ public: class KMouseToolTray : public KSystemTray { Q_OBJECT + TQ_OBJECT int startStopId; public: - KMouseToolTray (TQWidget *parent=0, const char *name=0); + KMouseToolTray (TQWidget *tqparent=0, const char *name=0); ~KMouseToolTray(); void updateStartStopText (bool mousetool_is_running); diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui index 05b3322..5e6b1a9 100644 --- a/kmousetool/kmousetool/kmousetoolui.ui +++ b/kmousetool/kmousetool/kmousetoolui.ui @@ -1,6 +1,6 @@ KMouseToolUI - + KMouseToolUI @@ -29,14 +29,14 @@ Expanding - + 20 30 - + groupBox1 @@ -47,9 +47,9 @@ unnamed - + - layout9 + tqlayout9 @@ -65,14 +65,14 @@ Fixed - + 16 20 - + dragTimeLabel @@ -137,7 +137,7 @@ 5 - + movementLabel @@ -167,7 +167,7 @@ 1 - + cbStroke @@ -175,7 +175,7 @@ &Enable strokes - + dwellTimeLabel @@ -194,7 +194,7 @@ dwellTimeEdit - + cbDrag @@ -205,9 +205,9 @@ true - + - layout5 + tqlayout5 @@ -239,7 +239,7 @@ Expanding - + 31 20 @@ -256,7 +256,7 @@ - + cbStart @@ -264,7 +264,7 @@ Start with &KDE - + cbClick @@ -274,15 +274,15 @@ - + - layout5 + tqlayout5 unnamed - + textLabel1 @@ -300,7 +300,7 @@ false - + WordBreak|AlignJustify|AlignVCenter @@ -314,7 +314,7 @@ Fixed - + 8 8 @@ -339,9 +339,9 @@ - + - layout5 + tqlayout5 @@ -365,7 +365,7 @@ Expanding - + 241 20 @@ -406,7 +406,7 @@ setEnabled(bool) - + knuminput.h knuminput.h -- cgit v1.2.3