diff -r 133e2ed6b9c5 -r f1006de05c54 treemodel.cpp
--- a/treemodel.cpp	Thu Sep 03 08:52:00 2009 +0000
+++ b/treemodel.cpp	Mon Sep 07 15:36:57 2009 +0000
@@ -15,7 +15,7 @@
 {
     QList<QVariant> rootData;
     rootData << "Heading" << "Type";
-    rootItem = new TreeItem(rootData);
+    rootItem = new BranchItem(rootData);
 }
 
 TreeModel::~TreeModel()
@@ -39,7 +39,7 @@
 Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
 {
     if (!index.isValid())
-        return Qt::ItemIsEnabled;
+        return Qt::NoItemFlags;
 
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
@@ -58,23 +58,26 @@
 	if (!ti->parent())
 		return QModelIndex();
 	else	
-		return createIndex (ti->row(),ti->column(),ti);
+		return createIndex (ti->row(),0,ti);
 }
 
 QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent)
             const
 {
+	// Make sure to return invalid index for invalid values (see modeltest)
+	if (row<0 || column<0) return QModelIndex();
+	if (column!=0) return QModelIndex();
+
     TreeItem *parentItem;
 
     if (!parent.isValid())
-	{	//FIXME-3 left here for testing only, seems to work now...
+	{
         parentItem = rootItem;
 		/*
 		cout << "TM::index()  no parent?! xxx\n";
 		cout << "   row="<<row<<"  col="<<column<<endl;
 		cout << "   parent.internal="<< parent.internalPointer()<<endl;
 		*/
-		//return QModelIndex();	//FIXME-3 this line is new (testing)
 		// Somehow index is requested where parentIndex is invalid.
 		// what's happening here...?
 		// Check if Qt examples also return index of rootIem then...
@@ -84,6 +87,7 @@
         parentItem = getItem (parent);
 
     TreeItem *childItem = parentItem->child(row);
+	//cout << "TM::index  parentItem="<<parentItem<<"  childItem="<<childItem<<"  row="<<row<<" col="<<column<<endl;
     if (childItem)
         return createIndex(row, column, childItem);
     else
@@ -106,10 +110,11 @@
     if (parentItem == rootItem)
         return QModelIndex();
 
+/*
 	if (!parentItem)
         return QModelIndex();	// FIXME-3 do this to avoid segfault, but why?
 		                        // see also my question on qt-interest in march
-
+*/
     return createIndex(parentItem->childNumber(), 0, parentItem);
 }
 
@@ -127,13 +132,21 @@
 
 int TreeModel::columnCount(const QModelIndex &parent) const
 {
+	int c;
     if (parent.isValid())
-        return getItem (parent)->columnCount();
+	{
+        c= getItem (parent)->columnCount();
+		//cout << "TM::colCount  c="<<c<<"  parent="<<getItem (parent)<<endl;	
+	}
     else
-        return rootItem->columnCount();
+	{
+        c= rootItem->columnCount();
+		//cout << "TM::colCount  c="<<c<<"  parent=invalid"<<endl;	
+	}
+	return c;
 }
 
-BranchItem* TreeModel::next(BranchItem* &current, BranchItem* &previous, BranchItem* start)
+BranchItem* TreeModel::next(BranchItem* &current, BranchItem* &previous, BranchItem* start)	// FIXME-3 change this to nextBranch and use "next" for all TIs
 {
 /*FIXME-3	cout << "TM::next \n"; 
 	std::string ch="()"; if (current) ch=current->getHeadingStd();
@@ -224,6 +237,8 @@
 		ti=pi->getChildNum (row);
 		cout << "   pi="<<pi<<"  ti="<<ti<<endl;
 		pi->removeChild (row);	// does not delete object!
+		delete ti;
+		/* FIXME-3
 		switch (ti->getType()) 
 		{
 			case TreeItem::MapCenter: 
@@ -245,6 +260,7 @@
 				delete ti;
 				break;
 		}
+		*/
 	}
 	return true;
 }
@@ -258,7 +274,7 @@
 //		cout << "   item="<<item<<endl;
         if (item) return item;
     }
-    return rootItem;
+    return NULL;
 }
 
 TreeItem *TreeModel::getRootItem()