Finally { fix MappingTreeModel }!!!

I think I did it! Fixed MappingTreeModel to make it usable, avoid all
the traps with the insane column and variable names! Now we can actually
have the same mapping with different parents! Yay! Hope it won't come
back and bite me!

1 files changed, 3 insertions, 4 deletions

diff --git a/picfilesmodel.cpp b/picfilesmodel.cpp
index 4114eb5..6b8153f 100644
--- a/picfilesmodel.cpp
+++ b/picfilesmodel.cpp
@@ -40,7 +40,7 @@ PicFilesModel::~PicFilesModel(){
 }
 
 void PicFilesModel::setMapping(int pMapId){
-    QList<QVariant> ids = mMappingTreeModel->childList(pMapId, MappingTreeModel::DescId);
+    QList<QVariant> ids = mMappingTreeModel->childList(pMapId, MappingTreeModel::MappingId);
     mMappingIds.clear();
     foreach(QVariant i, ids){
         mMappingIds << i.toInt();
@@ -170,13 +170,12 @@ QList<MappingData> PicFilesModel::mappingDataFromFiles(const QList<int> fileIds)
     }
     QList<MappingData> retval;
     foreach(int pId, parentIds){
-        QModelIndex curIdx =  mMappingTreeModel->findRecursive(pId, MappingTreeModel::DescId, mMappingTreeModel->rootIndex());
+        QModelIndex curIdx =  mMappingTreeModel->findRecursive(pId, MappingTreeModel::MappingId, mMappingTreeModel->rootIndex());
         MappingData curData;
-        //curData.id = curIdx.data(MappingTreeModel::MyIdRole).toInt();
         curData.mappingId = curIdx.data(MappingTreeModel::MappingIdRole).toInt();
         curData.parentId = curIdx.data(MappingTreeModel::MappingParentIdRole).toInt();
         curData.name = curIdx.data(MappingTreeModel::NameRole).toString();
-        curData.path << mMappingTreeModel->path(curIdx); //.join("/");
+        curData.path << mMappingTreeModel->path(curIdx);
         retval << curData;
     }
     return retval;