diff -r 62d621e3e550 -r 5ecd0462f76b mapeditor.cpp
--- a/mapeditor.cpp	Mon Mar 15 15:32:37 2010 +0000
+++ b/mapeditor.cpp	Thu Mar 18 11:31:02 2010 +0000
@@ -230,7 +230,7 @@
 
 	if (scrollBarPosTarget==getScrollBarPos()) return;
 
-	if (scrollBarPosAnimation.state()==QtAbstractAnimation::Running)
+	if (scrollBarPosAnimation.state()==QAbstractAnimation::Running)
 		scrollBarPosAnimation.stop();
 	
 	if (settings.value ("/animation/use/",true).toBool() )
@@ -238,7 +238,7 @@
 		scrollBarPosAnimation.setTargetObject (this);
 		scrollBarPosAnimation.setPropertyName ("scrollBarPos");
 		scrollBarPosAnimation.setDuration(1000);
-		scrollBarPosAnimation.setEasingCurve ( QtEasingCurve::OutQuint);
+		scrollBarPosAnimation.setEasingCurve ( QEasingCurve::OutQuint);
 		scrollBarPosAnimation.setStartValue(
 			QPointF (horizontalScrollBar()->value() ,
 					 verticalScrollBar()->value() ) );
@@ -270,7 +270,7 @@
 void MapEditor::setZoomFactorTarget (const qreal &zft)
 {
 	zoomFactorTarget=zft;
-	if (zoomAnimation.state()==QtAbstractAnimation::Running)
+	if (zoomAnimation.state()==QAbstractAnimation::Running)
 		zoomAnimation.stop();
 	if (settings.value ("/animation/use/",true).toBool() )
 	{
@@ -278,7 +278,7 @@
 		zoomAnimation.setTargetObject (this);
 		zoomAnimation.setPropertyName ("zoomFactor");
 		zoomAnimation.setDuration(1000);
-		zoomAnimation.setEasingCurve ( QtEasingCurve::OutQuint);
+		zoomAnimation.setEasingCurve ( QEasingCurve::OutQuint);
 		zoomAnimation.setStartValue(zoomFactor);
 		zoomAnimation.setEndValue(zft);
 		zoomAnimation.start();
@@ -565,18 +565,20 @@
 						// Move also away if centroids are identical
 						if (v.isNull()) 
 						{
-							//qDebug() << "v==0="<<polys[i].centroid()<<polys[j].centroid()<<" "<<v;
 							v.setX (rand()%200 -100);
 							v.setY (rand()%200 -100);
-							//qDebug() << v;
 						}
+						// Add random direction
+						Vector w (cos (rand()%1000),sin(rand()%1000));
+						
+						// Scale translation vector by area of polygons
 						v.normalize();
-						//qDebug() <<  "  v="<<v;
 						vectors[j]=v*10000/polys.at(j).weight();		
 						vectors[i]=v*10000/polys.at(i).weight();		
 						vectors[i].invert();
 						//FIXME-3 outer loop, "i" get's changed several times...
-						// Better not move away from centroid of 2 colliding polys, but from centroid of _all_
+						// Better not move away from centroid of 2 colliding polys, 
+						// but from centroid of _all_
 					}  
 				}
 			}