diff options
Diffstat (limited to 'src/dbus/qdbusconnection.h')
| -rw-r--r-- | src/dbus/qdbusconnection.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 66fb514865..10598c0b7b 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -1,7 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2015 Intel Corporation. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtDBus module of the Qt Toolkit. ** @@ -10,9 +11,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ @@ -35,6 +36,7 @@ #define QDBUSCONNECTION_H #include <QtDBus/qdbusmacros.h> +#include <QtCore/qobjectdefs.h> #include <QtCore/qstring.h> #ifndef QT_NO_DBUS @@ -159,6 +161,8 @@ public: bool registerObject(const QString &path, QObject *object, RegisterOptions options = ExportAdaptors); + bool registerObject(const QString &path, const QString &interface, QObject *object, + RegisterOptions options = ExportAdaptors); void unregisterObject(const QString &path, UnregisterMode mode = UnregisterNode); QObject *objectRegisteredAt(const QString &path) const; @@ -183,7 +187,10 @@ public: static QDBusConnection sessionBus(); static QDBusConnection systemBus(); - static QDBusConnection sender(); +#if QT_DEPRECATED_SINCE(5,5) + static QT_DEPRECATED_X("This function no longer works, use QDBusContext instead") + QDBusConnection sender(); +#endif protected: explicit QDBusConnection(QDBusConnectionPrivate *dd); |