diff -r 340bc29da9a0 -r 1fb50e79661c treemodel.cpp
--- a/treemodel.cpp	Tue May 26 11:23:44 2009 +0000
+++ b/treemodel.cpp	Tue Jul 07 09:34:24 2009 +0000
@@ -5,6 +5,7 @@
 
 #include "branchitem.h"
 #include "treeitem.h"
+#include "imageitem.h"
 #include "treemodel.h"
 
 TreeModel::TreeModel(QObject *parent)
@@ -108,6 +109,12 @@
 
 BranchItem* TreeModel::next(BranchItem* &current, BranchItem* &previous, BranchItem* start)
 {
+/*FIXME-3	cout << "TM::next \n"; 
+	std::string ch="()"; if (current) ch=current->getHeadingStd();
+	std::string ph="()"; if (previous) ph=previous->getHeadingStd();
+	cout << "  cur="<<ch << " prev="<<ph<<endl;
+*/
+
 	// Walk through map beginning at current with previous==0
 	// Start at root, if current==NULL
 	if (!current) current=(BranchItem*)rootItem;
@@ -121,32 +128,42 @@
 		return current;
 	}
 
-	//std::cout << " cur="<<current->getHeading().toStdString();
-	//std::cout << " prev="<<previous->getHeading().toStdString()<<std::endl;
-
 	// Going up or down (deeper)?
 	if (current->depth() > previous->depth() )
 	{	
 		// Coming from above
 		// Trying  to go down deeper
+//		cout << "  trying to go deeper\n";
 		if (current->branchCount() >0 )
 		{
+//			cout << "  yes, going deeper\n";
 			previous=current;
 			current=current->getFirstBranch();
 			return current;
 		}	
 		// turn around and go up again
+//		cout << "  sorry, turn around\n";
+		BranchItem *bi=current;
+		current=previous;
+		previous=bi;
 	}	
 
+/*
+	cout << "  coming from below\n";
+	ch="()"; if (current) ch=current->getHeadingStd();
+	ph="()"; if (previous) ph=previous->getHeadingStd();
+	cout << "  cur="<<ch << " prev="<<ph<<endl;
+*/	
 	// Coming from below
-
 	// Trying to go down again to siblings
 
 	BranchItem *sibling=current->getBranchNum (previous->num()+1);
+//	cout <<"    prev->num()="<<previous->num()<<endl;
 
 	if (sibling)
 	{	
 		// Found sibling of previous, go there
+//		cout << "  sib=cur="<<sibling->getHeadingStd()<<endl;
 		previous=current;
 		current=sibling;
 		return current;
@@ -156,6 +173,7 @@
 	if (start==current) return NULL;
 
 	// Go up and try to find siblings of current
+//	cout <<"  going up again...\n";
 	previous=current;
 	current=(BranchItem*)current->parent();
 
@@ -186,6 +204,9 @@
 			case TreeItem::Branch:
 				delete (BranchItem*)ti; 
 				break;
+			case TreeItem::Image:
+				delete (ImageItem*)ti; 
+				break;
 			default:
 				delete ti;
 				break;