summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-14 13:15:14 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-15 23:40:57 +0200
commit03b95247a1bef127e3de7a00778f52a37009edf0 (patch)
tree9a22866b89b229c4eb572d40487c73b3c4f84855 /src
parent46da68c0bf4d4b345beddfe3976bfe605f3d989f (diff)
Remove trailing comma in enum
Spotted by ICC: qfreelist_p.h(127): warning #271: trailing comma is nonstandard BlockCount = 4, ^ Change-Id: Ib64d1d19ca0514e7582a295da48cbf6705aa8c44 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-thai.c2
-rw-r--r--src/corelib/kernel/qabstracteventdispatcher.cpp2
-rw-r--r--src/corelib/tools/qfreelist_p.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
index 54fb9537a4..ecb722d984 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
@@ -164,7 +164,7 @@ static int tis620_2[128] = {
enum ThaiFontType {
TIS,
WIN,
- MAC,
+ MAC
};
static int thai_get_glyph_index (ThaiFontType font_type, unsigned char c)
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index 9cda3fdf6b..ab68b4604a 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -56,7 +56,7 @@ struct QtTimerIdFreeListConstants : public QFreeListDefaultConstants
enum
{
InitialNextValue = 1,
- BlockCount = 6,
+ BlockCount = 6
};
static const int Sizes[BlockCount];
diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h
index 599abcd48b..361330ee94 100644
--- a/src/corelib/tools/qfreelist_p.h
+++ b/src/corelib/tools/qfreelist_p.h
@@ -124,7 +124,7 @@ struct Q_AUTOTEST_EXPORT QFreeListDefaultConstants
SerialMask = ~IndexMask & ~0x80000000,
SerialCounter = IndexMask + 1,
MaxIndex = IndexMask,
- BlockCount = 4,
+ BlockCount = 4
};
static const int Sizes[BlockCount];