1 files changed, 28 insertions, 19 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
index e404065fc..6ae41de0e 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.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 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$
 **
@@ -197,7 +203,8 @@ QVariant CameraBinMetaData::metaData(const QString &key) const
     }
 #endif
 
-    Q_FOREACH (const QGStreamerMetaDataKey &metadataKey, *qt_gstreamerMetaDataKeys()) {
+    const auto keys = *qt_gstreamerMetaDataKeys();
+    for (const QGStreamerMetaDataKey &metadataKey : keys) {
         if (metadataKey.qtName == key)
             return m_values.value(QByteArray::fromRawData(metadataKey.gstName, qstrlen(metadataKey.gstName)));
     }
@@ -216,7 +223,8 @@ void CameraBinMetaData::setMetaData(const QString &key, const QVariant &value)
         }
     }
 
-    Q_FOREACH (const QGStreamerMetaDataKey &metadataKey, *qt_gstreamerMetaDataKeys()) {
+    const auto keys = *qt_gstreamerMetaDataKeys();
+    for (const QGStreamerMetaDataKey &metadataKey : keys) {
         if (metadataKey.qtName == key) {
             const char *name = metadataKey.gstName;
 
@@ -239,13 +247,14 @@ QStringList CameraBinMetaData::availableMetaData() const
 {
     static QMap<QByteArray, QString> keysMap;
     if (keysMap.isEmpty()) {
-        Q_FOREACH (const QGStreamerMetaDataKey &metadataKey, *qt_gstreamerMetaDataKeys())
+        const auto keys = *qt_gstreamerMetaDataKeys();
+        for (const QGStreamerMetaDataKey &metadataKey : keys)
             keysMap[QByteArray(metadataKey.gstName)] = metadataKey.qtName;
     }
 
     QStringList res;
-    Q_FOREACH (const QByteArray &key, m_values.keys()) {
-        QString tag = keysMap.value(key);
+    for (auto it = m_values.keyBegin(), end = m_values.keyEnd(); it != end; ++it) {
+        QString tag = keysMap.value(*it);
         if (!tag.isEmpty())
             res.append(tag);
     }