diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
| commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
| tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/sql/kernel/qsqldriver.h | |
| parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
| parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
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 cf293cda0f..b3c83fc678 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) |