From ccf25f1d2875645067066ffb1038d23c4c1c39c1 Mon Sep 17 00:00:00 2001 From: Matt Newell Date: Thu, 22 Mar 2012 13:27:26 -0700 Subject: QSqlDriver functions made virtual Certain QSqlDriver functions were marked to be made virtual in Qt5. subscribeToNotification, unsubscribeFromNotification, subscribedToNotifications, isIdentifierEscaped, and stripDelimiters. This patch makes them virtual and removes the no longer needed Implementation counterpart functions. It also updates the relevant drivers. This patch has no regressions on the tests in tests/auto/sql/kernel/, tested with sqlite and postgres. Change-Id: Ia2e1c18dfb803531523a456eb4e710031048e594 Reviewed-by: Mark Brand --- src/sql/drivers/psql/qsql_psql.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sql/drivers/psql/qsql_psql.cpp') diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index ec31d54f0f1..edeb5d15424 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -1283,7 +1283,7 @@ QPSQLDriver::Protocol QPSQLDriver::protocol() const return d->pro; } -bool QPSQLDriver::subscribeToNotificationImplementation(const QString &name) +bool QPSQLDriver::subscribeToNotification(const QString &name) { if (!isOpen()) { qWarning("QPSQLDriver::subscribeToNotificationImplementation: database not open."); @@ -1317,7 +1317,7 @@ bool QPSQLDriver::subscribeToNotificationImplementation(const QString &name) return true; } -bool QPSQLDriver::unsubscribeFromNotificationImplementation(const QString &name) +bool QPSQLDriver::unsubscribeFromNotification(const QString &name) { if (!isOpen()) { qWarning("QPSQLDriver::unsubscribeFromNotificationImplementation: database not open."); @@ -1350,7 +1350,7 @@ bool QPSQLDriver::unsubscribeFromNotificationImplementation(const QString &name) return true; } -QStringList QPSQLDriver::subscribedToNotificationsImplementation() const +QStringList QPSQLDriver::subscribedToNotifications() const { return d->seid; } -- cgit v1.2.3