diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 12:02:43 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 12:08:32 (GMT) |
| commit | a6782030bc6077b3b1ffe380dfd303cfb7662795 (patch) | |
| tree | f2fcb24dc0d9df08babe7f87e5ba2a335a0f4b2e /src/gui/text/qfontengine_win.cpp | |
| parent | 271358459d605e909f4ec093b971a420ff730e8f (diff) | |
| download | Qt-a6782030bc6077b3b1ffe380dfd303cfb7662795.zip Qt-a6782030bc6077b3b1ffe380dfd303cfb7662795.tar.gz Qt-a6782030bc6077b3b1ffe380dfd303cfb7662795.tar.bz2 | |
Fix warnings for mingw
did a small refactor and used QStyleHelper::uniqueName in plastique and
windows styles
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index f4adc9a..c6717e3 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -125,8 +125,6 @@ HDC shared_dc() } #endif -static HFONT stock_sysfont = 0; - typedef BOOL (WINAPI *PtrGetCharWidthI)(HDC, UINT, UINT, LPWORD, LPINT); static PtrGetCharWidthI ptrGetCharWidthI = 0; static bool resolvedGetCharWidthI = false; @@ -542,13 +540,6 @@ glyph_metrics_t QFontEngineWin::boundingBox(const QGlyphLayout &glyphs) } - - -#ifndef Q_WS_WINCE -typedef HRESULT (WINAPI *pGetCharABCWidthsFloat)(HDC, UINT, UINT, LPABCFLOAT); -static pGetCharABCWidthsFloat qt_GetCharABCWidthsFloat = 0; -#endif - glyph_metrics_t QFontEngineWin::boundingBox(glyph_t glyph, const QTransform &t) { #ifndef Q_WS_WINCE @@ -1143,8 +1134,7 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin memset(&mat, 0, sizeof(mat)); mat.eM11.value = mat.eM22.value = 1; - int error = GetGlyphOutline(hdc, glyph, ggo_options, &tgm, 0, 0, &mat); - if (error == GDI_ERROR) { + if (GetGlyphOutline(hdc, glyph, ggo_options, &tgm, 0, 0, &mat) == GDI_ERROR) { qWarning("QWinFontEngine: unable to query transformed glyph metrics..."); return 0; } |