summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-18 15:32:55 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-18 15:45:24 +0100
commit64158ff163a53ff97d8ae211b0bddaae346f0f7c (patch)
treed8a66751f153596733935e2bf06d6495d481c177
parent756247373da4ea4142862df4156249230c013161 (diff)
Fix warnings on gcc
Gcc warns if declaration and initialization order are different. Reviewed-by: Samuel
-rw-r--r--src/gui/painting/qtextureglyphcache_p.h5
-rw-r--r--src/gui/text/qstatictext.cpp6
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h4
3 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index b8717b1d3e..803e71b23b 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -76,8 +76,9 @@ class Q_GUI_EXPORT QTextureGlyphCache : public QFontEngineGlyphCache
{
public:
QTextureGlyphCache(QFontEngineGlyphCache::Type type, const QTransform &matrix)
- : QFontEngineGlyphCache(matrix, type), m_w(0), m_h(0), m_cx(0), m_cy(0),
- m_current_fontengine(0) { }
+ : QFontEngineGlyphCache(matrix, type), m_current_fontengine(0),
+ m_w(0), m_h(0), m_cx(0), m_cy(0)
+ { }
virtual ~QTextureGlyphCache() { }
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 623ee540ce..7d4181cc06 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -384,11 +384,11 @@ namespace {
DrawTextItemRecorder(int expectedItemCount, QStaticTextItem *items,
int expectedGlyphCount, QFixedPoint *positionPool, glyph_t *glyphPool)
: m_items(items),
+ m_itemCount(0), m_glyphCount(0),
m_expectedItemCount(expectedItemCount),
m_expectedGlyphCount(expectedGlyphCount),
- m_itemCount(0), m_glyphCount(0),
- m_positionPool(positionPool),
- m_glyphPool(glyphPool)
+ m_glyphPool(glyphPool),
+ m_positionPool(positionPool)
{
}
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 16682cedac..d4932be05b 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -174,11 +174,11 @@ public:
width(0), height(0),
ctx(0),
useSystemClip(true),
+ elementIndicesVBOId(0),
snapToPixelGrid(false),
addOffset(false),
inverseScale(1),
- lastMaskTextureUsed(0),
- elementIndicesVBOId(0)
+ lastMaskTextureUsed(0)
{ }
~QGL2PaintEngineExPrivate();