TQt4 port kdiff3

This enables compilation under both Qt3 and Qt4


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

1 files changed, 45 insertions, 42 deletions

diff --git a/src/smalldialogs.h b/src/smalldialogs.h
index 5791b13..88e6146 100644
--- a/src/smalldialogs.h
+++ b/src/smalldialogs.h
@@ -21,34 +21,35 @@
 #ifndef SMALLDIALOGS_H
 #define SMALLDIALOGS_H
 
-#include <qdialog.h>
+#include <tqdialog.h>
 #include "diff.h"
 
 class OptionDialog;
-class QComboBox;
-class QCheckBox;
-class QLineEdit;
-class QLabel;
+class TQComboBox;
+class TQCheckBox;
+class TQLineEdit;
+class TQLabel;
 
-class OpenDialog : public QDialog
+class OpenDialog : public TQDialog
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
    OpenDialog(
-      QWidget* pParent, const QString& n1, const QString& n2, const QString& n3,
-      bool bMerge, const QString& outputName, const char* slotConfigure, OptionDialog* pOptions  );
+      TQWidget* pParent, const TQString& n1, const TQString& n2, const TQString& n3,
+      bool bMerge, const TQString& outputName, const char* slotConfigure, OptionDialog* pOptions  );
 
-   QComboBox* m_pLineA;
-   QComboBox* m_pLineB;
-   QComboBox* m_pLineC;
-   QComboBox* m_pLineOut;
+   TQComboBox* m_pLineA;
+   TQComboBox* m_pLineB;
+   TQComboBox* m_pLineC;
+   TQComboBox* m_pLineOut;
 
-   QCheckBox* m_pMerge;
+   TQCheckBox* m_pMerge;
    virtual void accept();
-   virtual bool eventFilter(QObject* o, QEvent* e);
+   virtual bool eventFilter(TQObject* o, TQEvent* e);
 private:
    OptionDialog* m_pOptions;
-   void selectURL( QComboBox* pLine, bool bDir, int i, bool bSave );
+   void selectURL( TQComboBox* pLine, bool bDir, int i, bool bSave );
    bool m_bInputFileNameChanged;
 private slots:
    void selectFileA();
@@ -66,22 +67,23 @@ signals:
    void internalSignal(bool);
 };
 
-class FindDialog : public QDialog
+class FindDialog : public TQDialog
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-   FindDialog(QWidget* pParent);
+   FindDialog(TQWidget* pParent);
 
 signals:
    void findNext();
 
 public:
-   QLineEdit* m_pSearchString;
-   QCheckBox* m_pSearchInA;
-   QCheckBox* m_pSearchInB;
-   QCheckBox* m_pSearchInC;
-   QCheckBox* m_pSearchInOutput;
-   QCheckBox* m_pCaseSensitive;
+   TQLineEdit* m_pSearchString;
+   TQCheckBox* m_pSearchInA;
+   TQCheckBox* m_pSearchInB;
+   TQCheckBox* m_pSearchInC;
+   TQCheckBox* m_pSearchInOutput;
+   TQCheckBox* m_pCaseSensitive;
 
    int currentLine;
    int currentPos;
@@ -89,30 +91,31 @@ public:
 };
 
 
-class RegExpTester : public QDialog
+class RegExpTester : public TQDialog
 {
    Q_OBJECT
+  TQ_OBJECT
 private:
-   QLineEdit* m_pAutoMergeRegExpEdit;
-   QLineEdit* m_pAutoMergeMatchResult;
-   QLineEdit* m_pAutoMergeExampleEdit;
-   QLineEdit* m_pHistoryStartRegExpEdit;
-   QLineEdit* m_pHistoryStartMatchResult;
-   QLineEdit* m_pHistoryStartExampleEdit;
-   QLineEdit* m_pHistoryEntryStartRegExpEdit;
-   QLineEdit* m_pHistorySortKeyOrderEdit;
-   QLineEdit* m_pHistoryEntryStartExampleEdit;
-   QLineEdit* m_pHistoryEntryStartMatchResult;
-   QLineEdit* m_pHistorySortKeyResult;
+   TQLineEdit* m_pAutoMergeRegExpEdit;
+   TQLineEdit* m_pAutoMergeMatchResult;
+   TQLineEdit* m_pAutoMergeExampleEdit;
+   TQLineEdit* m_pHistoryStartRegExpEdit;
+   TQLineEdit* m_pHistoryStartMatchResult;
+   TQLineEdit* m_pHistoryStartExampleEdit;
+   TQLineEdit* m_pHistoryEntryStartRegExpEdit;
+   TQLineEdit* m_pHistorySortKeyOrderEdit;
+   TQLineEdit* m_pHistoryEntryStartExampleEdit;
+   TQLineEdit* m_pHistoryEntryStartMatchResult;
+   TQLineEdit* m_pHistorySortKeyResult;
    OptionDialog* m_pOptionDialog;
 public:
-   RegExpTester( QWidget* pParent, const QString& autoMergeRegExpToolTip, const QString& historyStartRegExpToolTip, 
-                                   const QString& historyEntryStartRegExpToolTip, const QString& historySortKeyOrderToolTip  );
-   void init( const QString& autoMergeRegExp, const QString& historyStartRegExp, const QString& historyEntryStartRegExp, const QString sortKeyOrder );
-   QString autoMergeRegExp();
-   QString historyStartRegExp();
-   QString historyEntryStartRegExp();
-   QString historySortKeyOrder();
+   RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpToolTip, const TQString& historyStartRegExpToolTip, 
+                                   const TQString& historyEntryStartRegExpToolTip, const TQString& historySortKeyOrderToolTip  );
+   void init( const TQString& autoMergeRegExp, const TQString& historyStartRegExp, const TQString& historyEntryStartRegExp, const TQString sortKeyOrder );
+   TQString autoMergeRegExp();
+   TQString historyStartRegExp();
+   TQString historyEntryStartRegExp();
+   TQString historySortKeyOrder();
 public slots:
    void slotRecalc();
 };