1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows QPA: Fix warnings as shown by Qt Creator's Clang based code model.

Browse Source 
Fix warnings in file qwindowswindow.cpp. Remaining part of a refactoring
done in the 5.6 branch.

Task-number: QTBUG-50804
Change-Id: I4d7b423e0802ac39109c30c0de615664d3ee9216
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2016-02-12 17:04:48 +01:00
parent c1da6347e8
commit 9b49b375e3
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -376,12 +376,13 @@ static void setWindowOpacity(HWND hwnd, Qt::WindowFlags flags, bool hasAlpha, bo
Q_UNUSED(level); Q_UNUSED(level);
#else #else
if (QWindowsWindow::setWindowLayered(hwnd, flags, hasAlpha, level)) { if (QWindowsWindow::setWindowLayered(hwnd, flags, hasAlpha, level)) {
const BYTE alpha = BYTE(qRound(255.0 * level));
if (hasAlpha && !openGL && (flags & Qt::FramelessWindowHint)) { if (hasAlpha && !openGL && (flags & Qt::FramelessWindowHint)) {
// Non-GL windows with alpha: Use blend function to update. // Non-GL windows with alpha: Use blend function to update.
BLENDFUNCTION blend = {AC_SRC_OVER, 0, (BYTE)(255.0 * level), AC_SRC_ALPHA}; BLENDFUNCTION blend = {AC_SRC_OVER, 0, alpha, AC_SRC_ALPHA};
QWindowsContext::user32dll.updateLayeredWindow(hwnd, NULL, NULL, NULL, NULL, NULL, 0, &blend, ULW_ALPHA); QWindowsContext::user32dll.updateLayeredWindow(hwnd, NULL, NULL, NULL, NULL, NULL, 0, &blend, ULW_ALPHA);
} else { } else {
QWindowsContext::user32dll.setLayeredWindowAttributes(hwnd, 0, (int)(level * 255), LWA_ALPHA); QWindowsContext::user32dll.setLayeredWindowAttributes(hwnd, 0, alpha, LWA_ALPHA);
} }
} else if (IsWindowVisible(hwnd)) { // Repaint when switching from layered. } else if (IsWindowVisible(hwnd)) { // Repaint when switching from layered.
InvalidateRect(hwnd, NULL, TRUE); InvalidateRect(hwnd, NULL, TRUE);
@ -505,7 +506,7 @@ void WindowCreationData::fromWindow(const QWindow *w, const Qt::WindowFlags flag
QVariant prop = w->property("_q_embedded_native_parent_handle"); QVariant prop = w->property("_q_embedded_native_parent_handle");
if (prop.isValid()) { if (prop.isValid()) {
embedded = true; embedded = true;
parentHandle = (HWND)prop.value<WId>(); parentHandle = reinterpret_cast<HWND>(prop.value<WId>());
} }
if (creationFlags & ForceChild) { if (creationFlags & ForceChild) {
@ -680,10 +681,10 @@ void WindowCreationData::applyWindowFlags(HWND hwnd) const
if (newExStyle != oldExStyle) if (newExStyle != oldExStyle)
SetWindowLongPtr(hwnd, GWL_EXSTYLE, newExStyle); SetWindowLongPtr(hwnd, GWL_EXSTYLE, newExStyle);
qCDebug(lcQpaWindows).nospace() << __FUNCTION__ << hwnd << *this qCDebug(lcQpaWindows).nospace() << __FUNCTION__ << hwnd << *this
<< "\n Style from " << debugWinStyle(oldStyle) << "\n to " << "\n Style from " << debugWinStyle(DWORD(oldStyle)) << "\n to "
<< debugWinStyle(newStyle) << "\n ExStyle from " << debugWinStyle(DWORD(newStyle)) << "\n ExStyle from "
<< debugWinExStyle(oldExStyle) << " to " << debugWinExStyle(DWORD(oldExStyle)) << " to "
<< debugWinExStyle(newExStyle); << debugWinExStyle(DWORD(newExStyle));
} }
void WindowCreationData::initialize(const QWindow *w, HWND hwnd, bool frameChange, qreal opacityLevel) const void WindowCreationData::initialize(const QWindow *w, HWND hwnd, bool frameChange, qreal opacityLevel) const
@ -802,8 +803,8 @@ bool QWindowsGeometryHint::handleCalculateSize(const QMargins &customMargins, co
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE
void QWindowsGeometryHint::applyToMinMaxInfo(HWND hwnd, MINMAXINFO *mmi) const void QWindowsGeometryHint::applyToMinMaxInfo(HWND hwnd, MINMAXINFO *mmi) const
{ {
return applyToMinMaxInfo(GetWindowLong(hwnd, GWL_STYLE), return applyToMinMaxInfo(DWORD(GetWindowLong(hwnd, GWL_STYLE)),
GetWindowLong(hwnd, GWL_EXSTYLE), mmi); DWORD(GetWindowLong(hwnd, GWL_EXSTYLE)), mmi);
} }
void QWindowsGeometryHint::applyToMinMaxInfo(DWORD style, DWORD exStyle, MINMAXINFO *mmi) const void QWindowsGeometryHint::applyToMinMaxInfo(DWORD style, DWORD exStyle, MINMAXINFO *mmi) const
@ -1363,7 +1364,7 @@ void QWindowsWindow::updateTransientParent() const
if (!tw->testFlag(WithinDestroy)) // Prevent destruction by parent window (QTBUG-35499, QTBUG-36666) if (!tw->testFlag(WithinDestroy)) // Prevent destruction by parent window (QTBUG-35499, QTBUG-36666)
newTransientParent = tw->handle(); newTransientParent = tw->handle();
if (newTransientParent != oldTransientParent) if (newTransientParent != oldTransientParent)
SetWindowLongPtr(m_data.hwnd, GWL_HWNDPARENT, (LONG_PTR)newTransientParent); SetWindowLongPtr(m_data.hwnd, GWL_HWNDPARENT, LONG_PTR(newTransientParent));
#endif // !Q_OS_WINCE #endif // !Q_OS_WINCE
} }
@ -2015,7 +2016,7 @@ QMargins QWindowsWindow::frameMargins() const
void QWindowsWindow::setOpacity(qreal level) void QWindowsWindow::setOpacity(qreal level)
{ {
qCDebug(lcQpaWindows) << __FUNCTION__ << level; qCDebug(lcQpaWindows) << __FUNCTION__ << level;
if (m_opacity != level) { if (!qFuzzyCompare(m_opacity, level)) {
m_opacity = level; m_opacity = level;
if (m_data.hwnd) if (m_data.hwnd)
setWindowOpacity(m_data.hwnd, m_data.flags, setWindowOpacity(m_data.hwnd, m_data.flags,
@ -2317,7 +2318,7 @@ void QWindowsWindow::setAlertState(bool enabled)
void QWindowsWindow::alertWindow(int durationMs) void QWindowsWindow::alertWindow(int durationMs)
{ {
DWORD timeOutMs = GetCaretBlinkTime(); UINT timeOutMs = GetCaretBlinkTime();
if (!timeOutMs || timeOutMs == INFINITE) if (!timeOutMs || timeOutMs == INFINITE)
timeOutMs = 250; timeOutMs = 250;
@ -2326,7 +2327,7 @@ void QWindowsWindow::alertWindow(int durationMs)
info.hwnd = m_data.hwnd; info.hwnd = m_data.hwnd;
info.dwFlags = FLASHW_TRAY; info.dwFlags = FLASHW_TRAY;
info.dwTimeout = timeOutMs; info.dwTimeout = timeOutMs;
info.uCount = durationMs == 0 ? 10 : durationMs / timeOutMs; info.uCount = durationMs == 0 ? 10 : UINT(durationMs) / timeOutMs;
FlashWindowEx(&info); FlashWindowEx(&info);
} }
@ -2379,11 +2380,11 @@ void QWindowsWindow::setWindowIcon(const QIcon &icon)
m_iconBig = createHIcon(icon, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON)); m_iconBig = createHIcon(icon, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
if (m_iconBig) { if (m_iconBig) {
SendMessage(m_data.hwnd, WM_SETICON, 0 /* ICON_SMALL */, (LPARAM)m_iconSmall); SendMessage(m_data.hwnd, WM_SETICON, 0 /* ICON_SMALL */, LPARAM(m_iconSmall));
SendMessage(m_data.hwnd, WM_SETICON, 1 /* ICON_BIG */, (LPARAM)m_iconBig); SendMessage(m_data.hwnd, WM_SETICON, 1 /* ICON_BIG */, LPARAM(m_iconBig));
} else { } else {
SendMessage(m_data.hwnd, WM_SETICON, 0 /* ICON_SMALL */, (LPARAM)m_iconSmall); SendMessage(m_data.hwnd, WM_SETICON, 0 /* ICON_SMALL */, LPARAM(m_iconSmall));
SendMessage(m_data.hwnd, WM_SETICON, 1 /* ICON_BIG */, (LPARAM)m_iconSmall); SendMessage(m_data.hwnd, WM_SETICON, 1 /* ICON_BIG */, LPARAM(m_iconSmall));
} }
} }
} }
@ -2464,7 +2465,7 @@ void QWindowsWindow::registerTouchWindow(QWindowsWindowFunctions::TouchWindowTou
// such as HCBT_CREATEWND // such as HCBT_CREATEWND
if (ret || touchFlags != 0) if (ret || touchFlags != 0)
return; return;
if (QWindowsContext::user32dll.registerTouchWindow(m_data.hwnd, (ULONG)touchTypes)) if (QWindowsContext::user32dll.registerTouchWindow(m_data.hwnd, ULONG(touchTypes)))
setFlag(TouchRegistered); setFlag(TouchRegistered);
else else
qErrnoWarning("RegisterTouchWindow() failed for window '%s'.", qPrintable(window()->objectName())); qErrnoWarning("RegisterTouchWindow() failed for window '%s'.", qPrintable(window()->objectName()));