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

6 files changed, 57 insertions, 54 deletions

diff --git a/ksayit/Freeverb_plugin/Makefile.am b/ksayit/Freeverb_plugin/Makefile.am
index 0db4104..d226444 100644
--- a/ksayit/Freeverb_plugin/Makefile.am
+++ b/ksayit/Freeverb_plugin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/ksayit/src $(all_includes)
+INCLUDES = -I$(top_srcdir)/ksayit/src $(all_includes) -I$(kde_includes)/kde -I$(kde_includes)/arts
 METASOURCES = AUTO
 kde_servicetypes_DATA = ksayit_libFreeverb_service.desktop
 kde_services_DATA = ksayit_libFreeverb.desktop
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index ab3808a..c1dffb0 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Freeverb_Setup</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Freeverb_Setup</cstring>
     </property>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>360</width>
             <height>300</height>
@@ -36,15 +36,15 @@
         <property name="resizeMode">
             <enum>Minimum</enum>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frame_room</cstring>
                     </property>
@@ -56,7 +56,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -72,18 +72,18 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel_room</cstring>
                             </property>
                             <property name="text">
                                 <string>&lt;b&gt;Room&lt;/b&gt;</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
-                        <widget class="QLCDNumber">
+                        <widget class="TQLCDNumber">
                             <property name="name">
                                 <cstring>LCD_room</cstring>
                             </property>
@@ -121,7 +121,7 @@
                                 <enum>Flat</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>slider_room</cstring>
                             </property>
@@ -149,7 +149,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frame_damp</cstring>
                     </property>
@@ -161,7 +161,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -177,18 +177,18 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel_damp</cstring>
                             </property>
                             <property name="text">
                                 <string>&lt;b&gt;Damp&lt;/b&gt;</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
-                        <widget class="QLCDNumber">
+                        <widget class="TQLCDNumber">
                             <property name="name">
                                 <cstring>LCD_damp</cstring>
                             </property>
@@ -226,7 +226,7 @@
                                 <enum>Flat</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>slider_damp</cstring>
                             </property>
@@ -248,7 +248,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frame_wet</cstring>
                     </property>
@@ -260,7 +260,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -276,18 +276,18 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel_wet</cstring>
                             </property>
                             <property name="text">
                                 <string>&lt;b&gt;Wet&lt;/b&gt;</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
-                        <widget class="QLCDNumber">
+                        <widget class="TQLCDNumber">
                             <property name="name">
                                 <cstring>LCD_wet</cstring>
                             </property>
@@ -325,7 +325,7 @@
                                 <enum>Flat</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>slider_wet</cstring>
                             </property>
@@ -347,7 +347,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frame_dry</cstring>
                     </property>
@@ -359,7 +359,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -375,18 +375,18 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel_dry</cstring>
                             </property>
                             <property name="text">
                                 <string>&lt;b&gt;Dry&lt;/b&gt;</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
-                        <widget class="QLCDNumber">
+                        <widget class="TQLCDNumber">
                             <property name="name">
                                 <cstring>LCD_dry</cstring>
                             </property>
@@ -424,7 +424,7 @@
                                 <enum>Flat</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>slider_dry</cstring>
                             </property>
@@ -446,7 +446,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frame_width</cstring>
                     </property>
@@ -458,7 +458,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>260</height>
@@ -474,18 +474,18 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel_width</cstring>
                             </property>
                             <property name="text">
                                 <string>&lt;b&gt;Width&lt;/b&gt;</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
-                        <widget class="QLCDNumber">
+                        <widget class="TQLCDNumber">
                             <property name="name">
                                 <cstring>LCD_width</cstring>
                             </property>
@@ -523,7 +523,7 @@
                                 <enum>Flat</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>slider_width</cstring>
                             </property>
@@ -569,9 +569,9 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout12</cstring>
+                <cstring>tqlayout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -587,7 +587,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>180</width>
                             <height>20</height>
@@ -598,7 +598,7 @@
                     <property name="name">
                         <cstring>OK_Button</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>60</width>
                             <height>0</height>
