diff -r 2d4cc445a86a -r ee6b0f3a4c2f treeitem.cpp
--- a/treeitem.cpp	Mon Mar 23 09:06:51 2009 +0000
+++ b/treeitem.cpp	Thu Mar 26 07:49:17 2009 +0000
@@ -1,10 +1,16 @@
+#include <iostream>
+using namespace std;
+
 #include <QStringList>
 
 #include "branchobj.h"
 #include "treeitem.h"
+#include "vymmodel.h"
 
 TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent)
 {
+	model=NULL;
+
     parentItem = parent;
     itemData = data;
 	lmo=NULL;
@@ -12,6 +18,12 @@
 	branchOffset=0;
 	branchCounter=0;
 	lastSelectedBranchNum=-1;
+
+	note.setNote(""); 
+	// note.setFontHint (textEditor->getFontHintDefault() );	//FIXME-2
+	// isNoteInEditor=false;
+
+
 }
 
 TreeItem::~TreeItem()
@@ -19,10 +31,36 @@
     qDeleteAll(childItems);
 }
 
+QString TreeItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
+{
+	qWarning ("TreeItem::saveToDir called directly");
+	return QString();
+}
+
+
+/*
+void TreeItem::copy (OrnamentedObj* other)	//FIXME-2
+
+{
+	note.copy (other->note);
+	model=other->model;
+}
+*/
+
+void TreeItem::setModel (VymModel *m)
+{
+	model=m;
+}
+
+VymModel* TreeItem::getModel ()
+{
+	return model;
+}
 
 void TreeItem::appendChild(TreeItem *item)
 {
     childItems.append(item);
+	item->setModel (model);
 
 	if (item->type == Branch || item->type ==MapCenter)
 	{
@@ -32,8 +70,6 @@
 	}
 }
 
-#include <iostream>
-using namespace std;
 void TreeItem::removeChild(int row)
 {
     if (row<0 || row > childItems.size()-1)
@@ -109,7 +145,7 @@
 		case Undefined: return -1;
 		case MapCenter: return parentItem->childItems.indexOf (this) - branchOffset;
 		case Branch: return parentItem->childItems.indexOf (this) - branchOffset;
-		case Image: return -1; // FIXME
+		case Image: return -1; // FIXME-2
 		default: return -1;
 	}
 	
@@ -132,26 +168,43 @@
 
 void TreeItem::setNote(const QString s)
 {
-	switch (type)
-	{
-		case MapCenter: 
-			((BranchObj*)lmo)->setNote(s);
-			break;
-		case Branch: 
-			((BranchObj*)lmo)->setNote(s);
-			break;
-		default: ;
-	}
+	note.setNote(s);
+	// updateNoteFlag();  FIXME-2 needed?
+	if (model) 
+		model->emitContentHasChanged (this);
+}
+
+void TreeItem::setNoteObj(const NoteObj &n, bool updateNoteEditor)
+{
+	note=n;
+	// updateNoteFlag();  FIXME-2 needed?
+	if (model && updateNoteEditor)	
+		model->emitContentHasChanged (this);
 }
 
 QString TreeItem::getNote()
 {
-	switch (type)
-	{
-		case MapCenter: return ((BranchObj*)lmo)->getNote();
-		case Branch: return ((BranchObj*)lmo)->getNote();
-		default: return QString ();
-	}
+	return note.getNote();
+}
+
+NoteObj TreeItem::getNoteObj()
+{
+	return note;
+}
+
+QString TreeItem::getNoteASCII(const QString &indent, const int &width)
+{
+    return note.getNoteASCII(indent,width);
+}
+
+QString TreeItem::getNoteASCII()
+{
+    return note.getNoteASCII();
+}
+
+QString TreeItem::getNoteOpenDoc()
+{
+    return note.getNoteOpenDoc();
 }
 
 void TreeItem::setType(const Type t)
@@ -221,7 +274,7 @@
 	return getBranchNum (lastSelectedBranchNum);
 }
 
-LinkableMapObj* TreeItem::getLMO()	// FIXME VM should be unnecessary in the end
+LinkableMapObj* TreeItem::getLMO()	// FIXME-3  VM should be unnecessary in the end
 {
 	return lmo;
 }