Changeset 846 for trunk/src/gui/painting/qpaintbuffer_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/gui/painting/qpaintbuffer_p.h (modified) (5 diffs)

trunk/src/gui/painting/qpaintbuffer_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)
@@ -79 +79 @@
 
     void draw(QPainter *painter, int frame = 0) const;
+
+    int frameStartIndex(int frame) const;
+    int frameEndIndex(int frame) const;
+    int processCommands(QPainter *painter, int begin, int end) const;
+#ifndef QT_NO_DEBUG_STREAM
+    QString commandDescription(int command) const;
+#endif
+
     void setBoundingRect(const QRectF &rect);
     QRectF boundingRect() const;
@@ -184 +192 @@
 
         Cmd_SystemStateChanged,
+        Cmd_Translate,
+        Cmd_DrawStaticText,
+
+        // new commands must be added above this line
 
         Cmd_LastCommand
@@ -314 +326 @@
     void setupTransform(QPainter *painter);
     virtual void process(const QPaintBufferCommand &cmd);
-    void draw(const QPaintBuffer &buffer, QPainter *painter, int frame);
+    void processCommands(const QPaintBuffer &buffer, QPainter *painter, int begin, int end);
 
 protected:
@@ -395 +407 @@
 
     virtual void drawTextItem(const QPointF &pos, const QTextItem &ti);
+    virtual void drawStaticTextItem(QStaticTextItem *staticTextItem);
 
     virtual void setState(QPainterState *s);