diff options
Diffstat (limited to 'src/sql/drivers/sqlite2/qsql_sqlite2.cpp')
| -rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp index 2ffd88e8c5..53876404c0 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp @@ -149,7 +149,7 @@ void QSQLite2ResultPrivate::finalize() int res = sqlite_finalize(currentMachine, &err); if (err) { q->setLastError(QSqlError(QCoreApplication::translate("QSQLite2Result", - "Unable to fetch results"), QString::fromAscii(err), + "Unable to fetch results"), QString::fromLatin1(err), QSqlError::StatementError, res)); sqlite_freemem(err); } @@ -172,14 +172,14 @@ void QSQLite2ResultPrivate::init(const char **cnames, int numCols) const char* fieldName = lastDot ? lastDot + 1 : cnames[i]; //remove quotations around the field name if any - QString fieldStr = QString::fromAscii(fieldName); + QString fieldStr = QString::fromLatin1(fieldName); QLatin1Char quote('\"'); if ( fieldStr.length() > 2 && fieldStr.startsWith(quote) && fieldStr.endsWith(quote)) { fieldStr = fieldStr.mid(1); fieldStr.chop(1); } rInf.append(QSqlField(fieldStr, - nameToType(QString::fromAscii(cnames[i+numCols])))); + nameToType(QString::fromLatin1(cnames[i+numCols])))); } } @@ -231,7 +231,7 @@ bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int if (idx < 0 && !initialFetch) return true; for (i = 0; i < colNum; ++i) - values[i + idx] = utf8 ? QString::fromUtf8(fvals[i]) : QString::fromAscii(fvals[i]); + values[i + idx] = utf8 ? QString::fromUtf8(fvals[i]) : QString::fromLatin1(fvals[i]); return true; case SQLITE_DONE: if (rInf.isEmpty()) @@ -293,13 +293,13 @@ bool QSQLite2Result::reset (const QString& query) char *err = 0; int res = sqlite_compile(d->access, d->utf8 ? query.toUtf8().constData() - : query.toAscii().constData(), + : query.toLatin1().constData(), &(d->currentTail), &(d->currentMachine), &err); if (res != SQLITE_OK || err) { setLastError(QSqlError(QCoreApplication::translate("QSQLite2Result", - "Unable to execute statement"), QString::fromAscii(err), + "Unable to execute statement"), QString::fromLatin1(err), QSqlError::StatementError, res)); sqlite_freemem(err); } @@ -399,7 +399,7 @@ bool QSQLite2Driver::open(const QString & db, const QString &, const QString &, char* err = 0; d->access = sqlite_open(QFile::encodeName(db), 0, &err); if (err) { - setLastError(QSqlError(tr("Error opening database"), QString::fromAscii(err), + setLastError(QSqlError(tr("Error opening database"), QString::fromLatin1(err), QSqlError::ConnectionError)); sqlite_freemem(err); err = 0; @@ -441,7 +441,7 @@ bool QSQLite2Driver::beginTransaction() return true; setLastError(QSqlError(tr("Unable to begin transaction"), - QString::fromAscii(err), QSqlError::TransactionError, res)); + QString::fromLatin1(err), QSqlError::TransactionError, res)); sqlite_freemem(err); return false; } @@ -458,7 +458,7 @@ bool QSQLite2Driver::commitTransaction() return true; setLastError(QSqlError(tr("Unable to commit transaction"), - QString::fromAscii(err), QSqlError::TransactionError, res)); + QString::fromLatin1(err), QSqlError::TransactionError, res)); sqlite_freemem(err); return false; } @@ -475,7 +475,7 @@ bool QSQLite2Driver::rollbackTransaction() return true; setLastError(QSqlError(tr("Unable to rollback transaction"), - QString::fromAscii(err), QSqlError::TransactionError, res)); + QString::fromLatin1(err), QSqlError::TransactionError, res)); sqlite_freemem(err); return false; } |