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

5 files changed, 49 insertions, 47 deletions

diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index cc811a3..b351df9 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -21,7 +21,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ******************************************************************************/
 
-// Qt includes.
+// TQt includes.
 #include <tqstring.h>
 #include <tqhbox.h>
 #include <tqlayout.h>
@@ -49,17 +49,17 @@
 /**
 * Constructor 
 */
-TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) :
-    KttsFilterConf(parent, name)
+TalkerChooserConf::TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) :
+    KttsFilterConf(tqparent, name)
 {
     // kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "TalkerChooserConfigWidgetLayout");
-    layout->setAlignment (Qt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
 
     // Determine if kdeutils Regular Expression Editor is installed.
     m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
@@ -147,7 +147,7 @@ void TalkerChooserConf::save(KConfig* config, const TQString& configGroup){
     config->setGroup( configGroup );
     config->writeEntry( "UserFilterName", m_widget->nameLineEdit->text() );
     config->writeEntry( "MatchRegExp", m_widget->reLineEdit->text() );
-    config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().replace(" ", "") );
+    config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().tqreplace(" ", "") );
     config->writeEntry( "TalkerCode", m_talkerCode.getTalkerCode());
 }
 
@@ -167,7 +167,7 @@ void TalkerChooserConf::defaults(){
     // Default App ID is blank.
     m_widget->appIdLineEdit->setText( "" );
     // Default to using default Talker.
-    m_talkerCode = TalkerCode( TQString::null, false );
+    m_talkerCode = TalkerCode( TQString(), false );
     m_widget->talkerLineEdit->setText( m_talkerCode.getTranslatedDescription() );
 }
 
@@ -188,11 +188,11 @@ bool TalkerChooserConf::supportsMultiInstance() { return true; }
  */
 TQString TalkerChooserConf::userPlugInName()
 {
-    if (m_widget->talkerLineEdit->text().isEmpty()) return TQString::null;
+    if (m_widget->talkerLineEdit->text().isEmpty()) return TQString();
     if (m_widget->appIdLineEdit->text().isEmpty() &&
-        m_widget->reLineEdit->text().isEmpty()) return TQString::null;
+        m_widget->reLineEdit->text().isEmpty()) return TQString();
     TQString instName = m_widget->nameLineEdit->text();
-    if (instName.isEmpty()) return TQString::null;
+    if (instName.isEmpty()) return TQString();
     return instName;
 }
 
@@ -260,10 +260,10 @@ void TalkerChooserConf::slotSaveButton_clicked()
 
 void TalkerChooserConf::slotClearButton_clicked()
 {
-    m_widget->nameLineEdit->setText( TQString::null );
-    m_widget->reLineEdit->setText( TQString::null );
-    m_widget->appIdLineEdit->setText( TQString::null );
-    m_talkerCode = TalkerCode( TQString::null, false );
+    m_widget->nameLineEdit->setText( TQString() );
+    m_widget->reLineEdit->setText( TQString() );
+    m_widget->appIdLineEdit->setText( TQString() );
+    m_talkerCode = TalkerCode( TQString(), false );
     m_widget->talkerLineEdit->setText( m_talkerCode.getTranslatedDescription() );
     configChanged();
 }
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.h b/kttsd/filters/talkerchooser/talkerchooserconf.h
index 38a6c49..be501a2 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.h
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.h
@@ -24,7 +24,7 @@
 #ifndef _TALKERCHOOSERCONF_H_
 #define _TALKERCHOOSERCONF_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqwidget.h>
 
 // KDE includes.
@@ -45,12 +45,13 @@ class EditReplacementWidget;
 class TalkerChooserConf : public KttsFilterConf
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
         * Constructor 
         */
-        TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() );
+        TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() );
 
         /**
         * Destructor 
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index 3cdee2e..3ee9947 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -2,7 +2,7 @@
 <class>TalkerChooserConfWidget</class>
 <comment>Widget for configuring Talker Chooser Filter for KTTSD.</comment>
 <author>Gary Cramblitt &lt;garycramblitt@comcast.net&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TalkerChooserConfWidget</cstring>
     </property>
@@ -21,22 +21,22 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>nameLabel</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -57,7 +57,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>applyGroupBox</cstring>
             </property>
@@ -71,22 +71,22 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>reLabel</cstring>
                             </property>
                             <property name="text">
-                                <string>Te&amp;xt contains:</string>
+                                <string>Te&amp;xt tqcontains:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -97,14 +97,14 @@
                                 <comment>What's this text</comment>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>appIdLabel</cstring>
                             </property>
                             <property name="text">
-                                <string>Application &amp;ID contains:</string>
+                                <string>Application &amp;ID tqcontains:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -116,17 +116,17 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="1">
+                <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout12</cstring>
+                                <cstring>tqlayout12</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -165,15 +165,15 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout19_2</cstring>
+                <cstring>tqlayout19_2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>talkerLabel</cstring>
                     </property>
@@ -226,9 +226,9 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -304,7 +304,7 @@
     <tabstop>reEditorButton</tabstop>
     <tabstop>appIdLineEdit</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp
index 5758df2..8d4aeb0 100644
--- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp
@@ -21,7 +21,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ******************************************************************************/
 
-// Qt includes.
+// TQt includes.
 #include <tqregexp.h>
 
 // KDE includes.
@@ -38,8 +38,8 @@
 /**
  * Constructor.
  */
-TalkerChooserProc::TalkerChooserProc( TQObject *parent, const char *name, const TQStringList& /*args*/ ) :
-    KttsFilterProc(parent, name) 
+TalkerChooserProc::TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) :
+    KttsFilterProc(tqparent, name) 
 {
     // kdDebug() << "TalkerChooserProc::TalkerChooserProc: Running" << endl;
 }
@@ -107,7 +107,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){
 {
     if ( !m_re.isEmpty() )
     {
-        int pos = inputText.find( TQRegExp(m_re) );
+        int pos = inputText.tqfind( TQRegExp(m_re) );
         if ( pos < 0 ) return inputText;
     }
     // If appId doesn't match, return input unmolested.
@@ -119,7 +119,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){
         TQString appIdStr = appId;
         for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx )
         {
-            if ( appIdStr.contains(m_appIdList[ndx]) )
+            if ( appIdStr.tqcontains(m_appIdList[ndx]) )
             {
                 found = true;
                 break;
diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.h b/kttsd/filters/talkerchooser/talkerchooserproc.h
index 8c9ab01..a422000 100644
--- a/kttsd/filters/talkerchooser/talkerchooserproc.h
+++ b/kttsd/filters/talkerchooser/talkerchooserproc.h
@@ -31,12 +31,13 @@
 class TalkerChooserProc : virtual public KttsFilterProc
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
      * Constructor.
      */
-    TalkerChooserProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() );
+    TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
 
     /**
      * Destructor.