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... --- mappingtableeditor.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mappingtableeditor.cpp') diff --git a/mappingtableeditor.cpp b/mappingtableeditor.cpp index 4c85313..c297e7f 100644 --- a/mappingtableeditor.cpp +++ b/mappingtableeditor.cpp @@ -91,7 +91,7 @@ void MappingTableEditor::removeItem(){ } int count = selected.at(0).data(MappingTableEditorModel::CountRole).toInt(); if(count > 0){ - QString warning = QString(tr("Really remove %1 %2? There are %3 items associated with it.")).arg(mTable).arg(selected.at(0).data(MappingTableEditorModel::NameRole).toString()).arg(QString::number(count)); + QString warning = QString(tr("Really remove %1 %2? There are %3 items associated with it.")).arg(mTable, selected.at(0).data(MappingTableEditorModel::NameRole).toString(), QString::number(count)); int mbRetval = QMessageBox::warning(this, tr("Warning!"), warning, QMessageBox::Yes | QMessageBox::No); if(mbRetval == QMessageBox::No){ return; @@ -140,7 +140,6 @@ MappingTableEditorModel::MappingTableEditorModel(const QString &table, const QSt QString queryString = QString("SELECT t%1name, COUNT(iseriesparts_id), %1s.i%1s_id from %1s, seriesparts_%1map WHERE %1s.i%1s_id = seriesparts_%1map.i%1s_id GROUP BY %1s.t%1name, %1s.i%1s_id ORDER BY t%1name").arg(mTable); mDataQuery = new QSqlQuery(mDb); mDataQuery->prepare(queryString); - QString mergeQuery = QString("UPDATE %1s SET %1s_id = %2 WHERE %1s_id = %3"); populate(); } @@ -206,7 +205,7 @@ bool MappingTableEditorModel::removeData(const QModelIndex &idx){ if(!idx.isValid()){ return false; } - QString removeQuery = QString("DELETE FROM %1s WHERE i%1s_id = %2").arg(mTable).arg(QString::number(idx.data(IdRole).toInt())); + QString removeQuery = QString("DELETE FROM %1s WHERE i%1s_id = %2").arg(mTable, QString::number(idx.data(IdRole).toInt())); QSqlQuery remove(removeQuery, mDb); bool retval = remove.exec(); if(retval){ -- cgit v1.2.3-70-g09d2