Remove some VC6 Template workaround in the drawhelper code

Reviewed-by: Samuel

1 files changed, 91 insertions, 357 deletions

diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index f8c5475..47dbf1b 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -157,46 +157,9 @@ static uint * QT_FASTCALL destFetchRGB16(uint *buffer, QRasterBuffer *rasterBuff
     return buffer;
 }
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300 && !defined(Q_CC_INTEL)
-template <typename EnumType, int value>
-class QEnumToType
-{
-public:
-    inline EnumType operator()() const
-    {
-        return EnumType(value);
-    }
-};
-template <QImage::Format format>
-class QImageFormatToType
-{
-public:
-    inline QImage::Format operator()() const
-    {
-        return format;
-    }
-};
-// Would have used QEnumToType instead of creating a specialized version for QImageFormatToType,
-// but that causes internal compiler error on VC6
-#define Q_TEMPLATE_IMAGEFORMAT_FIX(format) , const QImageFormatToType<format> &imageFormatType
-#define Q_TEMPLATE_IMAGEFORMAT_CALL(format) , QImageFormatToType<format>()
-#define Q_TEMPLATE_ENUM_FIX(Type, Value) , const QEnumToType<Type, Value> &enumTemplateType
-#define Q_TEMPLATE_ENUM_CALL(Type, Value) , QEnumToType<Type, Value>()
-#define Q_TEMPLATE_FIX(Type) , const QTypeInfo<Type> &templateType
-#define Q_TEMPLATE_CALL(Type) , QTypeInfo<Type>()
-#else
-#define Q_TEMPLATE_IMAGEFORMAT_FIX(format)
-#define Q_TEMPLATE_IMAGEFORMAT_CALL(format)
-#define Q_TEMPLATE_ENUM_FIX(Type, Value)
-#define Q_TEMPLATE_ENUM_CALL(Type, Value)
-#define Q_TEMPLATE_FIX(Type)
-#define Q_TEMPLATE_CALL(Type)
-#endif
-
 template <class DST>
 Q_STATIC_TEMPLATE_FUNCTION uint * QT_FASTCALL destFetch(uint *buffer, QRasterBuffer *rasterBuffer,
-                                    int x, int y, int length
-                                    Q_TEMPLATE_FIX(DST))
+                                    int x, int y, int length)
 {
     const DST *src = reinterpret_cast<DST*>(rasterBuffer->scanLine(y)) + x;
     quint32 *dest = reinterpret_cast<quint32*>(buffer);
@@ -205,28 +168,7 @@ Q_STATIC_TEMPLATE_FUNCTION uint * QT_FASTCALL destFetch(uint *buffer, QRasterBuf
     return buffer;
 }
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300 && !defined(Q_CC_INTEL)
-#define DEST_FETCH_DECL(DST)                                            \
-    static uint * QT_FASTCALL destFetch_##DST(uint *buffer,             \
-                                              QRasterBuffer *rasterBuffer, \
-                                              int x, int y, int length) \
-    {                                                                   \
-        return destFetch<DST>(buffer, rasterBuffer, x, y, length Q_TEMPLATE_CALL(DST));      \
-    }
-
-DEST_FETCH_DECL(qargb8565)
-DEST_FETCH_DECL(qrgb666)
-DEST_FETCH_DECL(qargb6666)
-DEST_FETCH_DECL(qrgb555)
-DEST_FETCH_DECL(qrgb888)
-DEST_FETCH_DECL(qargb8555)
-DEST_FETCH_DECL(qrgb444)
-DEST_FETCH_DECL(qargb4444)
-#undef DEST_FETCH_DECL
-# define SPANFUNC_POINTER_DESTFETCH(Arg) destFetch_##Arg
-#else // !VC6 && !VC2002
 # define SPANFUNC_POINTER_DESTFETCH(Arg) destFetch<Arg>
