diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-02 10:35:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-03 00:12:05 +0200 |
| commit | 93dad2bf91d414a41c6e2c7db6c75171b4917d4d (patch) | |
| tree | f3684b5dd6cece6b6e791c8e7551f63871b44890 /src/dbus | |
| parent | b73d5a0511bed8c3ccc504e74c52a61d4d3749b4 (diff) | |
Switch Q_DECL_DEPRECATED to use C++14 [[deprecated]]
As a C++ attribute it must be on the beginning of the line or after
the function name however. And for friend declarations can only
be on the definition.
Change-Id: I456884428f36e1f1c621089c7b1addee13ada0fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 15 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection.h | 5 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 78c596bea6..c4f5e2a0fa 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -1182,21 +1182,6 @@ QDBusConnection QDBusConnection::systemBus() return QDBusConnection(_q_manager()->busConnection(SystemBus)); } -#if QT_DEPRECATED_SINCE(5,5) -/*! - \deprecated - - Always returns a disconnected, invalid QDBusConnection object. For the old - functionality of determining the sender connection, please use QDBusContext. - - \sa QDBusContext -*/ -QDBusConnection QDBusConnection::sender() -{ - return QDBusConnection(QString()); -} -#endif - /*! \internal */ diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 7304f2a8a2..43bc547894 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -202,11 +202,6 @@ public: static QDBusConnection sessionBus(); static QDBusConnection systemBus(); -#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); |