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/dialogs | |
| 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/dialogs')
| -rw-r--r-- | src/gui/dialogs/qwizard.cpp | 4 | ||||
| -rw-r--r-- | src/gui/dialogs/qwizard_win.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index a7dccd8..a97aedd 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -343,8 +343,8 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title, { bool modern = ((info.wizStyle == QWizard::ModernStyle) #if !defined(QT_NO_STYLE_WINDOWSVISTA) - || ((info.wizStyle == QWizard::AeroStyle) - && (QVistaHelper::vistaState() == QVistaHelper::Classic) || vistaDisabled()) + || ((info.wizStyle == QWizard::AeroStyle + && QVistaHelper::vistaState() == QVistaHelper::Classic) || vistaDisabled()) #endif ); diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp index 840149b..1def47f 100644 --- a/src/gui/dialogs/qwizard_win.cpp +++ b/src/gui/dialogs/qwizard_win.cpp @@ -616,7 +616,7 @@ bool QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const Q // Set up a memory DC and bitmap that we'll draw into HDC dcMem; HBITMAP bmp; - BITMAPINFO dib = {0}; + BITMAPINFO dib = {{0}}; dcMem = CreateCompatibleDC(hdc); dib.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -662,7 +662,7 @@ bool QVistaHelper::drawBlackRect(const QRect &rect, HDC hdc) // Set up a memory DC and bitmap that we'll draw into HDC dcMem; HBITMAP bmp; - BITMAPINFO dib = {0}; + BITMAPINFO dib = {{0}}; dcMem = CreateCompatibleDC(hdc); dib.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); |