-#endif
 
 static const DestFetchProc destFetchProc[QImage::NImageFormats] =
 {
@@ -366,8 +308,7 @@ static void QT_FASTCALL destStoreRGB16(QRasterBuffer *rasterBuffer, int x, int y
 template <class DST>
 Q_STATIC_TEMPLATE_FUNCTION void QT_FASTCALL destStore(QRasterBuffer *rasterBuffer,
                                   int x, int y,
-                                  const uint *buffer, int length
-                                  Q_TEMPLATE_FIX(DST))
+                                  const uint *buffer, int length)
 {
     DST *dest = reinterpret_cast<DST*>(rasterBuffer->scanLine(y)) + x;
     const quint32 *src = reinterpret_cast<const quint32*>(buffer);
@@ -375,28 +316,7 @@ Q_STATIC_TEMPLATE_FUNCTION void QT_FASTCALL destStore(QRasterBuffer *rasterBuffe
         *dest++ = DST(*src++);
 }
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300 && !defined(Q_CC_INTEL)
-# define DEST_STORE_DECL(DST)                                           \
-    static void QT_FASTCALL destStore_##DST(QRasterBuffer *rasterBuffer, \
-                                            int x, int y,               \
-                                            const uint *buffer, int length) \
-    {                                                                   \
-        destStore<DST>(rasterBuffer, x, y, buffer, length Q_TEMPLATE_CALL(DST));             \
-    }
-
-DEST_STORE_DECL(qargb8565)
-DEST_STORE_DECL(qrgb555)
-DEST_STORE_DECL(qrgb666)
-DEST_STORE_DECL(qargb6666)
-DEST_STORE_DECL(qargb8555)
-DEST_STORE_DECL(qrgb888)
-DEST_STORE_DECL(qrgb444)
-DEST_STORE_DECL(qargb4444)
-# undef DEST_FETCH_DECL
-# define SPANFUNC_POINTER_DESTSTORE(DEST) destStore_##DEST
-#else // !VC6 && !VC2002
 # define SPANFUNC_POINTER_DESTSTORE(DEST) destStore<DEST>
-#endif
 
 static const DestStoreProc destStoreProc[QImage::NImageFormats] =
 {
@@ -434,14 +354,12 @@ static const DestStoreProc destStoreProc[QImage::NImageFormats] =
 */
 
 template <QImage::Format format>
-Q_STATIC_TEMPLATE_FUNCTION uint QT_FASTCALL qt_fetchPixel(const uchar *scanLine, int x, const QVector<QRgb> *rgb
-                                   Q_TEMPLATE_IMAGEFORMAT_FIX(format));
+Q_STATIC_TEMPLATE_FUNCTION uint QT_FASTCALL qt_fetchPixel(const uchar *scanLine, int x, const QVector<QRgb> *rgb);
 
 template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_Mono>(const uchar *scanLine,
-                                                 int x, const QVector<QRgb> *rgb
-                                                 Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_Mono))
+                                                 int x, const QVector<QRgb> *rgb)
 {
     bool pixel = scanLine[x>>3] & (0x80 >> (x & 7));
     if (rgb) return PREMUL(rgb->at(pixel ? 1 : 0));
@@ -451,8 +369,7 @@ uint QT_FASTCALL qt_fetchPixel<QImage::Format_Mono>(const uchar *scanLine,
 template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_MonoLSB>(const uchar *scanLine,
-                                                    int x, const QVector<QRgb> *rgb
-                                                    Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_MonoLSB))
+                                                    int x, const QVector<QRgb> *rgb)
 {
     bool pixel = scanLine[x>>3] & (0x1 << (x & 7));
     if (rgb) return PREMUL(rgb->at(pixel ? 1 : 0));
@@ -462,8 +379,7 @@ uint QT_FASTCALL qt_fetchPixel<QImage::Format_MonoLSB>(const uchar *scanLine,
 template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_Indexed8>(const uchar *scanLine,
-                                                     int x, const QVector<QRgb> *rgb
-                                                     Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_Indexed8))
+                                                     int x, const QVector<QRgb> *rgb)
 {
     return PREMUL(rgb->at(scanLine[x]));
 }
@@ -471,8 +387,7 @@ uint QT_FASTCALL qt_fetchPixel<QImage::Format_Indexed8>(const uchar *scanLine,
 template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB32>(const uchar *scanLine,
-                                                   int x, const QVector<QRgb> *
-                                                   Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_ARGB32))
+                                                   int x, const QVector<QRgb> *)
 {
     return PREMUL(((const uint *)scanLine)[x]);
 }
@@ -480,8 +395,7 @@ uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB32>(const uchar *scanLine,
 template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB32_Premultiplied>(const uchar *scanLine,
-                                                                 int x, const QVector<QRgb> *
-                                                                 Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_ARGB32_Premultiplied))
+                                                                 int x, const QVector<QRgb> *)
 {
     return ((const uint *)scanLine)[x];
 }
@@ -489,8 +403,7 @@ uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB32_Premultiplied>(const uchar
 template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_RGB16>(const uchar *scanLine,
-                                                  int x, const QVector<QRgb> *
-                                                  Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_RGB16))
+                                                  int x, const QVector<QRgb> *)
 {
     return qConvertRgb16To32(((const ushort *)scanLine)[x]);
 }
