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

3 files changed, 33 insertions, 31 deletions

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 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>KMouseToolUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KMouseToolUI</cstring>
     </property>
@@ -29,14 +29,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -47,9 +47,9 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="3" column="0">
+                <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -65,14 +65,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>dragTimeLabel</cstring>
                             </property>
@@ -137,7 +137,7 @@
                         <number>5</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>movementLabel</cstring>
                     </property>
@@ -167,7 +167,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>cbStroke</cstring>
                     </property>
@@ -175,7 +175,7 @@
                         <string>&amp;Enable strokes</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>dwellTimeLabel</cstring>
                     </property>
@@ -194,7 +194,7 @@
                         <cstring>dwellTimeEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>cbDrag</cstring>
                     </property>
@@ -205,9 +205,9 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -239,7 +239,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -256,7 +256,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>cbStart</cstring>
                     </property>
@@ -264,7 +264,7 @@
                         <string>Start with &amp;KDE</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>cbClick</cstring>
                     </property>
@@ -274,15 +274,15 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -300,7 +300,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignJustify|AlignVCenter</set>
                     </property>
                 </widget>
@@ -314,7 +314,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>8</width>
                             <height>8</height>
@@ -339,9 +339,9 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -365,7 +365,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>241</width>
                             <height>20</height>
@@ -406,7 +406,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>