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/mysql/qsql_mysql.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/sql/drivers/mysql/qsql_mysql.h') diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h index 01f4a52cd2e..dc4adf74e14 100644 --- a/src/sql/drivers/mysql/qsql_mysql.h +++ b/src/sql/drivers/mysql/qsql_mysql.h @@ -124,8 +124,7 @@ public: QVariant handle() const; QString escapeIdentifier(const QString &identifier, IdentifierType type) const; -protected Q_SLOTS: - bool isIdentifierEscapedImplementation(const QString &identifier, IdentifierType type) const; + bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const; protected: bool beginTransaction(); -- cgit v1.2.3