From ed9fb96a626c284cebd4fcd9a2e00f32e202099a Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 7 Oct 2009 11:20:23 +0200
Subject: Fix compilation with -pedantic

Merge-request: 1716
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
---
 src/gui/effects/qgraphicseffect.cpp                  | 2 +-
 src/gui/kernel/qsoftkeymanager_p.h                   | 2 +-
 src/gui/text/qfontengine.cpp                         | 2 +-
 src/opengl/gl2paintengineex/qglcustomshaderstage_p.h | 2 +-
 src/opengl/util/fragmentprograms_p.h                 | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp
index e971fd8..ee01fdc 100644
--- a/src/gui/effects/qgraphicseffect.cpp
+++ b/src/gui/effects/qgraphicseffect.cpp
@@ -566,7 +566,7 @@ QGraphicsColorizeEffect::~QGraphicsColorizeEffect()
     \brief the color of the effect.
 
     By default, the color is light blue (QColor(0, 0, 192)).
-*/;
+*/
 QColor QGraphicsColorizeEffect::color() const
 {
     Q_D(const QGraphicsColorizeEffect);
diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h
index c4bb84d..b455445 100644
--- a/src/gui/kernel/qsoftkeymanager_p.h
+++ b/src/gui/kernel/qsoftkeymanager_p.h
@@ -74,7 +74,7 @@ public:
         SelectSoftKey,
         DoneSoftKey,
         MenuSoftKey,
-        CancelSoftKey,
+        CancelSoftKey
     };
 
     static void updateSoftKeys();
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index e5a88fc..21b9cca 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1160,7 +1160,7 @@ Q_GLOBAL_STATIC_WITH_INITIALIZER(QVector<QRgb>, qt_grayPalette, {
     QRgb *it = x->data();
     for (int i = 0; i < x->size(); ++i, ++it)
         *it = 0xff000000 | i | (i<<8) | (i<<16);
-});
+})
 
 const QVector<QRgb> &QFontEngine::grayPalette()
 {
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
index 25f5c2f..f8c13c5 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
@@ -64,7 +64,7 @@ QT_MODULE(OpenGL)
 class QGLCustomShaderStagePrivate;
 class Q_OPENGL_EXPORT QGLCustomShaderStage
 {
-    Q_DECLARE_PRIVATE(QGLCustomShaderStage);
+    Q_DECLARE_PRIVATE(QGLCustomShaderStage)
 public:
     QGLCustomShaderStage();
     virtual ~QGLCustomShaderStage();
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index 18da5c8..340023c 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -71,7 +71,7 @@ enum FragmentVariable {
     VAR_FMP2_M_RADIUS2,
     VAR_FMP,
     VAR_INV_MATRIX_M0,
-    VAR_ANGLE,
+    VAR_ANGLE
 };
 
 enum FragmentBrushType {
@@ -80,7 +80,7 @@ enum FragmentBrushType {
     FRAGMENT_PROGRAM_BRUSH_CONICAL,
     FRAGMENT_PROGRAM_BRUSH_LINEAR,
     FRAGMENT_PROGRAM_BRUSH_TEXTURE,
-    FRAGMENT_PROGRAM_BRUSH_PATTERN,
+    FRAGMENT_PROGRAM_BRUSH_PATTERN
 };
 
 enum FragmentCompositionModeType {
@@ -109,12 +109,12 @@ enum FragmentCompositionModeType {
     COMPOSITION_MODES_DIFFERENCE_NOMASK,
     COMPOSITION_MODES_EXCLUSION_NOMASK,
     COMPOSITION_MODE_BLEND_MODE_MASK,
-    COMPOSITION_MODE_BLEND_MODE_NOMASK,
+    COMPOSITION_MODE_BLEND_MODE_NOMASK
 };
 
 enum FragmentMaskType {
     FRAGMENT_PROGRAM_MASK_TRAPEZOID_AA,
-    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA,
+    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA
 };
 
 static const unsigned int num_fragment_variables = 19;
-- 
cgit v0.12