diff options
| author | Matt Newell <newellm@blur.com> | 2012-03-22 13:27:26 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-02 22:26:10 +0200 |
| commit | ccf25f1d2875645067066ffb1038d23c4c1c39c1 (patch) | |
| tree | e7f5032d1bde79cca2065371694fc05ed6445fdf /src/sql/drivers/mysql/qsql_mysql.h | |
| parent | 6aded68111885d4df3d17a1d5f12e538c632af60 (diff) | |
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 <mabrand@mabrand.nl>
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.h')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.h | 3 |
1 files changed, 1 insertions, 2 deletions
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(); |