summaryrefslogtreecommitdiffstats
path: root/src/sql/kernel/qsqldriver.h
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-07-05 18:30:35 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-06 12:03:30 +0200
commitf306d18fe6555a9a5c60560745773b0bf5685ec3 (patch)
tree9f9604b495a535ef256a96c0f33ea5c99033a032 /src/sql/kernel/qsqldriver.h
parentceceb3796fbfdcd944fc7da7c8b2198fca69cb44 (diff)
Remove QT3_SUPPORT from qsql, qxml
Change-Id: Iab36ef60de2f0201efa4eb86d8ed5e514d6244fb Reviewed-on: http://codereview.qt.nokia.com/1188 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/sql/kernel/qsqldriver.h')
-rw-r--r--src/sql/kernel/qsqldriver.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index 479d3ac990..ee1e52538a 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -46,9 +46,6 @@
#include <QtCore/qstring.h>
#include <QtCore/qstringlist.h>
#include <QtSql/qsql.h>
-#ifdef QT3_SUPPORT
-#include <QtSql/qsqlquery.h>
-#endif
QT_BEGIN_HEADER
@@ -93,17 +90,6 @@ public:
virtual QStringList tables(QSql::TableType tableType) const;
virtual QSqlIndex primaryIndex(const QString &tableName) const;
virtual QSqlRecord record(const QString &tableName) const;
-#ifdef QT3_SUPPORT
- inline QT3_SUPPORT QSqlRecord record(const QSqlQuery& query) const
- { return query.record(); }
- inline QT3_SUPPORT QSqlRecord recordInfo(const QString& tablename) const
- { return record(tablename); }
- inline QT3_SUPPORT QSqlRecord recordInfo(const QSqlQuery& query) const
- { return query.record(); }
- inline QT3_SUPPORT QString nullText() const { return QLatin1String("NULL"); }
- inline QT3_SUPPORT QString formatValue(const QSqlField *field, bool trimStrings = false) const
- { return field ? formatValue(*field, trimStrings) : QString(); }
-#endif
virtual QString formatValue(const QSqlField& field, bool trimStrings = false) const;
virtual QString escapeIdentifier(const QString &identifier, IdentifierType type) const;