diff -r c13937960f1d -r 46553c106c52 findresultmodel.cpp --- a/findresultmodel.cpp Thu Mar 18 11:55:59 2010 +0000 +++ b/findresultmodel.cpp Mon Mar 22 15:37:23 2010 +0000 @@ -49,15 +49,6 @@ return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable; } -FindResultItem *FindResultModel::getItem(const QModelIndex &index) const -{ - if (index.isValid()) { - FindResultItem *item = static_cast(index.internalPointer()); - if (item) return item; - } - return rootItem; -} - QVariant FindResultModel::headerData(int section, Qt::Orientation orientation, int role) const { @@ -189,17 +180,30 @@ return result; } +FindResultItem *FindResultModel::getItem(const QModelIndex &index) const +{ + if (index.isValid()) { + FindResultItem *item = static_cast(index.internalPointer()); + if (item) return item; + } + return rootItem; +} + +FindResultItem *FindResultModel::findTreeItem(TreeItem *ti) +{ +} + void FindResultModel::addItem (TreeItem *ti) { if (ti) { QModelIndex ix (index (rootItem)); - //QAbstractItemModel *resultsModel = view->model(); if (!insertRow(ix.row()+1, ix.parent())) return; - for (int column = 0; column < columnCount(ix.parent()); ++column) { + for (int column = 0; column < columnCount(ix.parent()); ++column) + { QModelIndex child = index(ix.row()+1, column, ix.parent()); setData(child, QVariant(ti->getHeading()), Qt::EditRole); getItem(child)->setOriginal (ti); @@ -223,7 +227,20 @@ } } -void FindResultModel::addSubItem (TreeItem *parent,const QString &s, TreeItem *ti, int index) +void FindResultModel::addSubItem (TreeItem *parent,const QString &s, TreeItem *ti, int i) { + if (ti) + { + QModelIndex ix ( index (rootItem)); + + if (!insertRow(ix.row()+1, ix.parent())) + return; + + for (int column = 0; column < columnCount(ix.parent()); ++column) { + QModelIndex child = index(ix.row()+1, column, ix.parent()); + setData(child, QVariant("Note: "+ti->getHeading()), Qt::EditRole); + getItem(child)->setOriginal (ti); + } + } }