From 856119c5a43b4781b051b93a0713c152cfd99f85 Mon Sep 17 00:00:00 2001 From: Arno Date: Fri, 15 Apr 2022 13:27:34 +0200 Subject: Make it run with Qt6 This is a huge commit. Changes: * Obviously, make it compile * Make it run (only scarcely tested) * get rid of most of clang's warnings Let's see what surprises are in store... --- mappingtablemodel.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'mappingtablemodel.cpp') diff --git a/mappingtablemodel.cpp b/mappingtablemodel.cpp index d472ef8..0c5e511 100644 --- a/mappingtablemodel.cpp +++ b/mappingtablemodel.cpp @@ -21,28 +21,28 @@ MappingTableModel::MappingTableModel(QStringList &headers, const QString &table, mSequenceName = QString("%1_i%1_id__seq").arg(mTable); //queries - QString updateNameQuery = QString("UPDATE %1 set %2 = :name WHERE %3 = :id").arg(mTable).arg(mNameColumnName).arg(mIdColumnName); + QString updateNameQuery = QString("UPDATE %1 set %2 = :name WHERE %3 = :id").arg(mTable, mNameColumnName, mIdColumnName); mUpdateItemNameQuery = new QSqlQuery(mDb); mUpdateItemNameQuery->prepare(updateNameQuery); - QString insertItemQuery = QString("INSERT INTO %1 (%2) VALUES (:name)").arg(mTable).arg(mNameColumnName); + QString insertItemQuery = QString("INSERT INTO %1 (%2) VALUES (:name)").arg(mTable, mNameColumnName); mInsertItemQuery = new QSqlQuery(mDb); mInsertItemQuery->prepare(insertItemQuery); - QString deleteItemQuery = QString("DELETE FROM %1 WHERE %2 = :id").arg(mTable).arg(mIdColumnName); + QString deleteItemQuery = QString("DELETE FROM %1 WHERE %2 = :id").arg(mTable, mIdColumnName); mDeleteItemQuery = new QSqlQuery(mDb); mDeleteItemQuery->prepare(deleteItemQuery); - QString addMappingQuery = QString("INSERT INTO %1 (iseriesparts_id, %2) VALUES (:id1, :id2)").arg(mMappingTable).arg(mIdColumnName); + QString addMappingQuery = QString("INSERT INTO %1 (iseriesparts_id, %2) VALUES (:id1, :id2)").arg(mMappingTable, mIdColumnName); mAddMappingQuery = new QSqlQuery(mDb); mAddMappingQuery->prepare(addMappingQuery); - QString removeMappingQuery = QString("DELETE FROM %1 WHERE iseriesparts_id = :id1 AND %2 = :id2").arg(mMappingTable).arg(mIdColumnName); + QString removeMappingQuery = QString("DELETE FROM %1 WHERE iseriesparts_id = :id1 AND %2 = :id2").arg(mMappingTable, mIdColumnName); mRemoveMappingQuery = new QSqlQuery(mDb); mRemoveMappingQuery->prepare(removeMappingQuery); - QString mappingQuery = QString("SELECT %1 FROM %2, %3 WHERE %2.%4 = %3.%4 AND %3.iseriesparts_id = :id").arg(mNameColumnName).arg(mTable).arg(mMappingTable).arg(mIdColumnName); + QString mappingQuery = QString("SELECT %1 FROM %2, %3 WHERE %2.%4 = %3.%4 AND %3.iseriesparts_id = :id").arg(mNameColumnName, mTable, mMappingTable, mIdColumnName); mMappingQuery = new QSqlQuery(mDb); mMappingQuery->prepare(mappingQuery); - QString allItemsQuery = QString("SELECT %1, %2 FROM %3").arg(mIdColumnName).arg(mNameColumnName).arg(mTable); + QString allItemsQuery = QString("SELECT %1, %2 FROM %3").arg(mIdColumnName, mNameColumnName, mTable); mAllItemsQuery = new QSqlQuery(mDb); mAllItemsQuery->prepare(allItemsQuery); - QString itemCountQuery = QString("SELECT COUNT(*) FROM %1 WHERE %2 = :id").arg(mMappingTable).arg(mIdColumnName); + QString itemCountQuery = QString("SELECT COUNT(*) FROM %1 WHERE %2 = :id").arg(mMappingTable, mIdColumnName); mItemCountQuery = new QSqlQuery(mDb); mItemCountQuery->prepare(itemCountQuery); @@ -244,7 +244,7 @@ void MappingTableModel::deleteItems(const QList &ids){ } void MappingTableModel::populate(){ - QString query = QString("SELECT %1, %2 FROM %3 ORDER BY %2").arg(mIdColumnName).arg(mNameColumnName).arg(mTable); + QString query = QString("SELECT %1, %2 FROM %3 ORDER BY %2").arg(mIdColumnName, mNameColumnName, mTable); QList rootData; mItemNames.clear(); rootData << QString(tr("%1 name")).arg(mTable) << tr("Id"); -- cgit v1.2.3-70-g09d2