From d562d4a3527044aaeb36534bc2d4b65b587c9bb3 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 6 Oct 2012 12:39:54 +0200 Subject: Fix MappingTreeModel * Don't recurse ad infinitum when having nodes with the same name. * Add all relevant data to the model. There's still one quirk left: you can't do something like this blub -> blub2 if bla -> blub ->blub2 already exists, but that's something I can live with. --- mappingtreemodel.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mappingtreemodel.h') diff --git a/mappingtreemodel.h b/mappingtreemodel.h index beb7d7f..38c0c7b 100644 --- a/mappingtreemodel.h +++ b/mappingtreemodel.h @@ -21,9 +21,9 @@ class SmTreeItem; class MappingTreeModel : public SmTreeModel { Q_OBJECT public: - enum Roles { NameRole = Qt::UserRole + 1, ParentIdRole = Qt::UserRole + 2, AddedRole = Qt::UserRole + 3, MyIdRole = Qt::UserRole + 4 }; - enum Fields { Name = 0, ParentId = 1, Added = 2, MyId = 3 }; - enum { NumFields = 4 }; + enum Roles { NameRole = Qt::UserRole + 1, MappingIdRole = Qt::UserRole + 2, AddedRole = Qt::UserRole + 3, MyIdRole = Qt::UserRole + 4, ParentIdRole = Qt::UserRole + 5 }; + enum Fields { Name = 0, MappingId = 1, Added = 2, MyId = 3, ParentId = 4 }; + enum { NumFields = 5 }; MappingTreeModel(QStringList &headers, QObject *parent = 0); ~MappingTreeModel(); @@ -90,6 +90,7 @@ class MappingTreeModel : public SmTreeModel { const QString mForbidden; int mType; QSqlError mLastError; + QList mSeen; }; class MappingTreeResultModel : public SmTreeModel { -- cgit v1.2.3-70-g09d2