diff -r 2d4cc445a86a -r ee6b0f3a4c2f ornamentedobj.cpp
--- a/ornamentedobj.cpp	Mon Mar 23 09:06:51 2009 +0000
+++ b/ornamentedobj.cpp	Thu Mar 26 07:49:17 2009 +0000
@@ -45,10 +45,6 @@
 	heading = new HeadingObj(scene);
 	heading->move (absPos.x(), absPos.y());
 
-	note.setNote("");
-	note.setFontHint (textEditor->getFontHintDefault() );
-	isNoteInEditor=false;
-
 	systemFlags=new FlagRowObj(scene);
 	systemFlags->clone(systemFlagsDefault);
 	systemFlags->setName ("systemFlags");
@@ -75,7 +71,6 @@
 	heading->copy(other->heading);
     setColor   (other->heading->getColor());	
 
-	note.copy (other->note);
 	systemFlags->copy (other->systemFlags);
 	standardFlags->copy (other->standardFlags);
 
@@ -260,38 +255,6 @@
 	move2RelPos (p.x(),p.y());
 }
 
-void OrnamentedObj::setNote(QString s)
-{
-	note.setNote(s);
-	updateNoteFlag();
-}
-
-void OrnamentedObj::setNote(NoteObj n)
-{
-	note=n;
-	updateNoteFlag();
-}
-
-QString OrnamentedObj::getNote()
-{
-    return note.getNote();
-}
-
-QString OrnamentedObj::getNoteASCII(const QString &indent, const int &width)
-{
-    return note.getNoteASCII(indent,width);
-}
-
-QString OrnamentedObj::getNoteASCII()
-{
-    return note.getNoteASCII();
-}
-
-QString OrnamentedObj::getNoteOpenDoc()
-{
-    return note.getNoteOpenDoc();
-}
-
 void OrnamentedObj::setURL(QString s)
 {
 	url=s;
@@ -407,20 +370,25 @@
 	return false;
 }
 
-void OrnamentedObj::getNoteFromTextEditor ()
+/* FIXME-3 should move to VymView ?!  void OrnamentedObj::getNoteFromTextEditor ()
 {
 	note.setFilenameHint (textEditor->getFilename());
 	note.setFontHint (textEditor->getFontHint() );
 	setNote( textEditor->getText() );
 }
+*/
 
-void OrnamentedObj::updateNoteFlag()
+void OrnamentedObj::updateSystemFlags()
 {
-	bool noteEmpty;
+	// FIXME-3 check if note here and text in editor are still in sync!!	
+	// Best would be to always have current text here...
+	bool noteEmpty=treeItem->getNoteObj().isEmpty();
+	/*
 	if (isNoteInEditor)
 		noteEmpty=textEditor->isEmpty();
 	else	
 		noteEmpty=note.isEmpty();
+	*/	
 
 	if (!noteEmpty)
 	{	
@@ -432,12 +400,11 @@
 		if (!systemFlags->isActive ("note")) return;
 		systemFlags->deactivate("note");
 	}	
-	model->setChanged();
+	//model->setChanged();
 	calcBBoxSize();
 	positionBBox();	
 	move (absPos.x(), absPos.y() );
 	forceReposition();
-	
 }	
 
 void OrnamentedObj::updateFlagsToolbar()