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/kernel/qsqldriver.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/kernel/qsqldriver.h')
| -rw-r--r-- | src/sql/kernel/qsqldriver.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h index 5fd74411db..ff19d660da 100644 --- a/src/sql/kernel/qsqldriver.h +++ b/src/sql/kernel/qsqldriver.h @@ -110,12 +110,12 @@ public: const QString& host = QString(), int port = -1, const QString& connOpts = QString()) = 0; - bool subscribeToNotification(const QString &name); // ### Qt 5: make virtual - bool unsubscribeFromNotification(const QString &name); // ### Qt 5: make virtual - QStringList subscribedToNotifications() const; // ### Qt 5: make virtual + virtual bool subscribeToNotification(const QString &name); + virtual bool unsubscribeFromNotification(const QString &name); + virtual QStringList subscribedToNotifications() const; - bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const; // ### Qt 5: make virtual - QString stripDelimiters(const QString &identifier, IdentifierType type) const; // ### Qt 5: make virtual + virtual bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const; + virtual QString stripDelimiters(const QString &identifier, IdentifierType type) const; void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy); QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const; @@ -129,13 +129,6 @@ protected: virtual void setOpenError(bool e); virtual void setLastError(const QSqlError& e); -protected Q_SLOTS: - bool subscribeToNotificationImplementation(const QString &name); // ### Qt 5: eliminate, see subscribeToNotification() - bool unsubscribeFromNotificationImplementation(const QString &name); // ### Qt 5: eliminate, see unsubscribeFromNotification() - QStringList subscribedToNotificationsImplementation() const; // ### Qt 5: eliminate, see subscribedNotifications() - - bool isIdentifierEscapedImplementation(const QString &identifier, IdentifierType type) const; // ### Qt 5: eliminate, see isIdentifierEscaped() - QString stripDelimitersImplementation(const QString &identifier, IdentifierType type) const; // ### Qt 5: eliminate, see stripDelimiters() private: Q_DISABLE_COPY(QSqlDriver) |