summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/doc/qtsql.qdocconf3
-rw-r--r--src/sql/doc/src/qtsql.qdoc1
-rw-r--r--src/sql/drivers/db2/qsql_db2.cpp18
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.cpp28
4 files changed, 27 insertions, 23 deletions
diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index c2686079d5..a2a05d7c8a 100644
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -39,3 +39,6 @@ exampledirs += ../../../examples/sql \
imagedirs += images \
../../../examples/sql/doc/images
+
+navigation.landingpage = "Qt SQL"
+navigation.cppclassespage = "Qt SQL C++ Classes"
diff --git a/src/sql/doc/src/qtsql.qdoc b/src/sql/doc/src/qtsql.qdoc
index 8ce981756a..2f806b4b45 100644
--- a/src/sql/doc/src/qtsql.qdoc
+++ b/src/sql/doc/src/qtsql.qdoc
@@ -62,6 +62,7 @@
\module QtSql
\title Qt SQL C++ Classes
\ingroup modules
+ \qtvariable sql
\brief Provides a driver layer, SQL API layer, and a user
interface layer for SQL databases.
diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp
index e58710e0f5..d799060633 100644
--- a/src/sql/drivers/db2/qsql_db2.cpp
+++ b/src/sql/drivers/db2/qsql_db2.cpp
@@ -633,7 +633,7 @@ bool QDB2Result::exec()
dt->day = qdt.day();
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_DATE,
SQL_DATE,
0,
@@ -653,7 +653,7 @@ bool QDB2Result::exec()
dt->second = qdt.second();
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_TIME,
SQL_TIME,
0,
@@ -677,7 +677,7 @@ bool QDB2Result::exec()
dt->fraction = qdt.time().msec() * 1000000;
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_TIMESTAMP,
SQL_TIMESTAMP,
0,
@@ -690,7 +690,7 @@ bool QDB2Result::exec()
case QVariant::Int:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_SLONG,
SQL_INTEGER,
0,
@@ -702,7 +702,7 @@ bool QDB2Result::exec()
case QVariant::Double:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_DOUBLE,
SQL_DOUBLE,
0,
@@ -717,7 +717,7 @@ bool QDB2Result::exec()
*ind = len;
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_BINARY,
SQL_LONGVARBINARY,
len,
@@ -735,7 +735,7 @@ bool QDB2Result::exec()
QByteArray ba((char*)str.utf16(), str.capacity() * sizeof(QChar));
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_WCHAR,
SQL_WVARCHAR,
str.length(),
@@ -749,7 +749,7 @@ bool QDB2Result::exec()
int len = str.length();
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_WCHAR,
SQL_WVARCHAR,
len,
@@ -767,7 +767,7 @@ bool QDB2Result::exec()
*ind = ba.length();
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & 3],
+ qParamType[bindValueType(i) & 3],
SQL_C_CHAR,
SQL_VARCHAR,
len,
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 77accc6e9d..ac6d677d54 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1349,7 +1349,7 @@ bool QODBCResult::exec()
dt->day = qdt.day();
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_DATE,
SQL_DATE,
0,
@@ -1369,7 +1369,7 @@ bool QODBCResult::exec()
dt->second = qdt.second();
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_TIME,
SQL_TIME,
0,
@@ -1404,7 +1404,7 @@ bool QODBCResult::exec()
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_TIMESTAMP,
SQL_TIMESTAMP,
d->driverPrivate->datetime_precision,
@@ -1417,7 +1417,7 @@ bool QODBCResult::exec()
case QVariant::Int:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_SLONG,
SQL_INTEGER,
0,
@@ -1429,7 +1429,7 @@ bool QODBCResult::exec()
case QVariant::UInt:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_ULONG,
SQL_NUMERIC,
15,
@@ -1441,7 +1441,7 @@ bool QODBCResult::exec()
case QVariant::Double:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_DOUBLE,
SQL_DOUBLE,
0,
@@ -1453,7 +1453,7 @@ bool QODBCResult::exec()
case QVariant::LongLong:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_SBIGINT,
SQL_BIGINT,
0,
@@ -1465,7 +1465,7 @@ bool QODBCResult::exec()
case QVariant::ULongLong:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_UBIGINT,
SQL_BIGINT,
0,
@@ -1480,7 +1480,7 @@ bool QODBCResult::exec()
}
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_BINARY,
SQL_LONGVARBINARY,
val.toByteArray().size(),
@@ -1492,7 +1492,7 @@ bool QODBCResult::exec()
case QVariant::Bool:
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_BIT,
SQL_BIT,
0,
@@ -1513,7 +1513,7 @@ bool QODBCResult::exec()
QByteArray ba((const char *)a.constData(), a.size() * sizeof(SQLTCHAR));
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_TCHAR,
strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
0, // god knows... don't change this!
@@ -1527,7 +1527,7 @@ bool QODBCResult::exec()
QByteArray strba((const char *)toSQLTCHAR(str).constData(), str.size()*sizeof(SQLTCHAR));
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_TCHAR,
strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
strSize,
@@ -1547,7 +1547,7 @@ bool QODBCResult::exec()
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_CHAR,
strSize > 254 ? SQL_LONGVARCHAR : SQL_VARCHAR,
strSize,
@@ -1565,7 +1565,7 @@ bool QODBCResult::exec()
*ind = ba.size();
r = SQLBindParameter(d->hStmt,
i + 1,
- qParamType[(QFlag)(bindValueType(i)) & QSql::InOut],
+ qParamType[bindValueType(i) & QSql::InOut],
SQL_C_BINARY,
SQL_VARBINARY,
ba.length() + 1,