TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cc
index 9f8d0a0..8a7b5bf 100644
--- a/kregexpeditor/gen_qregexpparser.cc
+++ b/kregexpeditor/gen_qregexpparser.cc
@@ -100,7 +100,7 @@
 /* Copy the first part of user declarations.  */
 #line 18 "qregexpparser.y"
 
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
   #include "compat.h"
 #else
   #include <klocale.h>
@@ -125,7 +125,7 @@
   extern void setParseData( TQString str );
   int yyerror (const char *);
   void setParseResult( RegExp* );
-  RegExp* parseQtRegExp( TQString qstr, bool* ok );
+  RegExp* parseTQtRegExp( TQString qstr, bool* ok );
   static RegExp* parseResult;
   static int _index;
 
@@ -1049,7 +1049,7 @@ yyreduce:
                  yyval.regexp = new AltnRegExp( false );
                  dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( yyvsp[-1].regexp );
                }
-               dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) );
+               dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::tqfromLatin1("") ) );
              }
     break;
 
@@ -1057,7 +1057,7 @@ yyreduce:
 #line 107 "qregexpparser.y"
     {  
                yyval.regexp = new AltnRegExp( false );
-               dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) );
+               dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::tqfromLatin1("") ) );
                dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( yyvsp[0].regexp );
              }
     break;
@@ -1160,7 +1160,7 @@ yyreduce:
   case 23:
 #line 157 "qregexpparser.y"
     { 
-        TQString match = TQString::fromLocal8Bit("\\%1").arg( yyvsp[0].backRef );
+        TQString match = TQString(TQString::fromLocal8Bit("\\%1")).tqarg( yyvsp[0].backRef );
         yyval.regexp = new TextRegExp( false, match );
         KMessageBox::information(0,i18n("<qt>Back reference regular expressions are not supported.<p>"
                                         "<tt>\\1</tt>, <tt>\\2</tt>, ... are <i>back references</i>, meaning they refer to  "
@@ -1170,7 +1170,7 @@ yyreduce:
                                         "just a workaround to ensure that the application handles the regexp at all. "
                                         "Therefore, as soon as you edit the regular expression in the graphical area, "
                                         "the back reference will be replaced by matching the text <b>%2</b> literally.")
-                                    .arg( match ).arg( match ),
+                                    .tqarg( match ).tqarg( match ),
                                  i18n("Back reference regular expressions not supported"), 
                                  TQString::fromLocal8Bit("backReferenceNotSupported") );
       }
@@ -1192,13 +1192,13 @@ yyreduce:
        if ( yyvsp[0].ch == '{' || yyvsp[0].ch == '}' || yyvsp[0].ch == '[' || yyvsp[0].ch == ']' || yyvsp[0].ch == '\\' ) {
           yyerror( "illigal character - needs escaping" );
        }
-       yyval.regexp = new TextRegExp( false, TQString::fromLocal8Bit("%1").arg(yyvsp[0].ch)); 
+       yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg(yyvsp[0].ch)); 
      }
     break;
 
   case 27:
 #line 182 "qregexpparser.y"
-    { yyval.regexp = new TextRegExp( false, TQString::fromLocal8Bit("%1").arg(yyvsp[0].ch)); }
+    { yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg(yyvsp[0].ch)); }
     break;
 
 
@@ -1427,7 +1427,7 @@ yyreturn:
 #line 185 "qregexpparser.y"
 
 
-RegExp* parseQtRegExp( TQString qstr, bool* ok ) {
+RegExp* parseTQtRegExp( TQString qstr, bool* ok ) {
   _index = 0;
   parseResult = 0;
   setParseData( qstr );