@@ -499,8 +412,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB8565_Premultiplied>(const uchar *scanLine,
                                                      int x,
-                                                     const QVector<QRgb> *
-                                                     Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_ARGB8565_Premultiplied))
+                                                     const QVector<QRgb> *)
 {
     const qargb8565 color = reinterpret_cast<const qargb8565*>(scanLine)[x];
     return qt_colorConvert<quint32, qargb8565>(color, 0);
@@ -510,8 +422,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_RGB666>(const uchar *scanLine,
                                                    int x,
-                                                   const QVector<QRgb> *
-                                                   Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_RGB666))
+                                                   const QVector<QRgb> *)
 {
     const qrgb666 color = reinterpret_cast<const qrgb666*>(scanLine)[x];
     return qt_colorConvert<quint32, qrgb666>(color, 0);
@@ -521,8 +432,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB6666_Premultiplied>(const uchar *scanLine,
                                                    int x,
-                                                   const QVector<QRgb> *
-                                                   Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_ARGB6666_Premultiplied))
+                                                   const QVector<QRgb> *)
 {
     const qargb6666 color = reinterpret_cast<const qargb6666*>(scanLine)[x];
     return qt_colorConvert<quint32, qargb6666>(color, 0);
@@ -532,8 +442,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_RGB555>(const uchar *scanLine,
                                                    int x,
-                                                   const QVector<QRgb> *
-                                                   Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_RGB555))
+                                                   const QVector<QRgb> *)
 {
     const qrgb555 color = reinterpret_cast<const qrgb555*>(scanLine)[x];
     return qt_colorConvert<quint32, qrgb555>(color, 0);
@@ -543,8 +452,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB8555_Premultiplied>(const uchar *scanLine,
                                                      int x,
-                                                     const QVector<QRgb> *
-                                                     Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_ARGB8555_Premultiplied))
+                                                     const QVector<QRgb> *)
 {
     const qargb8555 color = reinterpret_cast<const qargb8555*>(scanLine)[x];
     return qt_colorConvert<quint32, qargb8555>(color, 0);
@@ -554,8 +462,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_RGB888>(const uchar *scanLine,
                                                    int x,
-                                                   const QVector<QRgb> *
-                                                   Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_RGB888))
+                                                   const QVector<QRgb> *)
 {
     const qrgb888 color = reinterpret_cast<const qrgb888*>(scanLine)[x];
     return qt_colorConvert<quint32, qrgb888>(color, 0);
@@ -565,8 +472,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_RGB444>(const uchar *scanLine,
                                                    int x,
-                                                   const QVector<QRgb> *
-                                                   Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_RGB444))
+                                                   const QVector<QRgb> *)
 {
     const qrgb444 color = reinterpret_cast<const qrgb444*>(scanLine)[x];
     return qt_colorConvert<quint32, qrgb444>(color, 0);
@@ -576,8 +482,7 @@ template<>
 Q_STATIC_TEMPLATE_SPECIALIZATION
 uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB4444_Premultiplied>(const uchar *scanLine,
                                                      int x,
-                                                     const QVector<QRgb> *
-                                                     Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_ARGB4444_Premultiplied))
+                                                     const QVector<QRgb> *)
 {
     const qargb4444 color = reinterpret_cast<const qargb4444*>(scanLine)[x];
     return qt_colorConvert<quint32, qargb4444>(color, 0);
@@ -585,38 +490,7 @@ uint QT_FASTCALL qt_fetchPixel<QImage::Format_ARGB4444_Premultiplied>(const ucha
 
 typedef uint (QT_FASTCALL *FetchPixelProc)(const uchar *scanLine, int x, const QVector<QRgb> *);
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300 && !defined(Q_CC_INTEL)
-
-// explicit template instantiations needed to compile with VC6 and VC2002
-
-#define SPANFUNC_INSTANTIATION_FETCHPIXEL(Arg)  \
-        static inline uint fetchPixel_##Arg(const uchar * scanLine, int x, const QVector<QRgb> * rgb) \
-{ \
-        return qt_fetchPixel<QImage::Arg>(scanLine, x, rgb Q_TEMPLATE_IMAGEFORMAT_CALL(QImage::Arg)); \
-}
-
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_Mono);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_MonoLSB);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_Indexed8);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_ARGB32_Premultiplied);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_ARGB32);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_RGB16);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_ARGB8565_Premultiplied);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_RGB666);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_ARGB6666_Premultiplied);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_RGB555);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_ARGB8555_Premultiplied);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_RGB888);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_RGB444);
-SPANFUNC_INSTANTIATION_FETCHPIXEL(Format_ARGB4444_Premultiplied);
-
-#undef SPANFUNC_INSTANTIATION_FETCHPIXEL
-
-#define SPANFUNC_POINTER_FETCHPIXEL(Arg) fetchPixel_##Arg
-
-#else // !VC6 && !VC2002
-# define SPANFUNC_POINTER_FETCHPIXEL(Arg) qt_fetchPixel<QImage::Arg>
-#endif
+#define SPANFUNC_POINTER_FETCHPIXEL(Arg) qt_fetchPixel<QImage::Arg>
 
 
 static const FetchPixelProc fetchPixelProc[QImage::NImageFormats] =
