From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- kword/KWPartFrameSet.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'kword/KWPartFrameSet.h') diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h index 43150089..e6f052db 100644 --- a/kword/KWPartFrameSet.h +++ b/kword/KWPartFrameSet.h @@ -29,12 +29,13 @@ class KWFramePartMoveCommand; class KWPartFrameSet : public KWFrameSet { Q_OBJECT + TQ_OBJECT public: - KWPartFrameSet( KWDocument *_doc, KWDocumentChild *_child, const QString & name ); + KWPartFrameSet( KWDocument *_doc, KWDocumentChild *_child, const TQString & name ); /// Used for OASIS loading - KWPartFrameSet( KWDocument* doc, const QDomElement& frameTag, - const QDomElement& objectTag, KoOasisContext& context ); + KWPartFrameSet( KWDocument* doc, const TQDomElement& frameTag, + const TQDomElement& objectTag, KoOasisContext& context ); virtual ~KWPartFrameSet(); @@ -52,18 +53,18 @@ public: void setChild( KWDocumentChild* child ); /** - * Update the geometry of m_child based on the geometry of the frame. + * Update the tqgeometry of m_child based on the tqgeometry of the frame. */ void updateChildGeometry(); - virtual void drawFrameContents( KWFrame * frame, QPainter *painter, const QRect & fcrect, - const QColorGroup &cg, bool onlyChanged, bool resetChanged, + virtual void drawFrameContents( KWFrame * frame, TQPainter *painter, const TQRect & fcrect, + const TQColorGroup &cg, bool onlyChanged, bool resetChanged, KWFrameSetEdit * edit, KWViewMode *viewMode ); - virtual void createEmptyRegion( const QRect &crect, QRegion &emptyRegion, KWViewMode *viewMode ); + virtual void createEmptyRegion( const TQRect &crect, TQRegion &emptyRegion, KWViewMode *viewMode ); - virtual QDomElement save( QDomElement &parentElem, bool saveFrames = true ); - virtual void load( QDomElement &attributes, bool loadFrames = true ); + virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true ); + virtual void load( TQDomElement &attributes, bool loadFrames = true ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context, bool saveFrames ) const; @@ -114,9 +115,10 @@ private: }; #if 0 -class KWPartFrameSetEdit : public QObject, public KWFrameSetEdit +class KWPartFrameSetEdit : public TQObject, public KWFrameSetEdit { //Q_OBJECT + TQ_OBJECT public: KWPartFrameSetEdit( KWPartFrameSet * fs, KWCanvas * canvas ); virtual ~KWPartFrameSetEdit(); @@ -130,8 +132,8 @@ public: } // Events forwarded by the canvas (when being in "edit" mode) - //virtual void mousePressEvent( QMouseEvent *, const QPoint &, const KoPoint & ); - //virtual void mouseDoubleClickEvent( QMouseEvent *, const QPoint &, const KoPoint & ); + //virtual void mousePressEvent( TQMouseEvent *, const TQPoint &, const KoPoint & ); + //virtual void mouseDoubleClickEvent( TQMouseEvent *, const TQPoint &, const KoPoint & ); //private slots: void slotChildActivated(bool); private: @@ -148,18 +150,18 @@ class KWDocument; class KWDocumentChild : public KoDocumentChild { public: - KWDocumentChild( KWDocument *_wdoc, const QRect& _rect, KoDocument *_doc ); + KWDocumentChild( KWDocument *_wdoc, const TQRect& _rect, KoDocument *_doc ); KWDocumentChild( KWDocument *_wdoc ); ~KWDocumentChild(); - KWDocument* parent()const + KWDocument* tqparent()const { return m_pKWordDoc; } - virtual void setDocument( KoDocument *doc, const QRect &geometry ); + virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry ); void setPartFrameSet( KWPartFrameSet* fs ) { m_partFrameSet = fs; } KWPartFrameSet * partFrameSet() const { return m_partFrameSet; } - virtual KoDocument* hitTest( const QPoint& p, const QWMatrix& _matrix = QWMatrix() ); + virtual KoDocument* hitTest( const TQPoint& p, const TQWMatrix& _matrix = TQWMatrix() ); private: KWDocument *m_pKWordDoc; -- cgit v1.2.1