TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 30 insertions, 30 deletions

diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h
index d42d0b16..2e9d8a8b 100644
--- a/lib/kformula/kformuladefs.h
+++ b/lib/kformula/kformuladefs.h
@@ -23,9 +23,9 @@
 
 #include <memory>
 
-#include <qpoint.h>
-#include <qrect.h>
-#include <qstring.h>
+#include <tqpoint.h>
+#include <tqrect.h>
+#include <tqstring.h>
 
 #include <KoPoint.h>
 #include <KoRect.h>
@@ -54,23 +54,23 @@ typedef KoRect PtRect;
  * Pixels. At any zoom level.
  */
 typedef int pixel;
-typedef QPoint PixelPoint;
-typedef QRect PixelRect;
-//typedef QSize PixelSize;
+typedef TQPoint PixelPoint;
+typedef TQRect PixelRect;
+//typedef TQSize PixelSize;
 
 /**
  * Layout Unit. That's the values we store to get
  * wysiwyg right.
  */
 typedef int luPt;
-typedef QPoint LuPtPoint;
-typedef QRect LuPtRect;
-typedef QSize LuPtSize;
+typedef TQPoint LuPtPoint;
+typedef TQRect LuPtRect;
+typedef TQSize LuPtSize;
 
 typedef int luPixel;
-typedef QPoint LuPixelPoint;
-typedef QRect LuPixelRect;
-typedef QSize LuPixelSize;
+typedef TQPoint LuPixelPoint;
+typedef TQRect LuPixelRect;
+typedef TQSize LuPixelSize;
 
 
 /**
@@ -106,9 +106,9 @@ enum MoveFlag { NormalMovement = 0, SelectMovement = 1, WordMovement = 2 };
 inline MoveFlag movementFlag( int state )
 {
     int flag = NormalMovement;
-    if ( state & Qt::ControlButton )
+    if ( state & TQt::ControlButton )
         flag |= WordMovement;
-    if ( state & Qt::ShiftButton )
+    if ( state & TQt::ShiftButton )
         flag |= SelectMovement;
     return static_cast<MoveFlag>( flag );
 }
@@ -163,8 +163,8 @@ enum TokenElementType {
  * The struct used to store static font data.
  */
 struct InternFontTable {
-    short unicode;
-    QChar pos;
+    short tqunicode;
+    TQChar pos;
     CharClass cl;
     CharStyle style;
 };
@@ -180,7 +180,7 @@ enum Direction { beforeCursor, afterCursor };
 /**
  * The types of space we know.
  */
-enum SpaceWidth { THIN, MEDIUM, THICK, QUAD, NEGTHIN };
+enum SpaceWidth { THIN, MEDIUM, THICK, TQUAD, NEGTHIN };
 
 /**
  * The types of MathML horizontal or vertical sizes we know
@@ -235,7 +235,7 @@ enum IndexPosition {
     lowerMiddlePos,
     upperRightPos,
     lowerRightPos,
-    parentPos
+    tqparentPos
 };
 
 
@@ -364,33 +364,33 @@ public:
 };
 
 class TextCharRequest : public Request {
-    QChar m_ch;
+    TQChar m_ch;
     bool m_isSymbol;
 public:
-    TextCharRequest( QChar ch, bool isSymbol=false ) : Request( req_addTextChar ), m_ch( ch ), m_isSymbol( isSymbol ) {}
-    QChar ch() const { return m_ch; }
+    TextCharRequest( TQChar ch, bool isSymbol=false ) : Request( req_addTextChar ), m_ch( ch ), m_isSymbol( isSymbol ) {}
+    TQChar ch() const { return m_ch; }
     bool isSymbol() const { return m_isSymbol; }
 };
 
 class OperatorRequest: public Request {
-    QChar m_ch;
+    TQChar m_ch;
 public:
-    OperatorRequest( QChar ch ) : Request( req_addOperator ), m_ch( ch ) {}
-    QChar ch() const { return m_ch; }
+    OperatorRequest( TQChar ch ) : Request( req_addOperator ), m_ch( ch ) {}
+    TQChar ch() const { return m_ch; }
 };
 
 class NumberRequest: public Request {
-    QChar m_ch;
+    TQChar m_ch;
 public:
-    NumberRequest( QChar ch ) : Request( req_addNumber ), m_ch( ch ) {}
-    QChar ch() const { return m_ch; }
+    NumberRequest( TQChar ch ) : Request( req_addNumber ), m_ch( ch ) {}
+    TQChar ch() const { return m_ch; }
 };
 
 class TextRequest : public Request {
-    QString m_text;
+    TQString m_text;
 public:
-    TextRequest( QString text ) : Request( req_addText ), m_text( text ) {}
-    QString text() const { return m_text; }
+    TextRequest( TQString text ) : Request( req_addText ), m_text( text ) {}
+    TQString text() const { return m_text; }
 };
 
 class MatrixRequest : public Request {