fix gcc warnings

jef · jef · commit 3200e3e50026 · 2009-01-24T16:45:34.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10011 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -225,7 +225,6 @@ void QgsComposerItem::mouseMoveEvent( QGraphicsSceneMouseEvent * event )
     double diffX = event->lastScenePos().x() - mLastMouseEventPos.x();
     double diffY = event->lastScenePos().y() - mLastMouseEventPos.y();
 
-    double mx, my, rx, ry;
     changeItemRectangle( event->lastScenePos(), mMouseMoveStartPos, this, diffX, diffY, mBoundingResizeRectangle );
   }
   mLastMouseEventPos = event->lastScenePos();
@@ -272,7 +271,6 @@ void QgsComposerItem::mouseReleaseEvent( QGraphicsSceneMouseEvent * event )
     return;
   }
 
-  double mx, my, rx, ry;
   changeItemRectangle( mouseMoveStopPoint, mMouseMoveStartPos, this, diffX, diffY, this );
 
   //reset default action
@@ -377,7 +375,7 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const
     return;
   }
 
-  double mx, my, rx, ry;
+  double mx = 0.0, my = 0.0, rx = 0.0, ry = 0.0;
   QPointF snappedPosition = mComposition->snapPointToGrid( currentPosition );
   //double diffX = snappedPosition.x() - mouseMoveStartPos.x();
   //double diffY = snappedPosition.y() - mouseMoveStartPos.y();

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,6 @@ void QgsComposerItem::mouseMoveEvent( QGraphicsSceneMouseEvent * event )`
`225`	`225`	`double diffX = event->lastScenePos().x() - mLastMouseEventPos.x();`
`226`	`226`	`double diffY = event->lastScenePos().y() - mLastMouseEventPos.y();`
`227`	`227`
`228`		`- double mx, my, rx, ry;`
`229`	`228`	`changeItemRectangle( event->lastScenePos(), mMouseMoveStartPos, this, diffX, diffY, mBoundingResizeRectangle );`
`230`	`229`	`}`
`231`	`230`	`mLastMouseEventPos = event->lastScenePos();`
`@@ -272,7 +271,6 @@ void QgsComposerItem::mouseReleaseEvent( QGraphicsSceneMouseEvent * event )`
`272`	`271`	`return;`
`273`	`272`	`}`
`274`	`273`
`275`		`- double mx, my, rx, ry;`
`276`	`274`	`changeItemRectangle( mouseMoveStopPoint, mMouseMoveStartPos, this, diffX, diffY, this );`
`277`	`275`
`278`	`276`	`//reset default action`
`@@ -377,7 +375,7 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition, const`
`377`	`375`	`return;`
`378`	`376`	`}`
`379`	`377`
`380`		`- double mx, my, rx, ry;`
	`378`	`+ double mx = 0.0, my = 0.0, rx = 0.0, ry = 0.0;`
`381`	`379`	`QPointF snappedPosition = mComposition->snapPointToGrid( currentPosition );`
`382`	`380`	`//double diffX = snappedPosition.x() - mouseMoveStartPos.x();`
`383`	`381`	`//double diffY = snappedPosition.y() - mouseMoveStartPos.y();`