diff options
| author | Timothy Pearson <[email protected]> | 2012-06-17 17:28:28 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-06-17 17:28:28 -0500 |
| commit | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (patch) | |
| tree | 7c336cbed3a93807a34cd4df39b2f92a7d48a141 /src/sql | |
| parent | f27c2533f735d53c6b555f387c6390c0690cc246 (diff) | |
| download | tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.tar.gz tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.zip | |
Automated update from Qt3
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/ibase/qsql_ibase.cpp | 10 | ||||
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index 59d9f89a5..6a1d0abfd 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -495,10 +495,10 @@ bool TQIBaseResult::exec() switch(d->inda->sqlvar[para].sqltype & ~1) { case SQL_INT64: if (d->inda->sqlvar[para].sqlscale < 0) - *((Q_LLONG*)d->inda->sqlvar[para].sqldata) = Q_LLONG(val.toDouble() * + *((TQ_LLONG*)d->inda->sqlvar[para].sqldata) = TQ_LLONG(val.toDouble() * pow(10.0, d->inda->sqlvar[para].sqlscale * -1)); else - *((Q_LLONG*)d->inda->sqlvar[para].sqldata) = val.toLongLong(); + *((TQ_LLONG*)d->inda->sqlvar[para].sqldata) = val.toLongLong(); break; case SQL_LONG: *((long*)d->inda->sqlvar[para].sqldata) = (long)val.toLongLong(); @@ -650,15 +650,15 @@ bool TQIBaseResult::gotoNext(TQtSqlCachedResult::RowCache* row) break; case SQL_INT64: if (d->sqlda->sqlvar[i].sqlscale < 0) - (*row)[i] = *(Q_LLONG*)buf * pow(10.0, d->sqlda->sqlvar[i].sqlscale); + (*row)[i] = *(TQ_LLONG*)buf * pow(10.0, d->sqlda->sqlvar[i].sqlscale); else - (*row)[i] = TQVariant(*(Q_LLONG*)buf); + (*row)[i] = TQVariant(*(TQ_LLONG*)buf); break; case SQL_LONG: if (sizeof(int) == sizeof(long)) //dear compiler: please optimize me out. (*row)[i] = TQVariant((int)(*(long*)buf)); else - (*row)[i] = TQVariant((Q_LLONG)(*(long*)buf)); + (*row)[i] = TQVariant((TQ_LLONG)(*(long*)buf)); break; case SQL_SHORT: (*row)[i] = TQVariant((int)(*(short*)buf)); diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index cfe4d337f..7abf5c59a 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -872,7 +872,7 @@ TQVariant TQODBCResult::data( int field ) const TQSqlFieldInfo info = d->rInf[ current ]; switch ( info.type() ) { case TQVariant::LongLong: - fieldCache[ current ] = TQVariant( (Q_LLONG) qGetBigIntData( d->hStmt, current, isNull ) ); + fieldCache[ current ] = TQVariant( (TQ_LLONG) qGetBigIntData( d->hStmt, current, isNull ) ); nullCache[ current ] = isNull; break; case TQVariant::Int: |