diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-18 14:32:55 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-18 14:45:24 (GMT) |
| commit | 64158ff163a53ff97d8ae211b0bddaae346f0f7c (patch) | |
| tree | d8a66751f153596733935e2bf06d6495d481c177 /src/gui | |
| parent | 756247373da4ea4142862df4156249230c013161 (diff) | |
| download | Qt-64158ff163a53ff97d8ae211b0bddaae346f0f7c.zip Qt-64158ff163a53ff97d8ae211b0bddaae346f0f7c.tar.gz Qt-64158ff163a53ff97d8ae211b0bddaae346f0f7c.tar.bz2 | |
Fix warnings on gcc
Gcc warns if declaration and initialization order are different.
Reviewed-by: Samuel
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 5 | ||||
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index b8717b1..803e71b 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 623ee54..7d4181c 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) { } |