1 files changed, 25 insertions, 20 deletions

diff --git a/src/plugins/platforms/openwfd/qopenwfdport.cpp b/src/plugins/platforms/openwfd/qopenwfdport.cpp
index 8da1e9bd34..33254fe83c 100644
--- a/src/plugins/platforms/openwfd/qopenwfdport.cpp
+++ b/src/plugins/platforms/openwfd/qopenwfdport.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 plugins 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$
 **
@@ -74,7 +80,7 @@ void QOpenWFDPort::attach()
     Q_ASSERT(actualNumberOfPortModes == numberOfPortModes);
 
     if (!actualNumberOfPortModes) {
-        qDebug() << "didn't find any available port modes";
+        qDebug("didn't find any available port modes");
         return;
     }
 
@@ -88,7 +94,7 @@ void QOpenWFDPort::attach()
 
     mPixelSize = setNativeResolutionMode();
     if (mPixelSize.isEmpty()) {
-        qDebug() << "Could not set native resolution mode in QOpenWFPort";
+        qDebug("Could not set native resolution mode in QOpenWFPort");
     }
 
     WFDfloat physicalWFDSize[2];
@@ -96,9 +102,8 @@ void QOpenWFDPort::attach()
     mPhysicalSize = QSizeF(physicalWFDSize[0],physicalWFDSize[1]);
 
     WFDint numAvailablePipelines = wfdGetPortAttribi(mDevice->handle(),mPort,WFD_PORT_PIPELINE_ID_COUNT);
-    if (!numAvailablePipelines) {
+    if (Q_UNLIKELY(!numAvailablePipelines))
         qFatal("Not possible to make screen that is not possible to create WFPort with no pipline");
-    }
 
     WFDint pipeIds[numAvailablePipelines];
     wfdGetPortAttribiv(mDevice->handle(),mPort,WFD_PORT_BINDABLE_PIPELINE_IDS,numAvailablePipelines,pipeIds);
@@ -109,9 +114,9 @@ void QOpenWFDPort::attach()
             mDevice-> addToUsedPipelineSet(mPipelineId,this);
 
             mPipeline = wfdCreatePipeline(mDevice->handle(),mPipelineId,WFD_NONE);
-            if (mPipeline == WFD_INVALID_HANDLE) {
+            if (Q_UNLIKELY(mPipeline == WFD_INVALID_HANDLE))
                 qFatal("Failed to create pipeline for port %p", this);
-            }
+
             break;
         }
     }