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 --- kpresenter/KPrPieObject.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kpresenter/KPrPieObject.h') diff --git a/kpresenter/KPrPieObject.h b/kpresenter/KPrPieObject.h index 0bb75e904..0e32ad2bb 100644 --- a/kpresenter/KPrPieObject.h +++ b/kpresenter/KPrPieObject.h @@ -32,8 +32,8 @@ class KPrPieObject : public KPr2DObject, public KPrStartEndLine { public: KPrPieObject(); - KPrPieObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, BCType _gType, PieType _pieType, + KPrPieObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, PieType _pieType, int _p_angle, int _p_len, LineEnd _lineBegin, LineEnd _lineEnd, bool _unbalanced, int _xfactor, int _yfactor ); virtual ~KPrPieObject() {} @@ -53,7 +53,7 @@ public: virtual ObjType getType() const { return OT_PIE; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { switch ( pieType ) { case PT_PIE: @@ -66,7 +66,7 @@ public: return i18n("Chord"); break; } - return QString::null; + return TQString(); } virtual PieType getPieType() const @@ -80,11 +80,11 @@ public: virtual LineEnd getLineEnd() const { return lineEnd; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); + virtual double load(const TQDomElement &element); virtual void flip(bool horizontal ); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual KoSize getRealSize() const; virtual KoPoint getRealOrig() const; @@ -94,7 +94,7 @@ protected: virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; - virtual void paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ); void setMinMax( double &min_x, double &min_y, double &max_x, double &max_y, KoPoint point ) const; -- cgit v1.2.3