diff -r 6dc0a20031f7 -r 1b4d1ea6ea8c vymmodel.cpp
--- a/vymmodel.cpp	Wed Feb 04 16:33:16 2009 +0000
+++ b/vymmodel.cpp	Fri Mar 06 15:02:58 2009 +0000
@@ -125,7 +125,8 @@
 	selModel=NULL;
 
 	// find routine
-	itFind=NULL;				
+	findCurrent=NULL;				
+	findPrevious=NULL;				
 	EOFind=false;
 
 	// animations
@@ -1490,33 +1491,38 @@
 	}
 }
 
-BranchObj* VymModel::findText (QString s, bool cs)   // FIXME needs to converted to first() next() next (ti)
+BranchObj* VymModel::findText (QString s, bool cs)   
 {
-	/*
+	int d=0;
 	QTextDocument::FindFlags flags=0;
 	if (cs) flags=QTextDocument::FindCaseSensitively;
 
-	if (!itFind) 
+	if (!findCurrent) 
 	{	// Nothing found or new find process
 		if (EOFind)
 			// nothing found, start again
 			EOFind=false;
-		itFind=first();
+		findCurrent=NULL;	
+		findPrevious=NULL;	
+		next (findCurrent,findPrevious,d);
 	}	
 	bool searching=true;
 	bool foundNote=false;
 	while (searching && !EOFind)
 	{
-		if (itFind)
+		if (findCurrent)
 		{
 			// Searching in Note
-			if (itFind->getNote().contains(s,cs))
+			if (findCurrent->getNote().contains(s,cs))
 			{
+				select (findCurrent);
+				/*
 				if (getSelectedBranch()!=itFind) 
 				{
 					select(itFind);
 					ensureSelectionVisible();
 				}
+				*/
 				if (textEditor->findText(s,flags)) 
 				{
 					searching=false;
@@ -1524,17 +1530,16 @@
 				}	
 			}
 			// Searching in Heading
-			if (searching && itFind->getHeading().contains (s,cs) ) 
+			if (searching && findCurrent->getHeading().contains (s,cs) ) 
 			{
-				select(itFind);
-				ensureSelectionVisible();
+				select(findCurrent);
 				searching=false;
 			}
 		}	
 		if (!foundNote)
 		{
-			itFind=next(itFind);
-			if (!itFind) EOFind=true;
+			if (!next(findCurrent,findPrevious,d) )
+				EOFind=true;
 		}
 	//cout <<"still searching...  "<<qPrintable( itFind->getHeading())<<endl;
 	}	
@@ -1542,12 +1547,12 @@
 		return getSelectedBranch();
 	else
 		return NULL;
-		*/
 }
 
 void VymModel::findReset()
 {	// Necessary if text to find changes during a find process
-	itFind=NULL;
+	findCurrent=NULL;
+	findPrevious=NULL;
 	EOFind=false;
 }
 
@@ -1979,7 +1984,7 @@
 {
 	MapCenterObj *mco=addMapCenter (contextPos);
 	cout <<"VM::addMCO ()  mapScene="<<mapScene<<endl;
-	selection.select (mco);
+	//FIXME selection.select (mco);
 	updateActions();
 	ensureSelectionVisible();
 	saveState (
@@ -3897,13 +3902,16 @@
 	else
 		linkstyle=LinkableMapObj::UndefinedStyle;
 
-	TreeItem *ti=first();
+	TreeItem *cur=NULL;
+	TreeItem *prev=NULL;
+	int d=0;
 	BranchObj *bo;
-	while (ti) 
+	next (cur,prev,d);
+	while (cur) 
 	{
-		bo=(BranchObj*)(ti->getLMO() );
+		bo=(BranchObj*)(cur->getLMO() );
 		bo->setLinkStyle(bo->getDefLinkStyle());
-		ti=next();
+		cur=next(cur,prev,d);
 	}
 	reposition();
 }
@@ -3923,14 +3931,16 @@
 	);
 
 	defLinkColor=col;
-	TreeItem *ti;
+	TreeItem *cur=NULL;
+	TreeItem *prev=NULL;
+	int d=0;
 	BranchObj *bo;
-	ti=first();
-	while (ti) 
+	cur=next(cur,prev,d);
+	while (cur) 
 	{
-		bo=(BranchObj*)(ti->getLMO() );
+		bo=(BranchObj*)(cur->getLMO() );
 		bo->setLinkColor();
-		ti=next();
+		next(cur,prev,d);
 	}
 	updateActions();
 }
@@ -3938,14 +3948,16 @@
 void VymModel::setMapLinkColorHintInt()
 {
 	// called from setMapLinkColorHint(lch) or at end of parse
-	TreeItem *ti;
+	TreeItem *cur=NULL;
+	TreeItem *prev=NULL;
+	int d=0;
 	BranchObj *bo;
-	ti=first();
-	while (ti) 
+	cur=next(cur,prev,d);
+	while (cur) 
 	{
-		bo=(BranchObj*)(ti->getLMO() );
+		bo=(BranchObj*)(cur->getLMO() );
 		bo->setLinkColor();
-		ti=next();
+		cur=next(cur,prev,d);
 	}
 }
 
@@ -3961,14 +3973,16 @@
 		linkcolorhint=LinkableMapObj::DefaultColor;
 	else	
 		linkcolorhint=LinkableMapObj::HeadingColor;
-	TreeItem *ti;
+	TreeItem *cur=NULL;
+	TreeItem *prev=NULL;
+	int d=0;
 	BranchObj *bo;
-	ti=first();
-	while (bo) 
+	cur=next(cur,prev,d);
+	while (cur) 
 	{
-		bo=(BranchObj*)(ti->getLMO() );
+		bo=(BranchObj*)(cur->getLMO() );
 		bo->setLinkColor();
-		ti=next();
+		next(cur,prev,d);
 	}
 }