Changeset 846 for trunk/src/svg/qsvggraphics_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/svg/qsvggraphics_p.h (modified) (11 diffs)

trunk/src/svg/qsvggraphics_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -81 +81 @@
     virtual void draw(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
-    virtual QRectF bounds() const;
-private:
-    QPainterPath cubic;
-    QRectF m_cachedBounds;
-};
-
-class QSvgCircle : public QSvgNode
-{
-public:
-    QSvgCircle(QSvgNode *parent, const QRectF &rect);
-    virtual void draw(QPainter *p, QSvgExtraStates &states);
-    virtual Type type() const;
-    virtual QRectF bounds() const;
+    virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const;
+private:
+    QPainterPath m_path;
+};
+
+class QSvgEllipse : public QSvgNode
+{
+public:
+    QSvgEllipse(QSvgNode *parent, const QRectF &rect);
+    virtual void draw(QPainter *p, QSvgExtraStates &states);
+    virtual Type type() const;
+    virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const;
 private:
     QRectF m_bounds;
 };
 
-class QSvgEllipse : public QSvgNode
-{
-public:
-    QSvgEllipse(QSvgNode *parent, const QRectF &rect);
-    virtual void draw(QPainter *p, QSvgExtraStates &states);
-    virtual Type type() const;
-    virtual QRectF bounds() const;
-private:
-    QRectF m_bounds;
+class QSvgCircle : public QSvgEllipse
+{
+public:
+    QSvgCircle(QSvgNode *parent, const QRectF &rect) : QSvgEllipse(parent, rect) { }
+    virtual Type type() const;
 };
 
@@ -116 +111 @@
     virtual void draw(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
-    virtual QRectF bounds() const;
+    virtual QRectF bounds() const;
 private:
     QImage m_image;
@@ -128 +123 @@
     virtual void draw(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
-    virtual QRectF bounds() const;
-private:
-    QLineF m_bounds;
+    virtual QRectF bounds() const;
+private:
+    QLineF m_;
 };
 
@@ -139 +134 @@
     virtual void draw(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
-    virtual QRectF bounds() const;
+    virtual QRectF bounds() const;
 
     QPainterPath *qpath() {
@@ -146 +141 @@
 private:
     QPainterPath m_path;
-    mutable QRectF m_cachedBounds;
 };
 
@@ -155 +149 @@
     virtual void draw(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
-    virtual QRectF bounds() const;
+    virtual QRectF bounds() const;
 private:
     QPolygonF m_poly;
@@ -166 +160 @@
     virtual void draw(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
-    virtual QRectF bounds() const;
+    virtual QRectF bounds() const;
 private:
     QPolygonF m_poly;
@@ -177 +171 @@
     virtual Type type() const;
     virtual void draw(QPainter *p, QSvgExtraStates &states);
-    virtual QRectF bounds() const;
+    virtual QRectF bounds() const;
 private:
     QRectF m_rect;
@@ -206 +200 @@
     void setWhitespaceMode(WhitespaceMode mode) {m_mode = mode;}
 
-    //virtual QRectF bounds() const;
+    //virtual QRectF bounds() const;
 private:
     static QSvgTspan * const LINEBREAK;
@@ -249 +243 @@
     virtual void draw(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
-    virtual QRectF bounds() const;
-    virtual QRectF transformedBounds(const QTransform &transform) const;
+    virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const;
 
 private:
     QSvgNode *m_link;
     QPointF   m_start;
-    mutable QRectF    m_bounds;
 };