1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtSql: remove deprecated signal 'notification(QString)'

Browse Source 
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>
This commit is contained in:
Christian Ehrlicher 2020-01-31 22:26:03 +01:00
parent 947d1eaaa4
commit 0eb922a4e9
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/sqldrivers/ibase/qsql_ibase.cpp
View File

@ -1913,15 +1913,8 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer)
isc_event_counts(counts, eBuffer->bufferLength, eBuffer->eventBuffer, eBuffer->resultBuffer); isc_event_counts(counts, eBuffer->bufferLength, eBuffer->eventBuffer, eBuffer->resultBuffer);
if (counts[0]) { if (counts[0]) {
if (eBuffer->subscriptionState == QIBaseEventBuffer::Subscribed) { 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
emit notification(i.key(), QSqlDriver::UnknownSource, QVariant()); emit notification(i.key(), QSqlDriver::UnknownSource, QVariant());
}
else if (eBuffer->subscriptionState == QIBaseEventBuffer::Starting) else if (eBuffer->subscriptionState == QIBaseEventBuffer::Starting)
eBuffer->subscriptionState = QIBaseEventBuffer::Subscribed; eBuffer->subscriptionState = QIBaseEventBuffer::Subscribed;

14
src/sql/kernel/qsqldriver.cpp
View File

@ -100,20 +100,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 \since 5.0