Changeset 846 for trunk/src/svg/qsvgstyle_p.h
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/svg/qsvgstyle_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 173 173 public: 174 174 virtual ~QSvgStyleProperty(); 175 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states) =0;175 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) = 0; 176 176 virtual void revert(QPainter *p, QSvgExtraStates &states) =0; 177 177 virtual Type type() const=0; … … 182 182 public: 183 183 virtual QBrush brush(QPainter *p, QSvgExtraStates &states) = 0; 184 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);184 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 185 185 virtual void revert(QPainter *p, QSvgExtraStates &states); 186 186 }; … … 190 190 public: 191 191 QSvgQualityStyle(int color); 192 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);192 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 193 193 virtual void revert(QPainter *p, QSvgExtraStates &states); 194 194 virtual Type type() const; … … 222 222 public: 223 223 QSvgOpacityStyle(qreal opacity); 224 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);224 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 225 225 virtual void revert(QPainter *p, QSvgExtraStates &states); 226 226 virtual Type type() const; … … 234 234 public: 235 235 QSvgFillStyle(); 236 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);236 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 237 237 virtual void revert(QPainter *p, QSvgExtraStates &states); 238 238 virtual Type type() const; … … 307 307 public: 308 308 QSvgViewportFillStyle(const QBrush &brush); 309 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);309 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 310 310 virtual void revert(QPainter *p, QSvgExtraStates &states); 311 311 virtual Type type() const; … … 331 331 QSvgFontStyle(QSvgFont *font, QSvgTinyDocument *doc); 332 332 QSvgFontStyle(); 333 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);333 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 334 334 virtual void revert(QPainter *p, QSvgExtraStates &states); 335 335 virtual Type type() const; … … 339 339 // Store the _pixel_ size in the font. Since QFont::setPixelSize() only takes an int, call 340 340 // QFont::SetPointSize() instead. Set proper font size just before rendering. 341 m_qfont.setPointSize (size);341 m_qfont.setPointSizeF(size); 342 342 m_sizeSet = 1; 343 343 } … … 411 411 public: 412 412 QSvgStrokeStyle(); 413 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);413 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 414 414 virtual void revert(QPainter *p, QSvgExtraStates &states); 415 415 virtual Type type() const; … … 618 618 public: 619 619 QSvgTransformStyle(const QTransform &transform); 620 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);620 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 621 621 virtual void revert(QPainter *p, QSvgExtraStates &states); 622 622 virtual Type type() const; … … 655 655 void setFreeze(bool freeze); 656 656 void setRepeatCount(qreal repeatCount); 657 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);657 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 658 658 virtual void revert(QPainter *p, QSvgExtraStates &states); 659 659 virtual Type type() const; … … 689 689 690 690 protected: 691 void resolveMatrix( QSvgNode *node);691 void resolveMatrix(const QSvgNode *node); 692 692 private: 693 693 qreal m_from, m_to, m_by; … … 713 713 void setFreeze(bool freeze); 714 714 void setRepeatCount(qreal repeatCount); 715 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);715 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 716 716 virtual void revert(QPainter *p, QSvgExtraStates &states); 717 717 virtual Type type() const; … … 733 733 public: 734 734 QSvgCompOpStyle(QPainter::CompositionMode mode); 735 virtual void apply(QPainter *p, const Q RectF &, QSvgNode *node, QSvgExtraStates &states);735 virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 736 736 virtual void revert(QPainter *p, QSvgExtraStates &states); 737 737 virtual Type type() const; … … 767 767 ~QSvgStyle(); 768 768 769 void apply(QPainter *p, const Q RectF &rect, QSvgNode *node, QSvgExtraStates &states);769 void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); 770 770 void revert(QPainter *p, QSvgExtraStates &states); 771 771 QSvgRefCounter<QSvgQualityStyle> quality;
Note:
See TracChangeset
for help on using the changeset viewer.