cosmetic changes

jef · jef · commit 6e5f3180e11e · 2010-05-08T19:09:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13442 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -25,7 +25,7 @@
 #include <QDialog>
 #include <QMouseEvent>
 
-QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ), \
+QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ),
     mActiveItem( 0 ), mCurrentMoveAction( QgsAnnotationItem::NoAction ), mLastMousePosition( 0, 0 )
 {
   mCursor = QCursor( Qt::ArrowCursor );
@@ -158,26 +158,26 @@ void QgsMapToolAnnotation::canvasMoveEvent( QMouseEvent * e )
       double xmax = xmin + size.width();
       double ymax = ymin + size.height();
 
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
       {
         xmax += e->posF().x() - mLastMousePosition.x();
       }
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp )
       {
         xmin += e->posF().x() - mLastMousePosition.x();
       }
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
       {
         ymin += e->posF().y() - mLastMousePosition.y();
       }
-      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown || \
-           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
+      if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown ||
+           mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
            mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown )
       {
         ymax += e->posF().y() - mLastMousePosition.y();
diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp
@@ -24,8 +24,8 @@
 #include <QMessageBox>
 #include <QMouseEvent>
 
-QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), \
-    mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ), \
+QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ),
+    mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ),
     mRotating( false ), mRotationItem( 0 ), mCtrlPressed( false )
 {
 
diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -166,7 +166,7 @@ bool QgsMapToolSimplify::calculateSliderBoudaries()
   {
     count++;
     if ( count == 30 && !maximized )
-    { //special case when tolerance is tool low to be correct so it's similat to 0
+    { //special case when tolerance is too low to be correct so it's near 0
       // else in some special cases this algorithm would create infinite loop
       found = true;
       minTolerance = 0;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include <QDialog>`
`26`	`26`	`#include <QMouseEvent>`
`27`	`27`
`28`		`-QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ), \`
	`28`	`+QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ),`
`29`	`29`	`mActiveItem( 0 ), mCurrentMoveAction( QgsAnnotationItem::NoAction ), mLastMousePosition( 0, 0 )`
`30`	`30`	`{`
`31`	`31`	`mCursor = QCursor( Qt::ArrowCursor );`
`@@ -158,26 +158,26 @@ void QgsMapToolAnnotation::canvasMoveEvent( QMouseEvent * e )`
`158`	`158`	`double xmax = xmin + size.width();`
`159`	`159`	`double ymax = ymin + size.height();`
`160`	`160`
`161`		`- if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight \|\| \`
`162`		`- mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown \|\| \`
	`161`	`+ if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight \|\|`
	`162`	`+ mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown \|\|`
`163`	`163`	`mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )`
`164`	`164`	`{`
`165`	`165`	`xmax += e->posF().x() - mLastMousePosition.x();`
`166`	`166`	`}`
`167`		`- if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft \|\| \`
`168`		`- mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown \|\| \`
	`167`	`+ if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft \|\|`
	`168`	`+ mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown \|\|`
`169`	`169`	`mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp )`
`170`	`170`	`{`
`171`	`171`	`xmin += e->posF().x() - mLastMousePosition.x();`
`172`	`172`	`}`
`173`		`- if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp \|\| \`
`174`		`- mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp \|\| \`
	`173`	`+ if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp \|\|`
	`174`	`+ mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp \|\|`
`175`	`175`	`mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )`
`176`	`176`	`{`
`177`	`177`	`ymin += e->posF().y() - mLastMousePosition.y();`
`178`	`178`	`}`
`179`		`- if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown \|\| \`
`180`		`- mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown \|\| \`
	`179`	`+ if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown \|\|`
	`180`	`+ mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown \|\|`
`181`	`181`	`mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown )`
`182`	`182`	`{`
`183`	`183`	`ymax += e->posF().y() - mLastMousePosition.y();`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`#include <QMessageBox>`
`25`	`25`	`#include <QMouseEvent>`
`26`	`26`
`27`		`-QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), \`
`28`		`- mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ), \`
	`27`	`+QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ),`
	`28`	`+ mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ),`
`29`	`29`	`mRotating( false ), mRotationItem( 0 ), mCtrlPressed( false )`
`30`	`30`	`{`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ bool QgsMapToolSimplify::calculateSliderBoudaries()`
`166`	`166`	`{`
`167`	`167`	`count++;`
`168`	`168`	`if ( count == 30 && !maximized )`
`169`		`- { //special case when tolerance is tool low to be correct so it's similat to 0`
	`169`	`+ { //special case when tolerance is too low to be correct so it's near 0`
`170`	`170`	`// else in some special cases this algorithm would create infinite loop`
`171`	`171`	`found = true;`
`172`	`172`	`minTolerance = 0;`