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, 21 insertions, 21 deletions

diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp
index a71c679..d5f0a07 100644
--- a/kregexpeditor/charselector.cpp
+++ b/kregexpeditor/charselector.cpp
@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
 #include "compat.h"
 #else
 #include <klocale.h>
@@ -38,40 +38,40 @@
    class expects the widgets on the stack to take up all space.
    StackContainer fills in this gab.
 */
-class StackContainer :public QWidget
+class StackContainer :public TQWidget
 {
 public:
-    StackContainer( TQWidget* child, TQWidget* parent ) : TQWidget( parent )
+    StackContainer( TQWidget* child, TQWidget* tqparent ) : TQWidget( tqparent )
         {
-            TQHBoxLayout* layout = new TQHBoxLayout( this );
+            TQHBoxLayout* tqlayout = new TQHBoxLayout( this );
             child->reparent( this, TQPoint(0,0), false );
-            layout->addWidget( child );
-            layout->addStretch( 1 );
+            tqlayout->addWidget( child );
+            tqlayout->addStretch( 1 );
         }
 };
 
-CharSelector::CharSelector( TQWidget* parent, const char* name )
-    :TQWidget( parent, name ), _oldIndex(0)
+CharSelector::CharSelector( TQWidget* tqparent, const char* name )
+    :TQWidget( tqparent, name ), _oldIndex(0)
 {
   TQStringList items;
-  TQHBoxLayout* layout = new TQHBoxLayout( this, 0, 6 );
+  TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 0, 6 );
 
   _type = new TQComboBox( this, "_type" );
   items << i18n("Normal Character")
         << i18n("Unicode Char in Hex.")
         << i18n("Unicode Char in Oct.")
-        << TQString::fromLatin1("----")
+        << TQString::tqfromLatin1("----")
         << i18n("The Bell Character (\\a)")
         << i18n("The Form Feed Character (\\f)")
         << i18n("The Line Feed Character (\\n)")
         << i18n("The Carriage Return Character (\\r)")
-        << i18n("The Horizontal Tab Character (\\t)")
-        << i18n("The Vertical Tab Character (\\v)");
+        << i18n("TheQt::Horizontal Tab Character (\\t)")
+        << i18n("TheQt::Vertical Tab Character (\\v)");
   _type->insertStringList( items );
-  layout->addWidget( _type );
+  tqlayout->addWidget( _type );
 
   _stack = new TQWidgetStack( this, "_stack" );
-  layout->addWidget( _stack );
+  tqlayout->addWidget( _stack );
 
   _normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, 0, "_normal" );
   _stack->addWidget( new StackContainer( _normal, _stack ), 0 );
@@ -169,17 +169,17 @@ TQString CharSelector::text() const
   case 3: // The seperator
     break;
   case 4:
-    return TQString::fromLatin1("\\a");
+    return TQString::tqfromLatin1("\\a");
   case 5:
-    return TQString::fromLatin1("\\f");
+    return TQString::tqfromLatin1("\\f");
   case 6:
-    return TQString::fromLatin1("\\n");
+    return TQString::tqfromLatin1("\\n");
   case 7:
-    return TQString::fromLatin1("\\r");
+    return TQString::tqfromLatin1("\\r");
   case 8:
-    return TQString::fromLatin1("\\t");
+    return TQString::tqfromLatin1("\\t");
   case 9:
-    return TQString::fromLatin1("\\v");
+    return TQString::tqfromLatin1("\\v");
   }
-  return TQString::null;
+  return TQString();
 }