diff -r 133e2ed6b9c5 -r f1006de05c54 treeitem.cpp
--- a/treeitem.cpp	Thu Sep 03 08:52:00 2009 +0000
+++ b/treeitem.cpp	Mon Sep 07 15:36:57 2009 +0000
@@ -15,7 +15,7 @@
 
 TreeItem::TreeItem()
 {
-	//cout << "Constr. TI  this="<<this<<endl;
+	cout << "Constr. TI  this="<<this<<endl;
 	init();
 	itemData.clear();
 	rootItem=this;
@@ -41,27 +41,7 @@
 	while (!childItems.isEmpty())
 	{
 		ti=childItems.takeFirst();
-		switch (ti->getType() )
-		{
-			case TreeItem::MapCenter:
-				delete (BranchItem*)ti;
-				break;
-			case TreeItem::Branch:
-				delete (BranchItem*)ti;
-				break;
-			case TreeItem::Image:
-				delete (ImageItem*)ti;
-				break;
-			case TreeItem::Attribute:
-				delete (AttributeItem*)ti;
-				break;
-			case TreeItem::XLink:
-				delete (XLinkItem*)ti;
-				break;
-			default:
-				delete ti;
-				break;
-		}
+		delete ti;
 	}	
 }
 
@@ -96,17 +76,6 @@
 }
 
 
-/*
-void TreeItem::copy (OrnamentedObj* other)	//FIXME-3	probably need deep copy of branches and data!
-
-{
-	note.copy (other->note);
-	model=other->model;
-	hideExport=officially 
-	other->hideExport;
-}
-*/
-
 void TreeItem::setModel (VymModel *m)
 {
 	model=m;
@@ -238,7 +207,7 @@
 
 int TreeItem::columnCount() const
 {
-    return itemData.count();
+	return 1;
 }
 
 int TreeItem::branchCount() const
@@ -270,11 +239,6 @@
     return 0;
 }
 
-int TreeItem::column() const
-{
-    return 0;
-}
-
 int TreeItem::depth() 
 {
 	// Rootitem d=-1
@@ -291,6 +255,7 @@
 
 TreeItem *TreeItem::parent()
 {
+	//cout << "TI::parent of "<<getHeadingStd()<<"  is "<<parentItem<<endl;
     return parentItem;
 }
 
@@ -301,15 +266,8 @@
 
 int TreeItem::num()
 {
-	switch (type)
-	{
-		case MapCenter: return parentItem->childItems.indexOf (this) - parentItem->branchOffset;
-		case Branch: return parentItem->childItems.indexOf (this) - parentItem->branchOffset;
-		case Image: return parentItem->childItems.indexOf (this) - parentItem->imageOffset;
-		case Attribute: return parentItem->childItems.indexOf (this) - parentItem->attributeOffset;
-		case XLink: return parentItem->childItems.indexOf (this) - parentItem->xlinkOffset;
-		default: return -1;
-	}
+	if (!parentItem) return -1;
+	return parentItem->num (this);
 }
 
 int TreeItem::num (TreeItem *item)
@@ -334,7 +292,7 @@
 
 TreeItem::Type TreeItem::getType()
 {
-	if (type==Branch && depth()==0) return MapCenter;	//FIXME-2 should not be necesssary
+	if (type==Branch && depth()==0) return MapCenter;	//FIXME-3 should not be necesssary
 	return type;
 }
 
@@ -439,7 +397,7 @@
 {
 	NoteObj n;
 	n.setNote(s);
-	setNoteObj (n,false);
+	setNoteObj (n);
 }
 
 void TreeItem::clearNote()
@@ -448,7 +406,7 @@
 	systemFlags.deactivate ("system-note");
 }
 
-void TreeItem::setNoteObj(const NoteObj &n, bool updateNoteEditor){
+void TreeItem::setNoteObj(const NoteObj &n){
 	note=n;
 	if (!note.isEmpty() && !systemFlags.isActive ("system-note"))
 		systemFlags.activate ("system-note");
@@ -525,11 +483,6 @@
 	return &standardFlags;
 }
 
-/* FIXME-3 void TreeItem::updateToolBar()
-{
-	standardFlags.updateToolBar();
-}
-*/
 QStringList TreeItem::activeSystemFlagNames ()
 {
 	return systemFlags.activeFlagNames();
@@ -676,49 +629,45 @@
 }
 
 
-void TreeItem::setHideTmp (HideTmpMode mode)  //FIXME-2
+void TreeItem::setHideTmp (HideTmpMode mode)  //FIXME-2	update visibility in derived objects...
 {
-	if (isBranchLikeType() )
-		((BranchItem*)this)->updateVisibility();
 		/*
 	if (type==Image)
-		//updateVisibility();
-	*/
-
-/*
+		((ImageItem*)this)->updateVisibility();
+		*/
 
 		if (mode==HideExport && (hideExport || hasHiddenExportParent() ) )
 		{
 			// Hide stuff according to hideExport flag and parents
-			//setVisibility (false);
-			updateVisibility();
-			//FIXME-2 hidden=true;
+	//		if (lmo) lmo->setVisibility (false);
+			hidden=true;
 		}else
 		{
 			// Do not hide, but still take care of scrolled status
-			
-
+			hidden=false;
+/*
 			XXXXXXXX treeItem should be THIS
 
 			move visible to TreeItem???
 
 			BranchObj now has updateContents
-
-			maybe also start "bool TreeItem::branchlikeType"
-
-
+*/
+/*
+		if (isBranchLikeType() )
+			((BranchItem*)this)->updateVisibility();
 
 			if ( ((BranchItem*)treeItem)->hasScrolledParent((BranchItem*)treeItem))
 				setVisibility (false);
 			else
 				setVisibility (true);
-			//FIXME-2 hidden=false;
+*/			
 		}	
 
-*/
+/*
 		// And take care of my children
 		for (int i=0; i<branchCount(); ++i)
-			getBranchNum(i)->setHideTmp (mode);
+			getBranchNum(i)->setHideTmp (mode);	// FIXME-4 maybe also consider images and other types
+*/
 }
 
 bool TreeItem::hasHiddenExportParent()
@@ -752,6 +701,11 @@
 	return hideExport;
 }	
 
+void TreeItem::updateVisibility()
+{
+	// overloaded in derived objects
+}	
+
 bool TreeItem::isHidden()
 {
 	return hidden;