From deeec5306a37e2280626f3486a07629570aafe92 Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 3 Oct 2012 15:11:56 +0200 Subject: Fix MappEditDialg Convert to new mapping DB layout. Return the parent ID where necessary instead of the mapping ID. --- pictureswidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pictureswidget.cpp') diff --git a/pictureswidget.cpp b/pictureswidget.cpp index bc4b143..745a133 100644 --- a/pictureswidget.cpp +++ b/pictureswidget.cpp @@ -283,7 +283,7 @@ PicFilesModel::PicFilesModel(const QStringList &headers, QObject *parent) : SmTr mDeleteMappingsQ = new QSqlQuery(mDb); mDeleteMappingsQ->prepare("DELETE FROM pics_mappings2 WHERE ipics_id = :id"); mAddMappingsQ = new QSqlQuery(mDb); - mAddMappingsQ->prepare("INSERT INTO pics_mappings2(ipics_id, imapping_id) VALUES(:pid, :id)"); + mAddMappingsQ->prepare("INSERT INTO pics_mappings2(ipics_id, imappings_parents_id) VALUES(:pid, :id)"); } @@ -415,7 +415,7 @@ QList PicFilesModel::mappingDataFromFiles(const QList fileIds) foreach(int pId, parentIds){ QModelIndex curIdx = mMappingTreeModel->findRecursive(pId, MappingTreeModel::MapParentId, mMappingTreeModel->rootIndex()); MappingData curData; - curData.id = curIdx.data(MappingTreeModel::IdRole).toInt(); + curData.id = curIdx.data(MappingTreeModel::MapParentIdRole).toInt(); curData.name = curIdx.data(MappingTreeModel::NameRole).toString(); curData.path = mMappingTreeModel->path(curIdx); retval << curData; -- cgit v1.2.3-70-g09d2