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, 11 insertions, 11 deletions

diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h
index 4d081f2d..ff7e4ffc 100644
--- a/lib/kotext/KoTextCustomItem.h
+++ b/lib/kotext/KoTextCustomItem.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 /* This file is part of the KDE project
 
-   Original QTextCustomItem is
+   Original TQTextCustomItem is
      Copyright (C) 1999-2000 Trolltech AS.  All rights reserved.
    KoText modifications
      Copyright (C) 2001-2005 David Faure <faure@kde.org>
@@ -36,7 +36,7 @@ class KOTEXT_EXPORT KoTextCustomItem
 public:
     KoTextCustomItem( KoTextDocument *p );
     virtual ~KoTextCustomItem();
-    virtual void draw(QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected ) /* = 0*/;
+    virtual void draw(TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ) /* = 0*/;
 
     // Called after the item's paragraph has been formatted
     virtual void finalize() {}
@@ -48,7 +48,7 @@ public:
     // Called when the format of the character is being changed, see KoTextStringChar::setFormat
     virtual void setFormat( KoTextFormat * ) { }
 
-    //virtual void setPainter( QPainter*, bool adjust );
+    //virtual void setPainter( TQPainter*, bool adjust );
 
     enum Placement { PlaceInline = 0, PlaceLeft, PlaceRight };
     virtual Placement placement() const { return PlaceInline; }
@@ -57,22 +57,22 @@ public:
     virtual bool ownLine() const { return FALSE; }
     // Called for "ownline" items
     virtual void resize( int nwidth ) { width = nwidth; }
-    virtual void invalidate() {};
+    virtual void tqinvalidate() {};
 
     virtual bool isNested() const { return FALSE; }
     virtual int minimumWidth() const { return 0; }
     virtual int widthHint() const { return 0; }
     virtual int ascent() const { return height; }
 
-    virtual QString richText() const { return QString::null; }
+    virtual TQString richText() const { return TQString(); }
 
     int width;
     int height;
 
-    QRect geometry() const { return QRect( xpos, ypos, width, height ); }
+    TQRect tqgeometry() const { return TQRect( xpos, ypos, width, height ); }
 
     virtual bool enter( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd = FALSE );
-    virtual bool enterAt( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy, const QPoint & );
+    virtual bool enterAt( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy, const TQPoint & );
     virtual bool next( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy );
     virtual bool prev( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy );
     virtual bool down( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy );
@@ -83,12 +83,12 @@ public:
 
     virtual void pageBreak( int /*y*/, KoTextFlow* /*flow*/ ) {}
 
-    KoTextDocument *parent;
+    KoTextDocument *tqparent;
 
 
 
     /** The text document in which this customitem is */
-    KoTextDocument * textDocument() const { return parent; }
+    KoTextDocument * textDocument() const { return tqparent; }
 
     /** When the user deletes a custom item, it isn't destroyed but
      * moved into the undo/redo history - setDeleted( true )
@@ -106,7 +106,7 @@ public:
     virtual KCommand * deleteCommand() { return 0L; }
 
     /** Save to XML */
-    virtual void save( QDomElement& formatElem ) = 0;
+    virtual void save( TQDomElement& formatElem ) = 0;
     /** Save to Oasis XML */
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const = 0;
     /** Return type of custom item. See DTD for VARIABLE.id docu. */
@@ -133,7 +133,7 @@ public:
     /**
      * All coordinates are in pixels.
      */
-    virtual void drawCustomItem(QPainter* p, int x, int y, int wpix, int hpix, int ascentpix, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected, int offset,  bool drawingShadow) = 0;
+    virtual void drawCustomItem(TQPainter* p, int x, int y, int wpix, int hpix, int ascentpix, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected, int offset,  bool drawingShadow) = 0;
 
 protected:
     bool m_deleted;