@@ -651,11 +525,11 @@ enum TextureBlendType {
 
 template <QImage::Format format>
 Q_STATIC_TEMPLATE_FUNCTION const uint * QT_FASTCALL qt_fetchUntransformed(uint *buffer, const Operator *, const QSpanData *data,
-                                             int y, int x, int length Q_TEMPLATE_IMAGEFORMAT_FIX(format))
+                                             int y, int x, int length)
 {
     const uchar *scanLine = data->texture.scanLine(y);
     for (int i = 0; i < length; ++i)
-        buffer[i] = qt_fetchPixel<format>(scanLine, x + i, data->texture.colorTable Q_TEMPLATE_IMAGEFORMAT_CALL(format));
+        buffer[i] = qt_fetchPixel<format>(scanLine, x + i, data->texture.colorTable);
     return buffer;
 }
 
@@ -663,7 +537,7 @@ template <>
 Q_STATIC_TEMPLATE_SPECIALIZATION const uint * QT_FASTCALL
 qt_fetchUntransformed<QImage::Format_ARGB32_Premultiplied>(uint *, const Operator *,
                                                          const QSpanData *data,
-                                                         int y, int x, int Q_TEMPLATE_IMAGEFORMAT_FIX(QImage::Format_ARGB32_Premultiplied))
+                                                         int y, int x, int)
 {
     const uchar *scanLine = data->texture.scanLine(y);
     return ((const uint *)scanLine) + x;
@@ -914,39 +788,7 @@ const uint * QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *
     return buffer;
 }
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300 && !defined(Q_CC_INTEL)
-
-// explicit template instantiations needed to compile with VC6 and VC2002
-
-#define SPANFUNC_POINTER_FETCHUNTRANSFORMED(Arg)  \
-        const uint *qt_fetchUntransformed_##Arg(uint *buffer, const Operator *op, const QSpanData *data, \
-                                             int y, int x, int length) \
-{ \
-        return qt_fetchUntransformed<QImage::Arg>(buffer, op, data, y, x, length Q_TEMPLATE_IMAGEFORMAT_CALL(QImage::Arg)); \
-}
-
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_Mono);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_MonoLSB);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_Indexed8);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_ARGB32_Premultiplied);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_ARGB32);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_RGB16);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_ARGB8565_Premultiplied);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_RGB666);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_ARGB6666_Premultiplied);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_RGB555);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_ARGB8555_Premultiplied);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_RGB888);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_RGB444);
-SPANFUNC_POINTER_FETCHUNTRANSFORMED(Format_ARGB4444_Premultiplied);
-
-#undef SPANFUNC_POINTER_FETCHUNTRANSFORMED
-
-#define SPANFUNC_POINTER_FETCHHUNTRANSFORMED(Arg) qt_fetchUntransformed_##Arg
-
-#else // !VC6 && !VC2002
-# define SPANFUNC_POINTER_FETCHHUNTRANSFORMED(Arg) qt_fetchUntransformed<QImage::Arg>
-#endif
+#define SPANFUNC_POINTER_FETCHHUNTRANSFORMED(Arg) qt_fetchUntransformed<QImage::Arg>
 
 static const SourceFetchProc sourceFetch[NBlendTypes][QImage::NImageFormats] = {
     // Untransformed
@@ -3075,8 +2917,7 @@ static void blend_color_argb(int count, const QSpan *spans, void *userData)
 }
 
 template <class T>
