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

diff --git a/src/difftextwindow.h b/src/difftextwindow.h
index 8620b28..e5631a0 100644
--- a/src/difftextwindow.h
+++ b/src/difftextwindow.h
@@ -20,26 +20,27 @@
 
 #include "diff.h"
 
-#include <qwidget.h>
+#include <tqwidget.h>
 
-class QStatusBar;
+class TQStatusBar;
 class OptionDialog;
 class DiffTextWindowData;
 class DiffTextWindowFrame;
 
-class DiffTextWindow : public QWidget
+class DiffTextWindow : public TQWidget
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
    DiffTextWindow(
       DiffTextWindowFrame* pParent,
-      QStatusBar* pStatusBar,
+      TQStatusBar* pStatusBar,
       OptionDialog* pOptionDialog,
       int winIdx
       );
    ~DiffTextWindow();
    void init(
-      const QString& fileName,
+      const TQString& fileName,
       const LineData* pLineData,
       int size,
       const Diff3LineVector* pDiff3LineVector,
@@ -49,7 +50,7 @@ public:
    void reset();
    void convertToLinePos( int x, int y, int& line, int& pos );
 
-   QString getSelection();
+   TQString getSelection();
    int getFirstLine();
    int calcTopLineInFile( int firstLine );
 
@@ -66,13 +67,13 @@ public:
 
    void convertSelectionToD3LCoords();
 
-   bool findString( const QString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive );
+   bool findString( const TQString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive );
    void setSelection( int firstLine, int startPos, int lastLine, int endPos, int& l, int& p );
    void getSelectionRange( int* firstLine, int* lastLine, e_CoordType coordType );
 
    void setPaintingAllowed( bool bAllowPainting );
    void recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int nofVisibleColumns );
-   void print( MyPainter& painter, const QRect& r, int firstLine, int nofLinesPerPage );
+   void print( MyPainter& painter, const TQRect& r, int firstLine, int nofLinesPerPage );
 signals:
    void resizeSignal( int nofVisibleColumns, int nofVisibleLines );
    void scroll( int deltaX, int deltaY );
@@ -89,17 +90,17 @@ public slots:
    void setFastSelectorRange( int line1, int nofLines );
 
 protected:
-   virtual void mousePressEvent ( QMouseEvent * );
-   virtual void mouseReleaseEvent ( QMouseEvent * );
-   virtual void mouseMoveEvent ( QMouseEvent * );
-   virtual void mouseDoubleClickEvent ( QMouseEvent * e );
+   virtual void mousePressEvent ( TQMouseEvent * );
+   virtual void mouseReleaseEvent ( TQMouseEvent * );
+   virtual void mouseMoveEvent ( TQMouseEvent * );
+   virtual void mouseDoubleClickEvent ( TQMouseEvent * e );
 
-   virtual void paintEvent( QPaintEvent*  );
-   virtual void dragEnterEvent( QDragEnterEvent* e );
-   virtual void focusInEvent( QFocusEvent* e );
+   virtual void paintEvent( TQPaintEvent*  );
+   virtual void dragEnterEvent( TQDragEnterEvent* e );
+   virtual void focusInEvent( TQFocusEvent* e );
 
-   virtual void resizeEvent( QResizeEvent* );
-   virtual void timerEvent(QTimerEvent*);
+   virtual void resizeEvent( TQResizeEvent* );
+   virtual void timerEvent(TQTimerEvent*);
 
 private:
    DiffTextWindowData* d;
@@ -110,19 +111,20 @@ private:
 
 class DiffTextWindowFrameData;
 
-class DiffTextWindowFrame : public QWidget
+class DiffTextWindowFrame : public TQWidget
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-   DiffTextWindowFrame( QWidget* pParent, QStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx );
+   DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx );
    ~DiffTextWindowFrame();
    DiffTextWindow* getDiffTextWindow();
    void init();
    void setFirstLine(int firstLine);
 signals:
-   void fileNameChanged(const QString&, int);
+   void fileNameChanged(const TQString&, int);
 protected:
-   bool eventFilter( QObject*, QEvent* );
+   bool eventFilter( TQObject*, TQEvent* );
 private slots:
    void slotReturnPressed();
    void slotBrowseButtonClicked();