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

3 files changed, 28 insertions, 26 deletions

diff --git a/kregexpeditor/qt-only/clean b/kregexpeditor/qt-only/clean
index 57e9a6d..c594401 100755
--- a/kregexpeditor/qt-only/clean
+++ b/kregexpeditor/qt-only/clean
@@ -5,8 +5,8 @@ rm -rf manual
 rm -rf predefined 
 rm -rf icons 
 rm unistd.h
-find -lname \* -maxdepth 1 | xargs rm
-rm moc_*
+tqfind -lname \* -maxdepth 1 | xargs rm
+rm tqmoc_*
 rm images.h
 rm gen_*
 rm -rf kregexpeditor*
diff --git a/kregexpeditor/qt-only/compat.cpp b/kregexpeditor/qt-only/compat.cpp
index a7a5d12..528099e 100644
--- a/kregexpeditor/qt-only/compat.cpp
+++ b/kregexpeditor/qt-only/compat.cpp
@@ -27,16 +27,16 @@ TQString i18n( const TQString& a, const TQString& b) {
 }
 
 KDialogBase::KDialogBase( int /*dialogFace*/, const TQString &caption, int buttonMask,
-                          ButtonCode defaultButton, TQWidget *parent, const char *name,
+                          ButtonCode defaultButton, TQWidget *tqparent, const char *name,
                           bool modal )
-    :TQDialog( parent, name, modal )
+    :TQDialog( tqparent, name, modal )
 {
     init( buttonMask, defaultButton, caption );
 }
 
-KDialogBase::KDialogBase( TQWidget* parent, const char* name, bool modal,
+KDialogBase::KDialogBase( TQWidget* tqparent, const char* name, bool modal,
                           const TQString& caption, int buttonMask )
-        : TQDialog( parent, name, modal )
+        : TQDialog( tqparent, name, modal )
 {
     init( buttonMask, Ok, caption );
 }
@@ -92,24 +92,24 @@ void KDialogBase::slotCancel()
     emit finished();
 }
 
-int KMessageBox::warningYesNo(TQWidget *parent, const TQString &text, const TQString &caption )
+int KMessageBox::warningYesNo(TQWidget *tqparent, const TQString &text, const TQString &caption )
 {
-    int code = warning( parent, caption, text, tr("No"), tr("Yes") );
+    int code = warning( tqparent, caption, text, tr("No"), tr("Yes") );
     if ( code == 0 )
         return Yes;
     else
         return No;
 }
 
-int KMessageBox::information( TQWidget* parent, const TQString& text, const TQString& caption,
+int KMessageBox::information( TQWidget* tqparent, const TQString& text, const TQString& caption,
                               const TQString& /*dontShowAgainName*/ )
 {
-    return TQMessageBox::information( parent, caption, text );
+    return TQMessageBox::information( tqparent, caption, text );
 }
 
-int KMessageBox::sorry( TQWidget* parent, const TQString& text, const TQString& caption )
+int KMessageBox::sorry( TQWidget* tqparent, const TQString& text, const TQString& caption )
 {
-    return TQMessageBox::information( parent, caption, text );
+    return TQMessageBox::information( tqparent, caption, text );
 }
 
 
diff --git a/kregexpeditor/qt-only/compat.h b/kregexpeditor/qt-only/compat.h
index 5afa317..f09cbbf 100644
--- a/kregexpeditor/qt-only/compat.h
+++ b/kregexpeditor/qt-only/compat.h
@@ -29,14 +29,15 @@ TQString i18n( const TQString& a);
 TQString i18n( const TQString& a, const TQString& b);
 #define isatty(x) 0
 
-#define KTextBrowser QTextBrowser
-#define KListBox QListBox
-#define KFileDialog QFileDialog
-#define KPushButton QPushButton
+#define KTextBrowser TQTextBrowser
+#define KListBox TQListBox
+#define KFileDialog TQFileDialog
+#define KPushButton TQPushButton
 
-class KDialogBase :public QDialog
+class KDialogBase :public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum ButtonCode {Ok = 1, Cancel, Help};
@@ -44,10 +45,10 @@ public:
 
     KDialogBase ( int dialogFace, const TQString &caption, int buttonMask,
                   ButtonCode defaultButton,
-                  TQWidget *parent=0, const char *name=0, bool modal=true );
+                  TQWidget *tqparent=0, const char *name=0, bool modal=true );
 
-    KDialogBase( TQWidget* parent, const char* name = 0, bool modal = true,
-                 const TQString& caption = TQString::null,
+    KDialogBase( TQWidget* tqparent, const char* name = 0, bool modal = true,
+                 const TQString& caption = TQString(),
                  int buttonMask = 0 );
 
     void init( int buttonMask, ButtonCode /*defaultButton*/, const TQString& caption );
@@ -69,16 +70,17 @@ private:
     TQVBoxLayout* _layout;
 };
 
-class KMessageBox :public QMessageBox
+class KMessageBox :public TQMessageBox
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum ButtonCode { Ok = 1, Cancel = 2, Yes = 3, No = 4, Continue = 5 };
-    static int  warningYesNo (TQWidget *parent, const TQString &text,
-                              const TQString &caption = TQString::null );
-    static int information( TQWidget* parent, const TQString& text, const TQString& caption = TQString::null,
-                            const TQString& /*dontShowAgainName*/ = TQString::null );
-    static int sorry( TQWidget* parent, const TQString& text, const TQString& caption = TQString::null );
+    static int  warningYesNo (TQWidget *tqparent, const TQString &text,
+                              const TQString &caption = TQString() );
+    static int information( TQWidget* tqparent, const TQString& text, const TQString& caption = TQString(),
+                            const TQString& /*dontShowAgainName*/ = TQString() );
+    static int sorry( TQWidget* tqparent, const TQString& text, const TQString& caption = TQString() );
 };
 
 #endif /* COMPAT_H */