AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Widgets/qwidgetbackingstore.cpp: Fix developer build with MinGW

Browse Source 
In  showYellowThing_win(), replace the switch by an array of COLORREF
and simplify the code accordingly, fixing:

kernel\qwidgetbackingstore.cpp: In function 'void showYellowThing_win(QWidget*, const QRegion&, int)':
kernel\qwidgetbackingstore.cpp:188:39: error: 'brush' may be used uninitialized in this function [-Werror=maybe-uninitialized]
         FillRect(hdc, &winRect, brush);
                                       ^

Change-Id: Id60be0e01e1edb2fa939d64abaf2e58357bcc14d
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Friedemann Kleint 2017-01-27 13:23:52 +01:00
parent c6ecbd4762
commit af7cefd272
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/widgets/kernel/qwidgetbackingstore.cpp
View File

@ -164,23 +164,11 @@ static void showYellowThing_win(QWidget *widget, const QRegion &region, int msec
return; return;
const HDC hdc = reinterpret_cast<HDC>(hdcV); const HDC hdc = reinterpret_cast<HDC>(hdcV);
HBRUSH brush; static const COLORREF colors[] = {RGB(255, 255, 0), RGB(255, 200, 55), RGB(200, 255, 55), RGB(200, 200, 0)};
static int i = 0;
switch (i) { static size_t i = 0;
case 0: const HBRUSH brush = CreateSolidBrush(colors[i]);
brush = CreateSolidBrush(RGB(255, 255, 0)); i = (i + 1) % (sizeof(colors) / sizeof(colors[0]));
break;
case 1:
brush = CreateSolidBrush(RGB(255, 200, 55));
break;
case 2:
brush = CreateSolidBrush(RGB(200, 255, 55));
break;
case 3:
brush = CreateSolidBrush(RGB(200, 200, 0));
break;
}
i = (i + 1) & 3;
for (const QRect &rect : region) { for (const QRect &rect : region) {
RECT winRect; RECT winRect;