1 files changed, 28 insertions, 20 deletions

diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp
index 5b01312dfb..c33e4167c1 100644
--- a/src/widgets/styles/qwindowsxpstyle.cpp
+++ b/src/widgets/styles/qwindowsxpstyle.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -337,14 +343,14 @@ void QWindowsXPStylePrivate::cleanupHandleMap()
 
 HTHEME QWindowsXPStylePrivate::createTheme(int theme, HWND hwnd)
 {
-    if (theme < 0 || theme >= NThemes || !hwnd) {
+    if (Q_UNLIKELY(theme < 0 || theme >= NThemes || !hwnd)) {
         qWarning("Invalid parameters #%d, %p", theme, hwnd);
         return 0;
     }
     if (!m_themes[theme]) {
         const wchar_t *name = themeNames[theme];
         m_themes[theme] = pOpenThemeData(hwnd, name);
-        if (!m_themes[theme])
+        if (Q_UNLIKELY(!m_themes[theme]))
             qErrnoWarning("OpenThemeData() failed for theme %d (%s).",
                           theme, qPrintable(themeName(theme)));
     }
@@ -400,10 +406,12 @@ HWND QWindowsXPStylePrivate::winId(const QWidget *widget)
             return hwnd;
 
     // Find top level with native window (there might be dialogs that do not have one).
-    foreach (const QWidget *toplevel, QApplication::topLevelWidgets())
+    const auto topLevels = QApplication::topLevelWidgets();
+    for (const QWidget *toplevel : topLevels) {
         if (toplevel->windowHandle() && toplevel->windowHandle()->handle())
             if (const HWND topLevelHwnd = QApplicationPrivate::getHWNDForWidget(toplevel))
                 return topLevelHwnd;
+    }
 
     if (QDesktopWidget *desktop = qApp->desktop())
         if (const HWND desktopHwnd = QApplicationPrivate::getHWNDForWidget(desktop))
@@ -520,13 +528,13 @@ HBITMAP QWindowsXPStylePrivate::buffer(int w, int h)
     GdiFlush();
     nullBitmap = (HBITMAP)SelectObject(bufferDC, bufferBitmap);
 
-    if (!bufferBitmap) {
+    if (Q_UNLIKELY(!bufferBitmap)) {
         qErrnoWarning("QWindowsXPStylePrivate::buffer(%dx%d), CreateDIBSection() failed.", w, h);
         bufferW = 0;
         bufferH = 0;
         return 0;
     }
-    if (!bufferPixels) {
+    if (Q_UNLIKELY(!bufferPixels)) {
         qErrnoWarning("QWindowsXPStylePrivate::buffer(%dx%d), CreateDIBSection() did not allocate pixel data.", w, h);
         bufferW = 0;
         bufferH = 0;
@@ -2377,7 +2385,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op
             const bool verticalTitleBar = dwOpt->verticalTitleBar;
 
             if (verticalTitleBar) {
-                rect.setSize(rect.size().transposed());
+                rect = rect.transposed();
 
                 p->translate(rect.left() - 1, rect.top() + rect.width());
                 p->rotate(-90);