1.1 --- a/findresultmodel.cpp	Thu Mar 18 11:55:59 2010 +0000
     1.2 +++ b/findresultmodel.cpp	Mon Mar 22 15:37:23 2010 +0000
     1.3 @@ -49,15 +49,6 @@
     1.4      return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
     1.5  }
     1.6  
     1.7 -FindResultItem *FindResultModel::getItem(const QModelIndex &index) const
     1.8 -{
     1.9 -    if (index.isValid()) {
    1.10 -        FindResultItem *item = static_cast<FindResultItem*>(index.internalPointer());
    1.11 -        if (item) return item;
    1.12 -    }
    1.13 -    return rootItem;
    1.14 -}
    1.15 -
    1.16  QVariant FindResultModel::headerData(int section, Qt::Orientation orientation,
    1.17                                 int role) const
    1.18  {
    1.19 @@ -189,17 +180,30 @@
    1.20      return result;
    1.21  }
    1.22  
    1.23 +FindResultItem *FindResultModel::getItem(const QModelIndex &index) const
    1.24 +{
    1.25 +    if (index.isValid()) {
    1.26 +        FindResultItem *item = static_cast<FindResultItem*>(index.internalPointer());
    1.27 +        if (item) return item;
    1.28 +    }
    1.29 +    return rootItem;
    1.30 +}
    1.31 +
    1.32 +FindResultItem *FindResultModel::findTreeItem(TreeItem *ti)
    1.33 +{
    1.34 +}
    1.35 +
    1.36  void FindResultModel::addItem (TreeItem *ti)
    1.37  {
    1.38  	if (ti)
    1.39  	{
    1.40  		QModelIndex ix (index (rootItem));
    1.41 -		//QAbstractItemModel *resultsModel = view->model();
    1.42  		
    1.43  		if (!insertRow(ix.row()+1, ix.parent()))
    1.44  			return;
    1.45  
    1.46 -		for (int column = 0; column < columnCount(ix.parent()); ++column) {
    1.47 +		for (int column = 0; column < columnCount(ix.parent()); ++column) 
    1.48 +		{
    1.49  			QModelIndex child = index(ix.row()+1, column, ix.parent());
    1.50  			setData(child, QVariant(ti->getHeading()), Qt::EditRole);
    1.51  			getItem(child)->setOriginal (ti);
    1.52 @@ -223,7 +227,20 @@
    1.53  	}
    1.54  }
    1.55  
    1.56 -void FindResultModel::addSubItem (TreeItem *parent,const QString &s, TreeItem *ti, int index)
    1.57 +void FindResultModel::addSubItem (TreeItem *parent,const QString &s, TreeItem *ti, int i)
    1.58  {
    1.59 +	if (ti)
    1.60 +	{
    1.61 +		QModelIndex ix ( index (rootItem));
    1.62 +		
    1.63 +		if (!insertRow(ix.row()+1, ix.parent()))
    1.64 +			return;
    1.65 +
    1.66 +		for (int column = 0; column < columnCount(ix.parent()); ++column) {
    1.67 +			QModelIndex child = index(ix.row()+1, column, ix.parent());
    1.68 +			setData(child, QVariant("Note: "+ti->getHeading()), Qt::EditRole);
    1.69 +			getItem(child)->setOriginal (ti);
    1.70 +		}
    1.71 +	}
    1.72  }
    1.73