@@ -653,15 +653,15 @@
         <slot>slotOKwasClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>sliderRoomChanged(int)</slot>
     <slot>sliderDampChanged(int)</slot>
     <slot>sliderWetChanged(int)</slot>
     <slot>sliderDryChanged(int)</slot>
     <slot>sliderWidthChanged(int)</slot>
     <slot>slotOKwasClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp
index 4fd00be..f861a57 100644
--- a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp
+++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp
@@ -28,8 +28,8 @@ using namespace std;
 // App specific includes
 #include "freeverbsetupimpl.h"
 
-FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *parent, const char *name, bool modal, KConfig *config )
- : Freeverb_Setup(parent,name,modal), m_config(config) {
+FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *tqparent, const char *name, bool modal, KConfig *config )
+ : Freeverb_Setup(tqparent,name,modal), m_config(config) {
 
   // initialize Widgets
   Init();
diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h
index b243faf..b7c884f 100644
--- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h
+++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h
@@ -33,8 +33,9 @@
 
 class FreeverbSetupImpl : public Freeverb_Setup  {
    Q_OBJECT
+  TQ_OBJECT
 public: 
-	FreeverbSetupImpl(TQWidget *parent=0, const char *name=0, bool modal=true, KConfig *config=0);
+	FreeverbSetupImpl(TQWidget *tqparent=0, const char *name=0, bool modal=true, KConfig *config=0);
 	~FreeverbSetupImpl();
 
 public slots:
diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
index bb91885..64febd1 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
@@ -41,19 +41,19 @@ KInstance *FreeverbPluginFactory::p_instance = 0L;
 
 
 // Factory Constructor
-FreeverbPluginFactory::FreeverbPluginFactory(TQObject *parent, const char* name)
+FreeverbPluginFactory::FreeverbPluginFactory(TQObject *tqparent, const char* name)
 {
     p_instance = new KInstance("FreeverbPluginFactory");
 }
 
     
-TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name, 
+TQObject* FreeverbPluginFactory::createObject(TQObject *tqparent, const char* name, 
             const char*, 
             const TQStringList &)
 {
     kdDebug(100200) << "FreeverbPluginFactory::createObject()" << endl;
     
-    TQObject* obj = new FreeverbPlugin( parent, name );
+    TQObject* obj = new FreeverbPlugin( tqparent, name );
     emit objectCreated( obj );
     return obj;  
 }        
@@ -62,8 +62,8 @@ TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name
 
 
 // Plugin Constructor
-FreeverbPlugin::FreeverbPlugin(TQObject *parent, const char* name) //, KApplication *Appl)
- : FXPlugin(parent, name) //, m_Appl(Appl)
+FreeverbPlugin::FreeverbPlugin(TQObject *tqparent, const char* name) //, KApplication *Appl)
+ : FXPlugin(tqparent, name) //, m_Appl(Appl)
 {
     m_config = new KSimpleConfig("ksayit_freeverbrc");
     
diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
index e9731d4..aac4408 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
@@ -27,15 +27,16 @@
 class FreeverbPluginFactory : public KLibFactory
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     // Consturctor
-    FreeverbPluginFactory(TQObject *parent=0, const char* name=0);
+    FreeverbPluginFactory(TQObject *tqparent=0, const char* name=0);
     
     // Destructor
     virtual ~FreeverbPluginFactory(){ delete p_instance; };
     
-    TQObject* createObject(TQObject *parent=0, const char* name=0, 
-            const char* className="TQObject", 
+    TQObject* createObject(TQObject *tqparent=0, const char* name=0, 
+            const char* className=TQOBJECT_OBJECT_NAME_STRING, 
             const TQStringList &args=TQStringList());        
 
 private:
@@ -50,9 +51,10 @@ private:
 class FreeverbPlugin : public FXPlugin
 {
 Q_OBJECT
+  TQ_OBJECT
 public: 
     // Constructor
-    FreeverbPlugin(TQObject *parent=0, const char* name=0); //, KApplication *Appl=0);
+    FreeverbPlugin(TQObject *tqparent=0, const char* name=0); //, KApplication *Appl=0);
     
     // Destructor
     ~FreeverbPlugin();