-Q_STATIC_TEMPLATE_FUNCTION void blendColor(int count, const QSpan *spans, void *userData
-                       Q_TEMPLATE_FIX(T))
+Q_STATIC_TEMPLATE_FUNCTION void blendColor(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     Operator op = getOperator(data, spans, count);
@@ -3122,28 +2963,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendColor(int count, const QSpan *spans, void *
     blend_color_generic(count, spans, userData);
 }
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300 && !defined(Q_CC_INTEL)
-#define BLEND_COLOR_DECL(DST)                                           \
-    static void blendColor_##DST(int count,                             \
-                                 const QSpan *spans,                    \
-                                 void *userData)                        \
-    {                                                                   \
-        blendColor<DST>(count, spans, userData Q_TEMPLATE_CALL(DST));   \
-    }
-
-BLEND_COLOR_DECL(qargb8565)
-BLEND_COLOR_DECL(qrgb666)
-BLEND_COLOR_DECL(qargb6666)
-BLEND_COLOR_DECL(qrgb555)
-BLEND_COLOR_DECL(qargb8555)
-BLEND_COLOR_DECL(qrgb888)
-BLEND_COLOR_DECL(qrgb444)
-BLEND_COLOR_DECL(qargb4444)
-#undef DEST_FETCH_DECL
-#define SPANFUNC_POINTER_BLENDCOLOR(DST) blendColor_##DST
-#else // !VC6 && !VC2002
-# define SPANFUNC_POINTER_BLENDCOLOR(DST) blendColor<DST>
-#endif
+#define SPANFUNC_POINTER_BLENDCOLOR(DST) blendColor<DST>
 
 static void blend_color_rgb16(int count, const QSpan *spans, void *userData)
 {
@@ -3222,8 +3042,7 @@ static void blend_color_rgb16(int count, const QSpan *spans, void *userData)
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_src_generic(int count, const QSpan *spans, void *userData
-                              Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_src_generic(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
 
@@ -3258,8 +3077,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_src_generic(int count, const QSpan *spans,
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_untransformed_generic(int count, const QSpan *spans, void *userData
-                                        Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_untransformed_generic(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
 
@@ -3310,13 +3128,12 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_untransformed_generic(int count, const QSp
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_untransformed_argb(int count, const QSpan *spans, void *userData
-                                     Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_untransformed_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     if (data->texture.format != QImage::Format_ARGB32_Premultiplied
         && data->texture.format != QImage::Format_RGB32) {
-        blend_untransformed_generic<spanMethod>(count, spans, userData Q_TEMPLATE_ENUM_CALL(SpanMethod, spanMethod));
+        blend_untransformed_generic<spanMethod>(count, spans, userData);
         return;
     }
 
@@ -4562,8 +4379,7 @@ void QT_FASTCALL blendUntransformed(int count, const QSpan *spans, void *userDat
     if (mode != QPainter::CompositionMode_SourceOver &&
         mode != QPainter::CompositionMode_Source)
     {
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
         return;
     }
 
@@ -4625,8 +4441,7 @@ static void blend_untransformed_rgb888(int count, const QSpan *spans,
         blendUntransformed<qrgb888, qrgb888>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_argb6666(int count, const QSpan *spans,
@@ -4641,8 +4456,7 @@ static void blend_untransformed_argb6666(int count, const QSpan *spans,
         blendUntransformed<qargb6666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_rgb666(int count, const QSpan *spans,
@@ -4657,8 +4471,7 @@ static void blend_untransformed_rgb666(int count, const QSpan *spans,
         blendUntransformed<qrgb666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_argb8565(int count, const QSpan *spans,
@@ -4673,8 +4486,7 @@ static void blend_untransformed_argb8565(int count, const QSpan *spans,
         blendUntransformed<qargb8565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_rgb565(int count, const QSpan *spans,
@@ -4689,8 +4501,7 @@ static void blend_untransformed_rgb565(int count, const QSpan *spans,
         blendUntransformed<qrgb565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_argb8555(int count, const QSpan *spans,
@@ -4705,8 +4516,7 @@ static void blend_untransformed_argb8555(int count, const QSpan *spans,
         blendUntransformed<qargb8555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_rgb555(int count, const QSpan *spans,
@@ -4721,8 +4531,7 @@ static void blend_untransformed_rgb555(int count, const QSpan *spans,
         blendUntransformed<qrgb555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_argb4444(int count, const QSpan *spans,
@@ -4737,8 +4546,7 @@ static void blend_untransformed_argb4444(int count, const QSpan *spans,
         blendUntransformed<qargb4444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_untransformed_rgb444(int count, const QSpan *spans,
@@ -4753,13 +4561,11 @@ static void blend_untransformed_rgb444(int count, const QSpan *spans,
         blendUntransformed<qrgb444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_untransformed_generic<RegularSpans>(count, spans, userData
-                                                  Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_untransformed_generic<RegularSpans>(count, spans, userData);
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_tiled_generic(int count, const QSpan *spans, void *userData
-                                Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_tiled_generic(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
 
@@ -4813,13 +4619,12 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_tiled_generic(int count, const QSpan *span
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_tiled_argb(int count, const QSpan *spans, void *userData
-                             Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_tiled_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     if (data->texture.format != QImage::Format_ARGB32_Premultiplied
         && data->texture.format != QImage::Format_RGB32) {
-        blend_tiled_generic<spanMethod>(count, spans, userData Q_TEMPLATE_ENUM_CALL(SpanMethod, spanMethod));
+        blend_tiled_generic<spanMethod>(count, spans, userData);
         return;
     }
 
@@ -4875,8 +4680,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTiled(int count, const QSpan *spans, void *
     if (mode != QPainter::CompositionMode_SourceOver &&
         mode != QPainter::CompositionMode_Source)
     {
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
         return;
     }
 
@@ -4946,8 +4750,7 @@ static void blend_tiled_rgb888(int count, const QSpan *spans, void *userData)
         blendTiled<qrgb888, qrgb888>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_argb6666(int count, const QSpan *spans, void *userData)
@@ -4961,8 +4764,7 @@ static void blend_tiled_argb6666(int count, const QSpan *spans, void *userData)
         blendTiled<qargb6666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_rgb666(int count, const QSpan *spans, void *userData)
@@ -4976,8 +4778,7 @@ static void blend_tiled_rgb666(int count, const QSpan *spans, void *userData)
         blendTiled<qrgb666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_argb8565(int count, const QSpan *spans, void *userData)
@@ -4991,8 +4792,7 @@ static void blend_tiled_argb8565(int count, const QSpan *spans, void *userData)
         blendTiled<qargb8565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_rgb565(int count, const QSpan *spans, void *userData)
@@ -5006,8 +4806,7 @@ static void blend_tiled_rgb565(int count, const QSpan *spans, void *userData)
         blendTiled<qrgb565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_argb8555(int count, const QSpan *spans, void *userData)
@@ -5021,8 +4820,7 @@ static void blend_tiled_argb8555(int count, const QSpan *spans, void *userData)
         blendTiled<qargb8555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_rgb555(int count, const QSpan *spans, void *userData)
@@ -5036,8 +4834,7 @@ static void blend_tiled_rgb555(int count, const QSpan *spans, void *userData)
         blendTiled<qrgb555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_argb4444(int count, const QSpan *spans, void *userData)
@@ -5051,8 +4848,7 @@ static void blend_tiled_argb4444(int count, const QSpan *spans, void *userData)
         blendTiled<qargb4444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_tiled_rgb444(int count, const QSpan *spans, void *userData)
@@ -5066,19 +4862,17 @@ static void blend_tiled_rgb444(int count, const QSpan *spans, void *userData)
         blendTiled<qrgb444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_tiled_generic<RegularSpans>(count, spans, userData
-                                          Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_tiled_generic<RegularSpans>(count, spans, userData);
 }
 
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const QSpan *spans, void *userData
-                                            Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     if (data->texture.format != QImage::Format_ARGB32_Premultiplied
         && data->texture.format != QImage::Format_RGB32) {
-        blend_src_generic<spanMethod>(count, spans, userData Q_TEMPLATE_ENUM_CALL(SpanMethod, spanMethod));
+        blend_src_generic<spanMethod>(count, spans, userData);
         return;
     }
 
@@ -5257,8 +5051,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformedBilinear(int count, const QSpan
 
 
     if (mode != QPainter::CompositionMode_SourceOver) {
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
         return;
     }
 
@@ -5461,8 +5254,7 @@ static void blend_transformed_bilinear_rgb888(int count, const QSpan *spans, voi
         blendTransformedBilinear<qrgb888, qrgb888>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_argb6666(int count, const QSpan *spans, void *userData)
@@ -5476,8 +5268,7 @@ static void blend_transformed_bilinear_argb6666(int count, const QSpan *spans, v
         blendTransformedBilinear<qargb6666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_rgb666(int count, const QSpan *spans, void *userData)
@@ -5491,8 +5282,7 @@ static void blend_transformed_bilinear_rgb666(int count, const QSpan *spans, voi
         blendTransformedBilinear<qrgb666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_argb8565(int count, const QSpan *spans, void *userData)
@@ -5506,8 +5296,7 @@ static void blend_transformed_bilinear_argb8565(int count, const QSpan *spans, v
         blendTransformedBilinear<qargb8565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_rgb565(int count, const QSpan *spans,
@@ -5522,8 +5311,7 @@ static void blend_transformed_bilinear_rgb565(int count, const QSpan *spans,
         blendTransformedBilinear<qrgb565, qargb8565>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_argb8555(int count, const QSpan *spans, void *userData)
@@ -5537,8 +5325,7 @@ static void blend_transformed_bilinear_argb8555(int count, const QSpan *spans, v
         blendTransformedBilinear<qargb8555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_rgb555(int count, const QSpan *spans, void *userData)
@@ -5552,8 +5339,7 @@ static void blend_transformed_bilinear_rgb555(int count, const QSpan *spans, voi
         blendTransformedBilinear<qrgb555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_argb4444(int count, const QSpan *spans, void *userData)
@@ -5567,8 +5353,7 @@ static void blend_transformed_bilinear_argb4444(int count, const QSpan *spans, v
         blendTransformedBilinear<qargb4444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_bilinear_rgb444(int count, const QSpan *spans, void *userData)
@@ -5582,18 +5367,16 @@ static void blend_transformed_bilinear_rgb444(int count, const QSpan *spans, voi
         blendTransformedBilinear<qrgb444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_tiled_argb(int count, const QSpan *spans, void *userData
-                                                  Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_tiled_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     if (data->texture.format != QImage::Format_ARGB32_Premultiplied
         && data->texture.format != QImage::Format_RGB32) {
-        blend_src_generic<spanMethod>(count, spans, userData Q_TEMPLATE_ENUM_CALL(SpanMethod, spanMethod));
+        blend_src_generic<spanMethod>(count, spans, userData);
         return;
     }
 
@@ -5779,13 +5562,12 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_tiled_argb(int count,
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_argb(int count, const QSpan *spans, void *userData
-                                   Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     if (data->texture.format != QImage::Format_ARGB32_Premultiplied
         && data->texture.format != QImage::Format_RGB32) {
-        blend_src_generic<spanMethod>(count, spans, userData Q_TEMPLATE_ENUM_CALL(SpanMethod, spanMethod));
+        blend_src_generic<spanMethod>(count, spans, userData);
         return;
     }
 
@@ -5907,8 +5689,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformed(int count, const QSpan *spans,
     QPainter::CompositionMode mode = data->rasterBuffer->compositionMode;
 
     if (mode != QPainter::CompositionMode_SourceOver) {
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
         return;
     }
 
@@ -6057,8 +5838,7 @@ static void blend_transformed_rgb888(int count, const QSpan *spans,
         blendTransformed<qrgb888, qrgb888>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_argb6666(int count, const QSpan *spans,
@@ -6073,8 +5853,7 @@ static void blend_transformed_argb6666(int count, const QSpan *spans,
         blendTransformed<qargb6666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_rgb666(int count, const QSpan *spans,
@@ -6089,8 +5868,7 @@ static void blend_transformed_rgb666(int count, const QSpan *spans,
         blendTransformed<qrgb666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_argb8565(int count, const QSpan *spans,
@@ -6105,8 +5883,7 @@ static void blend_transformed_argb8565(int count, const QSpan *spans,
         blendTransformed<qargb8565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_rgb565(int count, const QSpan *spans,
@@ -6121,8 +5898,7 @@ static void blend_transformed_rgb565(int count, const QSpan *spans,
         blendTransformed<qrgb565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_argb8555(int count, const QSpan *spans,
@@ -6137,8 +5913,7 @@ static void blend_transformed_argb8555(int count, const QSpan *spans,
         blendTransformed<qargb8555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_rgb555(int count, const QSpan *spans,
@@ -6153,8 +5928,7 @@ static void blend_transformed_rgb555(int count, const QSpan *spans,
         blendTransformed<qrgb555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_argb4444(int count, const QSpan *spans,
@@ -6169,8 +5943,7 @@ static void blend_transformed_argb4444(int count, const QSpan *spans,
         blendTransformed<qargb4444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_rgb444(int count, const QSpan *spans,
@@ -6185,18 +5958,16 @@ static void blend_transformed_rgb444(int count, const QSpan *spans,
         blendTransformed<qrgb444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_tiled_argb(int count, const QSpan *spans, void *userData
-                                         Q_TEMPLATE_ENUM_FIX(SpanMethod, spanMethod))
+Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_tiled_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
     if (data->texture.format != QImage::Format_ARGB32_Premultiplied
         && data->texture.format != QImage::Format_RGB32) {
-        blend_src_generic<spanMethod>(count, spans, userData Q_TEMPLATE_ENUM_CALL(SpanMethod, spanMethod));
+        blend_src_generic<spanMethod>(count, spans, userData);
         return;
     }
 
@@ -6330,8 +6101,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformedTiled(int count, const QSpan *sp
     QPainter::CompositionMode mode = data->rasterBuffer->compositionMode;
 
     if (mode != QPainter::CompositionMode_SourceOver) {
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
         return;
     }
 
@@ -6481,8 +6251,7 @@ static void blend_transformed_tiled_rgb888(int count, const QSpan *spans,
         blendTransformedTiled<qrgb888, qrgb888>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_argb6666(int count, const QSpan *spans,
@@ -6497,8 +6266,7 @@ static void blend_transformed_tiled_argb6666(int count, const QSpan *spans,
         blendTransformedTiled<qargb6666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_rgb666(int count, const QSpan *spans,
@@ -6513,8 +6281,7 @@ static void blend_transformed_tiled_rgb666(int count, const QSpan *spans,
         blendTransformedTiled<qrgb666, qrgb666>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_argb8565(int count, const QSpan *spans,
@@ -6529,8 +6296,7 @@ static void blend_transformed_tiled_argb8565(int count, const QSpan *spans,
         blendTransformedTiled<qargb8565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_rgb565(int count, const QSpan *spans,
@@ -6545,8 +6311,7 @@ static void blend_transformed_tiled_rgb565(int count, const QSpan *spans,
         blendTransformedTiled<qrgb565, qrgb565>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_argb8555(int count, const QSpan *spans,
@@ -6561,8 +6326,7 @@ static void blend_transformed_tiled_argb8555(int count, const QSpan *spans,
         blendTransformedTiled<qargb8555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_rgb555(int count, const QSpan *spans,
@@ -6577,8 +6341,7 @@ static void blend_transformed_tiled_rgb555(int count, const QSpan *spans,
         blendTransformedTiled<qrgb555, qrgb555>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_argb4444(int count, const QSpan *spans,
@@ -6593,8 +6356,7 @@ static void blend_transformed_tiled_argb4444(int count, const QSpan *spans,
         blendTransformedTiled<qargb4444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
 static void blend_transformed_tiled_rgb444(int count, const QSpan *spans,
@@ -6609,36 +6371,10 @@ static void blend_transformed_tiled_rgb444(int count, const QSpan *spans,
         blendTransformedTiled<qrgb444, qrgb444>(count, spans, userData);
     else
 #endif
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
-}
-
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300 && !defined(Q_CC_INTEL)
-
-// explicit template instantiations needed to compile with VC6 and VC2002
-
-#define SPANFUNC_INSTANTIATION(Name, Arg)  \
-static inline void Name##_##Arg(int count, const QSpan *spans, void *userData) \
-{ \
-    Name<Arg>(count, spans, userData Q_TEMPLATE_ENUM_CALL(SpanMethod, Arg)); \
+        blend_src_generic<RegularSpans>(count, spans, userData);
 }
 
-SPANFUNC_INSTANTIATION(blend_untransformed_generic, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_untransformed_argb, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_tiled_generic, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_tiled_argb, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_src_generic, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_transformed_argb, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_transformed_tiled_argb, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_transformed_bilinear_argb, RegularSpans);
-SPANFUNC_INSTANTIATION(blend_transformed_bilinear_tiled_argb, RegularSpans);
-#undef SPANFUNC_INSTANTIATION
-
-#define SPANFUNC_POINTER(Name, Arg) Name##_##Arg
-
-#else // !VC6 && !VC2002
 # define SPANFUNC_POINTER(Name, Arg) Name<Arg>
-#endif
 
 
 /* Image formats here are target formats */
@@ -7005,8 +6741,7 @@ static void qt_gradient_quint32(int count, const QSpan *spans, void *userData)
         }
 
     } else {
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
     }
 }
 
@@ -7054,8 +6789,7 @@ static void qt_gradient_quint16(int count, const QSpan *spans, void *userData)
         data->solid.color = oldColor;
 
     } else {
-        blend_src_generic<RegularSpans>(count, spans, userData
-                                        Q_TEMPLATE_ENUM_CALL(SpanMethod, RegularSpans));
+        blend_src_generic<RegularSpans>(count, spans, userData);
     }
 }