1 files changed, 31 insertions, 21 deletions

diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp
index a9d316095c..228607d7e3 100644
--- a/src/printsupport/kernel/qprintengine_win.cpp
+++ b/src/printsupport/kernel/qprintengine_win.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 QtGui 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$
 **
@@ -163,7 +169,7 @@ bool QWin32PrintEngine::begin(QPaintDevice *pdev)
         cleanUp();
 
 #ifdef QT_DEBUG_METRICS
-    qDebug() << "QWin32PrintEngine::begin()";
+    qDebug("QWin32PrintEngine::begin()");
     d->debugMetrics();
 #endif // QT_DEBUG_METRICS
 
@@ -230,7 +236,7 @@ bool QWin32PrintEngine::newPage()
         SetBkMode(d->hdc, TRANSPARENT);
 
 #ifdef QT_DEBUG_METRICS
-    qDebug() << "QWin32PrintEngine::newPage()";
+    qDebug("QWin32PrintEngine::newPage()");
     d->debugMetrics();
 #endif // QT_DEBUG_METRICS
 
@@ -927,7 +933,7 @@ void QWin32PrintEnginePrivate::initialize()
     initHDC();
 
 #if defined QT_DEBUG_DRAW || defined QT_DEBUG_METRICS
-    qDebug() << "QWin32PrintEngine::initialize()";
+    qDebug("QWin32PrintEngine::initialize()");
     debugMetrics();
 #endif // QT_DEBUG_DRAW || QT_DEBUG_METRICS
 }
@@ -1004,7 +1010,7 @@ void QWin32PrintEnginePrivate::doReinit()
 bool QWin32PrintEnginePrivate::resetDC()
 {
     if (!hdc) {
-        qWarning() << "ResetDC() called with null hdc.";
+        qWarning("ResetDC() called with null hdc.");
         return false;
     }
     const HDC oldHdc = hdc;
@@ -1466,7 +1472,9 @@ QVariant QWin32PrintEngine::property(PrintEnginePropertyKey key) const
 
     case PPK_SupportedResolutions: {
         QList<QVariant> list;
-        foreach (int resolution, d->m_printDevice.supportedResolutions())
+        const auto resolutions = d->m_printDevice.supportedResolutions();
+        list.reserve(resolutions.size());
+        for (int resolution : resolutions)
             list << resolution;
         value = list;
         break;
@@ -1478,7 +1486,9 @@ QVariant QWin32PrintEngine::property(PrintEnginePropertyKey key) const
 
     case PPK_PaperSources: {
         QList<QVariant> out;
-        foreach (const QPrint::InputSlot inputSlot, d->m_printDevice.supportedInputSlots())
+        const auto inputSlots = d->m_printDevice.supportedInputSlots();
+        out.reserve(inputSlots.size());
+        for (const QPrint::InputSlot inputSlot : inputSlots)
             out << QVariant(inputSlot.id == QPrint::CustomInputSlot ? inputSlot.windowsId : int(inputSlot.id));
         value = out;
         break;
@@ -1586,7 +1596,7 @@ void QWin32PrintEngine::setGlobalDevMode(HGLOBAL globalDevNames, HGLOBAL globalD
         d->initHDC();
 
 #if defined QT_DEBUG_DRAW || defined QT_DEBUG_METRICS
-    qDebug() << "QWin32PrintEngine::setGlobalDevMode()";
+    qDebug("QWin32PrintEngine::setGlobalDevMode()");
     debugMetrics();
 #endif // QT_DEBUG_DRAW || QT_DEBUG_METRICS
 }