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, 46 insertions, 45 deletions

diff --git a/src/optiondialog.h b/src/optiondialog.h
index 98ea0ff..0d4c372 100644
--- a/src/optiondialog.h
+++ b/src/optiondialog.h
@@ -22,15 +22,15 @@
 #ifndef OPTION_DIALOG_H
 #define OPTION_DIALOG_H
 
-class QCheckBox;
-class QLabel;
-class QLineEdit;
+class TQCheckBox;
+class TQLabel;
+class TQLineEdit;
 class KColorButton;
 class KFontChooser;
 class KConfig;
 
 #include <kdialogbase.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
 #include <list>
 #include <kcmdlineargs.h>
 
@@ -49,40 +49,41 @@ enum e_LineEndStyle
 class OptionDialog : public KDialogBase
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    OptionDialog( bool bShowDirMergeSettings, QWidget *parent = 0, char *name = 0 );
+    OptionDialog( bool bShowDirMergeSettings, TQWidget *tqparent = 0, char *name = 0 );
     ~OptionDialog( void );
-    QString parseOptions( const QCStringList& optionList );
-    QString calcOptionHelp();
+    TQString parseOptions( const QCStringList& optionList );
+    TQString calcOptionHelp();
 
     // Some settings are not available in the option dialog:
-    QSize  m_geometry;
-    QPoint m_position;
+    TQSize  m_tqgeometry;
+    TQPoint m_position;
     bool   m_bMaximised; 
     bool   m_bShowToolBar;
     bool   m_bShowStatusBar;
     int    m_toolBarPos;
 
     // These are the results of the option dialog.
-    QFont m_font;
+    TQFont m_font;
     bool m_bItalicForDeltas;
 
-    QColor m_fgColor;
-    QColor m_bgColor;
-    QColor m_diffBgColor;
-    QColor m_colorA;
-    QColor m_colorB;
-    QColor m_colorC;
-    QColor m_colorForConflict;
-    QColor m_currentRangeBgColor;
-    QColor m_currentRangeDiffBgColor;
-    QColor m_oldestFileColor;
-    QColor m_midAgeFileColor;
-    QColor m_newestFileColor;
-    QColor m_missingFileColor;
-    QColor m_manualHelpRangeColor;
+    TQColor m_fgColor;
+    TQColor m_bgColor;
+    TQColor m_diffBgColor;
+    TQColor m_colorA;
+    TQColor m_colorB;
+    TQColor m_colorC;
+    TQColor m_colorForConflict;
+    TQColor m_currentRangeBgColor;
+    TQColor m_currentRangeDiffBgColor;
+    TQColor m_oldestFileColor;
+    TQColor m_midAgeFileColor;
+    TQColor m_newestFileColor;
+    TQColor m_missingFileColor;
+    TQColor m_manualHelpRangeColor;
 
     bool m_bWordWrap;
 
@@ -91,15 +92,15 @@ public:
     int  m_tabSize;
     bool m_bAutoCopySelection;
     bool m_bSameEncoding;
-    QTextCodec*  m_pEncodingA;
+    TQTextCodec*  m_pEncodingA;
     bool m_bAutoDetectUnicodeA;
-    QTextCodec*  m_pEncodingB;
+    TQTextCodec*  m_pEncodingB;
     bool m_bAutoDetectUnicodeB;
-    QTextCodec*  m_pEncodingC;
+    TQTextCodec*  m_pEncodingC;
     bool m_bAutoDetectUnicodeC;
-    QTextCodec*  m_pEncodingOut;
+    TQTextCodec*  m_pEncodingOut;
     bool m_bAutoSelectOutEncoding;
-    QTextCodec*  m_pEncodingPP;
+    TQTextCodec*  m_pEncodingPP;
     int  m_lineEndStyle;
 
     bool m_bPreserveCarriageReturn;
@@ -114,27 +115,27 @@ public:
     bool m_bIgnoreCase;
     bool m_bIgnoreNumbers;
     bool m_bIgnoreComments;
-    QString m_PreProcessorCmd;
-    QString m_LineMatchingPreProcessorCmd;
+    TQString m_PreProcessorCmd;
+    TQString m_LineMatchingPreProcessorCmd;
     bool m_bRunRegExpAutoMergeOnMergeStart;
-    QString m_autoMergeRegExp;
+    TQString m_autoMergeRegExp;
     bool m_bRunHistoryAutoMergeOnMergeStart;
-    QString m_historyStartRegExp;
-    QString m_historyEntryStartRegExp;
+    TQString m_historyStartRegExp;
+    TQString m_historyEntryStartRegExp;
     bool m_bHistoryMergeSorting;
-    QString m_historyEntryStartSortKeyOrder;
+    TQString m_historyEntryStartSortKeyOrder;
     int m_maxNofHistoryEntries;
-    QString m_IrrelevantMergeCmd;
+    TQString m_IrrelevantMergeCmd;
     bool m_bAutoSaveAndQuitOnMergeWithoutConflicts;
 
     bool m_bAutoAdvance;
     int  m_autoAdvanceDelay;
 
-    QStringList m_recentAFiles;
-    QStringList m_recentBFiles;
-    QStringList m_recentCFiles;
+    TQStringList m_recentAFiles;
+    TQStringList m_recentBFiles;
+    TQStringList m_recentCFiles;
 
-    QStringList m_recentOutputFiles;
+    TQStringList m_recentOutputFiles;
 
     // Directory Merge options
     bool m_bDmSyncMode;
@@ -154,14 +155,14 @@ public:
     bool m_bDmUseCvsIgnore;
     bool m_bDmWhiteSpaceEqual;
     bool m_bDmCaseSensitiveFilenameComparison;
-    QString m_DmFilePattern;
-    QString m_DmFileAntiPattern;
-    QString m_DmDirAntiPattern;
+    TQString m_DmFilePattern;
+    TQString m_DmFileAntiPattern;
+    TQString m_DmDirAntiPattern;
 
-    QString m_language;
+    TQString m_language;
     bool m_bRightToLeftLanguage;
 
-    QString m_ignorableCmdLineOptions;
+    TQString m_ignorableCmdLineOptions;
     bool m_bIntegrateWithClearCase;
 
     void saveOptions(KConfig* config);