diff options
Diffstat (limited to 'src/sql/models/qsqltablemodel.cpp')
-rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index a6a8f68d20..265d7782a0 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -typedef QSqlTableModelSql Sql; +using SqlTm = QSqlTableModelSql; QSqlTableModelPrivate::~QSqlTableModelPrivate() { @@ -32,7 +32,7 @@ QSqlTableModelPrivate::~QSqlTableModelPrivate() QSqlRecord QSqlTableModelPrivate::record(const QList<QVariant> &values) const { QSqlRecord r = rec; - for (int i = 0; i < r.count() && i < values.count(); ++i) + for (int i = 0; i < r.count() && i < values.size(); ++i) r.setValue(i, values.at(i)); return r; } @@ -205,7 +205,7 @@ bool QSqlTableModelPrivate::exec(const QString &stmt, bool prepStatement, want to resolve foreign keys. \sa QSqlRelationalTableModel, QSqlQuery, {Model/View Programming}, - {Table Model Example}, {Cached Table Example} + {Table Model Example}, {Cached SQL Table} */ /*! @@ -342,7 +342,7 @@ bool QSqlTableModel::select() d->clearCache(); - setQuery(query, d->db); + this->QSqlQueryModel::setQuery(query, d->db); if (!d->query.isActive() || lastError().isValid()) { // something went wrong - revert to non-select state @@ -379,9 +379,9 @@ bool QSqlTableModel::selectRow(int row) d->tableName, primaryValues(row), false); - static const QString wh = Sql::where() + Sql::sp(); + static const QString wh = SqlTm::where() + SqlTm::sp(); if (d->filter.startsWith(wh, Qt::CaseInsensitive)) - d->filter.remove(0, wh.length()); + d->filter.remove(0, wh.size()); QString stmt; @@ -614,7 +614,7 @@ bool QSqlTableModel::updateRowInTable(int row, const QSqlRecord &values) return false; } - return d->exec(Sql::concat(stmt, where), prepStatement, rec, whereValues); + return d->exec(SqlTm::concat(stmt, where), prepStatement, rec, whereValues); } @@ -682,7 +682,7 @@ bool QSqlTableModel::deleteRowFromTable(int row) return false; } - return d->exec(Sql::concat(stmt, where), prepStatement, QSqlRecord() /* no new values */, whereValues); + return d->exec(SqlTm::concat(stmt, where), prepStatement, QSqlRecord() /* no new values */, whereValues); } /*! @@ -954,8 +954,8 @@ QString QSqlTableModel::orderByClause() const QString field = d->db.driver()->escapeIdentifier(d->tableName, QSqlDriver::TableName) + u'.' + d->db.driver()->escapeIdentifier(f.name(), QSqlDriver::FieldName); - field = d->sortOrder == Qt::AscendingOrder ? Sql::asc(field) : Sql::desc(field); - return Sql::orderBy(field); + field = d->sortOrder == Qt::AscendingOrder ? SqlTm::asc(field) : SqlTm::desc(field); + return SqlTm::orderBy(field); } /*! @@ -997,7 +997,7 @@ QString QSqlTableModel::selectStatement() const QString(), QSqlError::StatementError); return stmt; } - return Sql::concat(Sql::concat(stmt, Sql::where(d->filter)), orderByClause()); + return SqlTm::concat(SqlTm::concat(stmt, SqlTm::where(d->filter)), orderByClause()); } /*! |