Changeset 846 for trunk/src/opengl/gl2paintengineex/qtriangulatingstroker_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/opengl/gl2paintengineex/qtriangulatingstroker_p.h (modified) (3 diffs)

trunk/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -55 +55 @@
 {
 public:
-    void process(const QVectorPath &path, const QPen &pen);
+    QTriangulatingStroker() : m_vertices(0) {}
+    void process(const QVectorPath &path, const QPen &pen, const QRectF &clip);
 
     inline int vertexCount() const { return m_vertices.size(); }
@@ -97 +98 @@
     QDashedStrokeProcessor();
 
-    void process(const QVectorPath &path, const QPen &pen);
+    void process(const QVectorPath &path, const QPen &pen, const QRectF &clip);
 
     inline void addElement(QPainterPath::ElementType type, qreal x, qreal y) {