From 448dd8593f3e7e680ce3d0f92e279aad3c88d7d6 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 21 Jun 2010 12:03:49 +0200
Subject: Fix compiler warnings in QtGui (text,painting). Reviewed-by: Eskil
 Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>

---
 src/gui/painting/qoutlinemapper_p.h | 4 ++--
 src/gui/text/qstatictext.cpp        | 9 ++++-----
 src/gui/text/qtextengine.cpp        | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h
index f64d03b..d534f76 100644
--- a/src/gui/painting/qoutlinemapper_p.h
+++ b/src/gui/painting/qoutlinemapper_p.h
@@ -95,8 +95,8 @@ public:
         m_tags(0),
         m_contours(0),
         m_polygon_dev(0),
-        m_round_coords(false),
-        m_in_clip_elements(false)
+        m_in_clip_elements(false),
+        m_round_coords(false)
     {
     }
 
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index c742455..91a6612 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -421,7 +421,7 @@ namespace {
     class DrawTextItemRecorder: public QPaintEngine
     {
     public:
-        DrawTextItemRecorder(bool untransformedCoordinates, bool useBackendOptimizations, int numChars)
+        DrawTextItemRecorder(bool untransformedCoordinates, bool useBackendOptimizations)
                 : m_dirtyPen(false), m_useBackendOptimizations(useBackendOptimizations),
                   m_untransformedCoordinates(untransformedCoordinates)
         {
@@ -518,11 +518,10 @@ namespace {
     class DrawTextItemDevice: public QPaintDevice
     {
     public:
-        DrawTextItemDevice(bool untransformedCoordinates, bool useBackendOptimizations,
-                           int numChars)
+        DrawTextItemDevice(bool untransformedCoordinates, bool useBackendOptimizations)
         {
             m_paintEngine = new DrawTextItemRecorder(untransformedCoordinates,
-                                                     useBackendOptimizations, numChars);
+                                                     useBackendOptimizations);
         }
 
         ~DrawTextItemDevice()
@@ -664,7 +663,7 @@ void QStaticTextPrivate::init()
 
     position = QPointF(0, 0);
 
-    DrawTextItemDevice device(untransformedCoordinates, useBackendOptimizations, text.size());
+    DrawTextItemDevice device(untransformedCoordinates, useBackendOptimizations);
     {
         QPainter painter(&device);
         painter.setFont(font);
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index ac1fffd..60195a8 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2670,7 +2670,7 @@ QTextItemInt::QTextItemInt(const QScriptItem &si, QFont *font, const QTextCharFo
 
 QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, QFontEngine *fe)
     : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline),
-      num_chars(0), chars(0), logClusters(0), f(font), fontEngine(fe), glyphs(g)
+      num_chars(0), chars(0), logClusters(0), f(font),  glyphs(g), fontEngine(fe)
 {
 }
 
-- 
cgit v0.12