From ce9d760d59c3cd0c5de0325366f50cd1ec7cc5a0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 30 Dec 2011 14:54:11 -0200 Subject: Fix warnings about commas at the end of enums It's non-standard to accept them, so remove them and silence the warnings. Change-Id: I51c5afe99eac408f326ab9fcf40435b60e953b54 Reviewed-by: Stephen Kelly --- src/gui/painting/qblittable_p.h | 2 +- src/gui/painting/qcosmeticstroker_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/painting') diff --git a/src/gui/painting/qblittable_p.h b/src/gui/painting/qblittable_p.h index 0d2f6983d4..c36de8fa08 100644 --- a/src/gui/painting/qblittable_p.h +++ b/src/gui/painting/qblittable_p.h @@ -64,7 +64,7 @@ public: SourceOverScaledPixmapCapability = 0x0008, // Internal ones - OutlineCapability = 0x0001000, + OutlineCapability = 0x0001000 }; Q_DECLARE_FLAGS (Capabilities, Capability); diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h index 86e811c5f6..7a1221c1a7 100644 --- a/src/gui/painting/qcosmeticstroker_p.h +++ b/src/gui/painting/qcosmeticstroker_p.h @@ -72,7 +72,7 @@ public: enum Caps { NoCaps = 0, CapBegin = 0x1, - CapEnd = 0x2, + CapEnd = 0x2 }; // used to avoid drop outs or duplicated points -- cgit v1.2.3 From 38f33e035fef3e649662c838b85528eeb23b79fe Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 29 Dec 2011 19:53:30 -0200 Subject: Remove the Q_STATIC_TEMPLATE_SPECIALIZATION macro This was necessary only for older MS Visual Studio versions, which are no longer supported anyway. Change-Id: I6c96fb2340296c34b480716303c93b892419229b Reviewed-by: Stephen Kelly --- src/gui/painting/qdrawhelper.cpp | 2 -- src/gui/painting/qdrawhelper_p.h | 6 ------ src/gui/painting/qmemrotate.cpp | 1 - 3 files changed, 9 deletions(-) (limited to 'src/gui/painting') diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 035f56b35e..7571d81a36 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -814,7 +814,6 @@ template void fetchTransformedBilinear_pixelBounds(int max, int l1, int l2, int &v1, int &v2); template<> -Q_STATIC_TEMPLATE_SPECIALIZATION inline void fetchTransformedBilinear_pixelBounds(int max, int, int, int &v1, int &v2) { v1 %= max; @@ -828,7 +827,6 @@ inline void fetchTransformedBilinear_pixelBounds( } template<> -Q_STATIC_TEMPLATE_SPECIALIZATION inline void fetchTransformedBilinear_pixelBounds(int, int l1, int l2, int &v1, int &v2) { if (v1 < l1) diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 2e88fe718a..442fd8bcd7 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -67,12 +67,6 @@ QT_BEGIN_NAMESPACE -#if defined(Q_CC_MSVC) && _MSCVER <= 1300 && !defined(Q_CC_INTEL) -#define Q_STATIC_TEMPLATE_SPECIALIZATION static -#else -#define Q_STATIC_TEMPLATE_SPECIALIZATION -#endif - #if defined(Q_CC_RVCT) // RVCT doesn't like static template functions # define Q_STATIC_TEMPLATE_FUNCTION diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp index e6fcc3e5dd..6f4dc5b358 100644 --- a/src/gui/painting/qmemrotate.cpp +++ b/src/gui/painting/qmemrotate.cpp @@ -423,7 +423,6 @@ inline void qt_memrotate270_template(const T *src, int srcWidth, int srcHeight, } template <> -Q_STATIC_TEMPLATE_SPECIALIZATION inline void qt_memrotate90_template(const quint24 *src, int srcWidth, int srcHeight, int srcStride, quint24 *dest, int dstStride) { -- cgit v1.2.3