diff options
Diffstat (limited to 'src/dbus/qdbusmessage_p.h')
-rw-r--r-- | src/dbus/qdbusmessage_p.h | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h index f921c33832..88ba78025e 100644 --- a/src/dbus/qdbusmessage_p.h +++ b/src/dbus/qdbusmessage_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 QDBUSMESSAGE_P_H #define QDBUSMESSAGE_P_H @@ -75,20 +39,22 @@ public: // the following parameters are "const": they are not changed after the constructors // the parametersValidated member below controls whether they've been validated already + // (service is also used to store the destination of reply-type messages) QString service, path, interface, name, message, signature; - DBusMessage *msg; - DBusMessage *reply; mutable QDBusMessage *localReply; QAtomicInt ref; QDBusMessage::MessageType type; + uint32_t serial; // if type == MethodCall; the incoming serial; if type == Reply or Error, the serial we're replying to mutable uint delayedReply : 1; - uint localMessage : 1; mutable uint parametersValidated : 1; + uint localMessage : 1; uint autoStartService : 1; uint interactiveAuthorizationAllowed : 1; + uint isReplyRequired : 1; + void createResponseLink(const QDBusMessagePrivate *call); static void setParametersValidated(QDBusMessage &msg, bool enable) { msg.d_ptr->parametersValidated = enable; } |