From c01144b29afc0879ebff89704b10095696721930 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 17 Nov 2012 06:35:40 +0100 Subject: Yet another MappingTreeModel fix Forgot to fix/rename MappingTreeResultModel... Adding pictures works again :) --- mappingtreemodel.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mappingtreemodel.cpp') diff --git a/mappingtreemodel.cpp b/mappingtreemodel.cpp index cf8bfc0..eed7d51 100644 --- a/mappingtreemodel.cpp +++ b/mappingtreemodel.cpp @@ -488,8 +488,8 @@ bool MappingTreeResultModel::setData(const QModelIndex &index, const QVariant &v item->setData(ParentId, value); return true; } - if(role == MyIdRole){ - item->setData(MyId, value); + if(role == DescIdRole){ + item->setData(DescId, value); return true; } return SmTreeModel::setData(index, value, role); @@ -509,20 +509,20 @@ void MappingTreeResultModel::addItem(const MappingData &data){ //insert child int mappingId = -1; int parentId = -1; - int myId = -1; + int descId = -1; if(i == p.count() - 1){ mappingId = data.mappingId; parentId = data.parentId; - myId = data.descId; + descId = data.descId; } - QModelIndex curIdx = insertChild(p.at(i), mappingId, parentId, myId, curItem); + QModelIndex curIdx = insertChild(p.at(i), mappingId, parentId, descId, curItem); curItem = itemAt(curIdx); } } } } -QModelIndex MappingTreeResultModel::insertChild(const QVariant &data, int mappingId, int parentId, int myId, SmTreeItem *parent){ +QModelIndex MappingTreeResultModel::insertChild(const QVariant &data, int mappingId, int parentId, int descId, SmTreeItem *parent){ QModelIndex parentIdx; int row = parent->childCount(); if(parent != root()){ @@ -537,7 +537,7 @@ QModelIndex MappingTreeResultModel::insertChild(const QVariant &data, int mappin QModelIndex newIdx = index(row, 0, parentIdx); setData(newIdx, data, NameRole); setData(newIdx, mappingId, MappingIdRole); - setData(newIdx, myId, MyIdRole); + setData(newIdx, descId, DescIdRole); setData(newIdx, parentId, ParentIdRole); return newIdx; } -- cgit v1.2.3-70-g09d2