1 files changed, 10 insertions, 24 deletions

diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp
index e4e9e76..82a1490 100644
--- a/mappingtreewidget.cpp
+++ b/mappingtreewidget.cpp
@@ -92,28 +92,13 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){
 }
 
 MappingData MappingTreeWidget::selectedItem() const {
-    MappingData retval;
+    MappingData retval = { -1, QString(), QStringList() };
     QModelIndex sel = selected();
     if(!sel.isValid()){
-        retval.id = -1;
-    }else{
-        QModelIndex real = mProxy->mapToSource(sel);
-        if(mModel->childCount(real)){
-            retval.id = -1;
-        }else{
-            retval.id = sel.data(MappingTreeModel::IdRole).toInt();
-        }
-        retval.name = sel.data(MappingTreeModel::NameRole).toString();
-        QStringList p;
-        QModelIndex parent = sel;
-        while(parent.isValid()){
-            p << parent.data().toString();
-            parent = parent.parent();
-        }
-        std::reverse(p.begin(), p.end());
-        retval.path = p;
+        return retval;
     }
-    return retval;
+    QModelIndex real = mProxy->mapToSource(sel);
+        return mModel->mappingDataFromIndex(real);
 }
 
 void MappingTreeWidget::addChild(){
@@ -308,17 +293,18 @@ void MappingEditWidget::removeMapping(){
     mResultModel->removeRows(firstIdx.row(), 1, firstIdx.parent());
 }
 
-void MappingEditWidget::setMappings(const QList<int> &mappings){
+void MappingEditWidget::setMappings(const QList<MappingData> &mappings){
     if(mappings.isEmpty()){
         return;
     }
-    MappingTreeModel *mModel = static_cast<MappingTreeModel*>(SmGlobals::instance()->model("MappingTree"));
+    //MappingTreeModel *mModel = static_cast<MappingTreeModel*>(SmGlobals::instance()->model("MappingTree"));
     mResultModel->clearData();
-    foreach(int i, mappings){
-        MappingData curData = mModel->mappingDataFromId(i);
+    foreach(MappingData d, mappings){
+        mResultModel->addItem(d);
+        /*MappingData curData = mModel->mappingDataFromId(i);
         if(curData.id != -1){
             mResultModel->addItem(curData);
-        }
+        }*/
     }
     mMappingResult->expandAll();
 }