diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-01-31 22:26:03 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-02-07 20:22:45 +0100 |
commit | 0eb922a4e99da83f5600d36510668dfa002a17aa (patch) | |
tree | 86b88c84fc345b07f45d3e9f5d020306bbc676f6 /src | |
parent | 947d1eaaa470c310351756caa506e35b5cd3c122 (diff) |
QtSql: remove deprecated signal 'notification(QString)'
It was deprecated in Qt5 and the replacement signal with three arguments
can be used instead.
Change-Id: I6d0db8d9fa9bea2039c548e32bc39a8173403c3a
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 9 | ||||
-rw-r--r-- | src/sql/kernel/qsqldriver.cpp | 14 |
2 files changed, 1 insertions, 22 deletions
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index 7bacb59994..ae213365b7 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -1913,15 +1913,8 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer) isc_event_counts(counts, eBuffer->bufferLength, eBuffer->eventBuffer, eBuffer->resultBuffer); if (counts[0]) { - if (eBuffer->subscriptionState == QIBaseEventBuffer::Subscribed) { -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit notification(i.key()); -QT_WARNING_POP -#endif + if (eBuffer->subscriptionState == QIBaseEventBuffer::Subscribed) emit notification(i.key(), QSqlDriver::UnknownSource, QVariant()); - } else if (eBuffer->subscriptionState == QIBaseEventBuffer::Starting) eBuffer->subscriptionState = QIBaseEventBuffer::Subscribed; diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp index 638476c2c1..8753352617 100644 --- a/src/sql/kernel/qsqldriver.cpp +++ b/src/sql/kernel/qsqldriver.cpp @@ -101,20 +101,6 @@ QSqlDriver::~QSqlDriver() } /*! - \since 4.4 - - \fn QSqlDriver::notification(const QString &name) - - This signal is emitted when the database posts an event notification - that the driver subscribes to. \a name identifies the event notification. - - \sa subscribeToNotification() - - \obsolete use QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload) - instead -*/ - -/*! \since 5.0 \fn QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant & payload) |