diff options
Diffstat (limited to 'src/qml/qml/qqmlinfo.h')
| -rw-r--r-- | src/qml/qml/qqmlinfo.h | 86 |
1 files changed, 21 insertions, 65 deletions
diff --git a/src/qml/qml/qqmlinfo.h b/src/qml/qml/qqmlinfo.h index faa112d4af..1fc0d4a2ae 100644 --- a/src/qml/qml/qqmlinfo.h +++ b/src/qml/qml/qqmlinfo.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $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 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 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. -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQMLINFO_H #define QQMLINFO_H @@ -49,25 +13,17 @@ QT_BEGIN_NAMESPACE class QQmlInfo; -// declared in namespace to avoid symbol conflicts with QtDeclarative -namespace QtQml { - Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me); - Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QQmlError &error); - Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QList<QQmlError> &errors); +Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me); +Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QQmlError &error); +Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QList<QQmlError> &errors); - Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); - Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); - Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors); +Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); +Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); +Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors); - Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me); - Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QQmlError &error); - Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QList<QQmlError> &errors); -} -QT_WARNING_PUSH -QT_WARNING_DISABLE_CLANG("-Wheader-hygiene") -// This is necessary to allow for QtQuick1 and QtQuick2 scenes in a single application. -using namespace QtQml; -QT_WARNING_POP +Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me); +Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QQmlError &error); +Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QList<QQmlError> &errors); class QQmlInfoPrivate; class Q_QML_EXPORT QQmlInfo : public QDebug @@ -91,7 +47,7 @@ public: inline QQmlInfo &operator<<(double t) { QDebug::operator<<(t); return *this; } inline QQmlInfo &operator<<(const char* t) { QDebug::operator<<(t); return *this; } inline QQmlInfo &operator<<(const QString & t) { QDebug::operator<<(t.toLocal8Bit().constData()); return *this; } - inline QQmlInfo &operator<<(const QStringRef & t) { return operator<<(t.toString()); } + inline QQmlInfo &operator<<(QStringView t) { return operator<<(t.toString()); } inline QQmlInfo &operator<<(const QLatin1String &t) { QDebug::operator<<(t.latin1()); return *this; } inline QQmlInfo &operator<<(const QByteArray & t) { QDebug::operator<<(t); return *this; } inline QQmlInfo &operator<<(const void * t) { QDebug::operator<<(t); return *this; } @@ -102,15 +58,15 @@ public: #endif private: - friend Q_QML_EXPORT QQmlInfo QtQml::qmlDebug(const QObject *me); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlDebug(const QObject *me, const QQmlError &error); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlDebug(const QObject *me, const QList<QQmlError> &errors); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QQmlError &error); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QList<QQmlError> &errors); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlWarning(const QObject *me); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlWarning(const QObject *me, const QQmlError &error); - friend Q_QML_EXPORT QQmlInfo QtQml::qmlWarning(const QObject *me, const QList<QQmlError> &errors); + friend Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me); + friend Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QQmlError &error); + friend Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QList<QQmlError> &errors); + friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); + friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); + friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors); + friend Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me); + friend Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QQmlError &error); + friend Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QList<QQmlError> &errors); QQmlInfo(QQmlInfoPrivate *); QQmlInfoPrivate *d; |