Expand QSpan typedef to underlying type QT_FT_Span

This frees up the QSpan name for the planned QtCore std::span
reimplementation, also called QSpan.

This is binary compatible because QSpan was just a typedef and because
it's all private API.

Task-number: QTBUG-108124
Change-Id: I3b5c1ea82673934e2d1eb490fddeae3f8e6a6ea3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index c6d723e0c3..ab0048af52 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -315,7 +315,7 @@ public:
     int clipSpanHeight;
     struct ClipLine {
         int count;
-        QSpan *spans;
+        QT_FT_Span *spans;
     } *m_clipLines;
 
     void initialize();
@@ -326,7 +326,7 @@ public:
         return m_clipLines;
     }
 
-    inline QSpan *spans() {
+    inline QT_FT_Span *spans() {
         if (!m_spans)
             initialize();
         return m_spans;
@@ -334,7 +334,7 @@ public:
 
     int allocated;
     int count;
-    QSpan *m_spans;
+    QT_FT_Span *m_spans;
     int xmin, xmax, ymin, ymax;
 
     QRect clipRect;
@@ -345,7 +345,7 @@ public:
     uint hasRegionClip : 1;
 
     void appendSpan(int x, int length, int y, int coverage);
-    void appendSpans(const QSpan *s, int num);
+    void appendSpans(const QT_FT_Span *s, int num);
 
     // ### Should optimize and actually kill the QSpans if the rect is
     // ### a subset of The current region. Thus the "fast" clipspan
@@ -361,7 +361,7 @@ inline void QClipData::appendSpan(int x, int length, int y, int coverage)
 
     if (count == allocated) {
         allocated *= 2;
-        m_spans = (QSpan *)realloc(m_spans, allocated*sizeof(QSpan));
+        m_spans = (QT_FT_Span *)realloc(m_spans, allocated*sizeof(QT_FT_Span));
     }
     m_spans[count].x = x;
     m_spans[count].len = length;
@@ -370,7 +370,7 @@ inline void QClipData::appendSpan(int x, int length, int y, int coverage)
     ++count;
 }
 
-inline void QClipData::appendSpans(const QSpan *s, int num)
+inline void QClipData::appendSpans(const QT_FT_Span *s, int num)
 {
     Q_ASSERT(m_spans);
 
@@ -378,9 +378,9 @@ inline void QClipData::appendSpans(const QSpan *s, int num)
         do {
             allocated *= 2;
         } while (count + num > allocated);
-        m_spans = (QSpan *)realloc(m_spans, allocated*sizeof(QSpan));
+        m_spans = (QT_FT_Span *)realloc(m_spans, allocated*sizeof(QT_FT_Span));
     }
-    memcpy(m_spans+count, s, num*sizeof(QSpan));
+    memcpy(m_spans+count, s, num*sizeof(QT_FT_Span));
     count += num;
 }