diff options
| -rw-r--r-- | mappingtreemodel.cpp | 14 | ||||
| -rw-r--r-- | mappingtreemodel.h | 6 | ||||
| -rw-r--r-- | newpicsdialog.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
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; } diff --git a/mappingtreemodel.h b/mappingtreemodel.h index 90eca8c..228adee 100644 --- a/mappingtreemodel.h +++ b/mappingtreemodel.h @@ -95,15 +95,15 @@ class MappingTreeModel : public SmTreeModel { class MappingTreeResultModel : public SmTreeModel { Q_OBJECT public: - enum Roles { NameRole = Qt::UserRole + 1, MappingIdRole = Qt::UserRole + 2, ParentIdRole = Qt::UserRole + 3, MyIdRole = Qt::UserRole + 4 }; - enum Fields { Name = 0, MappingId = 1, ParentId = 2, MyId = 3 }; + enum Roles { NameRole = Qt::UserRole + 1, MappingIdRole = Qt::UserRole + 2, ParentIdRole = Qt::UserRole + 3, DescIdRole = Qt::UserRole + 4 }; + enum Fields { Name = 0, MappingId = 1, ParentId = 2, DescId = 3 }; enum { NumFields = 4 }; explicit MappingTreeResultModel(const QStringList &headers, QObject *parent = 0); //data + flags Qt::ItemFlags flags(const QModelIndex &index) const; bool setData(const QModelIndex &index, const QVariant &value, int role); - QModelIndex insertChild(const QVariant &data, int mappingId, int parentId, int myId, SmTreeItem *parent); + QModelIndex insertChild(const QVariant &data, int mappingId, int parentId, int descId, SmTreeItem *parent); QList<QVariant> columnValues(int column) const; void clearData(); diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp index 6c1d1fc..761e3ab 100644 --- a/newpicsdialog.cpp +++ b/newpicsdialog.cpp @@ -138,7 +138,7 @@ void NewPicsDialog::accept(){ if(files.isEmpty()){ return QDialog::accept(); } - QList<QVariant> parentIds = mMappingEditWidget->model()->columnValues(MappingTreeResultModel::MyId); + QList<QVariant> parentIds = mMappingEditWidget->model()->columnValues(MappingTreeResultModel::MappingId); mDb.transaction(); foreach(FileData d, files){ mAddFileQ->bindValue(":fn", d.fileName); |