diff options
| author | Arno <arno@disconnect.de> | 2022-04-15 13:27:34 +0200 |
|---|---|---|
| committer | Arno <arno@disconnect.de> | 2022-04-15 13:27:34 +0200 |
| commit | 856119c5a43b4781b051b93a0713c152cfd99f85 (patch) | |
| tree | 4e2fde4e7a76179cc243e0665091c6ad429ea640 /mappingtableeditor.cpp | |
| parent | 62d3ca1482b202d2883eeb5e17e72300e8612477 (diff) | |
| download | SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.gz SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.bz2 SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.zip | |
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...
Diffstat (limited to 'mappingtableeditor.cpp')
| -rw-r--r-- | mappingtableeditor.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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){ |