# HG changeset patch
# User insilmaril
# Date 1171272526 0
# Node ID 7014be3ac7d0b3714c0516661c19d08ef310089b
# Parent  d886c77ac0fec26a1a7fda74fda32e51857eb2ec
1.8.66 Various fixes

diff -r d886c77ac0fe -r 7014be3ac7d0 branchobj.cpp
--- a/branchobj.cpp	Mon Jan 29 12:29:13 2007 +0000
+++ b/branchobj.cpp	Mon Feb 12 09:28:46 2007 +0000
@@ -53,16 +53,16 @@
 
 BranchObj::~BranchObj ()
 {
-//	cout << "Destr BranchObj of "<<this<<endl;
+	//cout << "Destr BranchObj of "<<this<<endl;
 	// Check, if this branch was the last child to be deleted
 	// If so, unset the scrolled flags
 
-	BranchObj *po=(BranchObj*)(parObj);
+	BranchObj *po=(BranchObj*)parObj;
 	BranchObj *bo;
 	if (po)
 	{
-		bo=((BranchObj*)(parObj))->getLastBranch();
-		if (!bo) po->unScroll();
+		bo=((BranchObj*)parObj)->getLastBranch();
+		if (bo) po->unScroll();
 	}
 	clear();
 }
@@ -120,6 +120,8 @@
 
 void BranchObj::clear() 
 {
+	setVisibility (true);
+
 	while (!floatimage.isEmpty())
 		delete floatimage.takeFirst();
 
diff -r d886c77ac0fe -r 7014be3ac7d0 flagobj.cpp
--- a/flagobj.cpp	Mon Jan 29 12:29:13 2007 +0000
+++ b/flagobj.cpp	Mon Feb 12 09:28:46 2007 +0000
@@ -22,7 +22,7 @@
 
 FlagObj::~FlagObj()
 {
-//    cout << "Destr FlagObj  this="<<this <<"  " << name.ascii() << "\n";
+//   cout << "Destr FlagObj  this="<<this <<"  " << name.ascii() << "\n";
 	if (icon) delete (icon);
 }
 
diff -r d886c77ac0fe -r 7014be3ac7d0 flagrowobj.cpp
--- a/flagrowobj.cpp	Mon Jan 29 12:29:13 2007 +0000
+++ b/flagrowobj.cpp	Mon Feb 12 09:28:46 2007 +0000
@@ -19,9 +19,9 @@
 
 FlagRowObj::~FlagRowObj()
 {
- //   cout << "Destr FlagRowObj\n";
+	//cout << "Destr FlagRowObj\n";
 	while (!flag.isEmpty())
-		delete flag.takeFirst();
+		delete (flag.takeFirst() );
 }
 
 void FlagRowObj::init ()
diff -r d886c77ac0fe -r 7014be3ac7d0 flagrowobj.h
--- a/flagrowobj.h	Mon Jan 29 12:29:13 2007 +0000
+++ b/flagrowobj.h	Mon Feb 12 09:28:46 2007 +0000
@@ -6,7 +6,7 @@
 #include "mapobj.h"
 #include "flagobj.h"
 
-class FlagRowObj:public QObject,public MapObj {
+class FlagRowObj:public MapObj {
 public:
     FlagRowObj ();
     FlagRowObj (QGraphicsScene *);
diff -r d886c77ac0fe -r 7014be3ac7d0 frameobj.cpp
--- a/frameobj.cpp	Mon Jan 29 12:29:13 2007 +0000
+++ b/frameobj.cpp	Mon Feb 12 09:28:46 2007 +0000
@@ -81,9 +81,11 @@
 		case NoFrame:
 			break;
 		case Rectangle:
+	//		rectFrame->prepareGeometryChange();
 			rectFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() ));
 			break;
 		case Ellipse:
+	//		ellipseFrame->prepareGeometryChange();
 			ellipseFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() ));
 			break;
     }