diff options
Diffstat (limited to 'src/dbus/qdbusintrospection_p.h')
-rw-r--r-- | src/dbus/qdbusintrospection_p.h | 96 |
1 files changed, 49 insertions, 47 deletions
diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h index e60900b162..766cdffb62 100644 --- a/src/dbus/qdbusintrospection_p.h +++ b/src/dbus/qdbusintrospection_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtDBus 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 QDBUSINTROSPECTION_P_H #define QDBUSINTROSPECTION_P_H @@ -52,12 +16,11 @@ // #include <QtDBus/private/qtdbusglobal_p.h> -#include <QtCore/qstring.h> -#include <QtCore/qvector.h> -#include <QtCore/qstringlist.h> +#include <QtCore/qlist.h> #include <QtCore/qmap.h> -#include <QtCore/qpair.h> #include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> #ifndef QT_NO_DBUS @@ -74,10 +37,11 @@ public: struct Interface; struct Object; struct ObjectTree; + struct Annotation; // typedefs - typedef QMap<QString, QString> Annotations; - typedef QVector<Argument> Arguments; + typedef QMap<QString, Annotation> Annotations; + typedef QList<Argument> Arguments; typedef QMultiMap<QString, Method> Methods; typedef QMultiMap<QString, Signal> Signals; typedef QMap<QString, Property> Properties; @@ -87,8 +51,40 @@ public: public: // the structs + // Line and column numbers have the same meaning as in QXmlStreamReader. + struct SourceLocation + { + qint64 lineNumber = 1; + qint64 columnNumber = 0; + }; + + class Q_DBUS_EXPORT DiagnosticsReporter + { + Q_DISABLE_COPY_MOVE(DiagnosticsReporter) + public: + DiagnosticsReporter() = default; + virtual ~DiagnosticsReporter(); + virtual void warning(const SourceLocation &location, const char *msg, ...) + Q_ATTRIBUTE_FORMAT_PRINTF(3, 4) = 0; + virtual void error(const SourceLocation &location, const char *msg, ...) + Q_ATTRIBUTE_FORMAT_PRINTF(3, 4) = 0; + }; + + struct Annotation + { + SourceLocation location; + QString name; + QString value; + + inline bool operator==(const Annotation &other) const + { + return name == other.name && value == other.value; + } + }; + struct Argument { + SourceLocation location; QString type; QString name; @@ -98,6 +94,7 @@ public: struct Method { + SourceLocation location; QString name; Arguments inputArgs; Arguments outputArgs; @@ -110,6 +107,7 @@ public: struct Signal { + SourceLocation location; QString name; Arguments outputArgs; Annotations annotations; @@ -122,6 +120,7 @@ public: struct Property { enum Access { Read, Write, ReadWrite }; + SourceLocation location; QString name; QString type; Access access; @@ -134,6 +133,7 @@ public: struct Interface: public QSharedData { + SourceLocation location; QString name; QString introspection; @@ -148,6 +148,7 @@ public: struct Object: public QSharedData { + SourceLocation location; QString service; QString path; @@ -156,10 +157,11 @@ public: }; public: - static Interface parseInterface(const QString &xml); - static Interfaces parseInterfaces(const QString &xml); + static Interface parseInterface(const QString &xml, DiagnosticsReporter *reporter = nullptr); + static Interfaces parseInterfaces(const QString &xml, DiagnosticsReporter *reporter = nullptr); static Object parseObject(const QString &xml, const QString &service = QString(), - const QString &path = QString()); + const QString &path = QString(), + DiagnosticsReporter *reporter = nullptr); private: QDBusIntrospection(); |