diff options
Diffstat (limited to 'src/sql/drivers')
-rw-r--r-- | src/sql/drivers/ibase/qsql_ibase.cpp | 6 | ||||
-rw-r--r-- | src/sql/drivers/ibase/qsql_ibase.h | 7 | ||||
-rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 2 | ||||
-rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.h | 3 | ||||
-rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 | ||||
-rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.h | 3 | ||||
-rw-r--r-- | src/sql/drivers/psql/qsql_psql.cpp | 6 | ||||
-rw-r--r-- | src/sql/drivers/psql/qsql_psql.h | 9 |
8 files changed, 17 insertions, 21 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index 1109dfd62a..0da7f05cbf 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -1749,7 +1749,7 @@ static isc_callback qEventCallback(char *result, short length, char *updated) return 0; } -bool QIBaseDriver::subscribeToNotificationImplementation(const QString &name) +bool QIBaseDriver::subscribeToNotification(const QString &name) { if (!isOpen()) { qWarning("QIBaseDriver::subscribeFromNotificationImplementation: database not open."); @@ -1798,7 +1798,7 @@ bool QIBaseDriver::subscribeToNotificationImplementation(const QString &name) return true; } -bool QIBaseDriver::unsubscribeFromNotificationImplementation(const QString &name) +bool QIBaseDriver::unsubscribeFromNotification(const QString &name) { if (!isOpen()) { qWarning("QIBaseDriver::unsubscribeFromNotificationImplementation: database not open."); @@ -1827,7 +1827,7 @@ bool QIBaseDriver::unsubscribeFromNotificationImplementation(const QString &name return true; } -QStringList QIBaseDriver::subscribedToNotificationsImplementation() const +QStringList QIBaseDriver::subscribedToNotifications() const { return QStringList(d->eventBuffers.keys()); } diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h index cda9112d7c..2cdf91f469 100644 --- a/src/sql/drivers/ibase/qsql_ibase.h +++ b/src/sql/drivers/ibase/qsql_ibase.h @@ -113,10 +113,9 @@ public: QString escapeIdentifier(const QString &identifier, IdentifierType type) const; -protected Q_SLOTS: - bool subscribeToNotificationImplementation(const QString &name); - bool unsubscribeFromNotificationImplementation(const QString &name); - QStringList subscribedToNotificationsImplementation() const; + bool subscribeToNotification(const QString &name); + bool unsubscribeFromNotification(const QString &name); + QStringList subscribedToNotifications() const; private Q_SLOTS: void qHandleEventNotification(void* updatedResultBuffer); diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index 3048748a20..8a5e0bb34b 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -1534,7 +1534,7 @@ QString QMYSQLDriver::escapeIdentifier(const QString &identifier, IdentifierType return res; } -bool QMYSQLDriver::isIdentifierEscapedImplementation(const QString &identifier, IdentifierType type) const +bool QMYSQLDriver::isIdentifierEscaped(const QString &identifier, IdentifierType type) const { Q_UNUSED(type); return identifier.size() > 2 diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h index 01f4a52cd2..dc4adf74e1 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(); diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 40cd2e6f75..4c57674930 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -2540,7 +2540,7 @@ QString QODBCDriver::escapeIdentifier(const QString &identifier, IdentifierType) return res; } -bool QODBCDriver::isIdentifierEscapedImplementation(const QString &identifier, IdentifierType) const +bool QODBCDriver::isIdentifierEscaped(const QString &identifier, IdentifierType) const { QChar quote = d->quoteChar(); return identifier.size() > 2 diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h index 0741ad4491..a89ce0f9b3 100644 --- a/src/sql/drivers/odbc/qsql_odbc.h +++ b/src/sql/drivers/odbc/qsql_odbc.h @@ -135,8 +135,7 @@ public: 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(); diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index ec31d54f0f..edeb5d1542 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; } diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h index 94871b4c99..204a8a9105 100644 --- a/src/sql/drivers/psql/qsql_psql.h +++ b/src/sql/drivers/psql/qsql_psql.h @@ -134,16 +134,15 @@ public: QString escapeIdentifier(const QString &identifier, IdentifierType type) const; QString formatValue(const QSqlField &field, bool trimStrings) const; + bool subscribeToNotification(const QString &name); + bool unsubscribeFromNotification(const QString &name); + QStringList subscribedToNotifications() const; + protected: bool beginTransaction(); bool commitTransaction(); bool rollbackTransaction(); -protected Q_SLOTS: - bool subscribeToNotificationImplementation(const QString &name); - bool unsubscribeFromNotificationImplementation(const QString &name); - QStringList subscribedToNotificationsImplementation() const; - private Q_SLOTS: void _q_handleNotification(int); |