[QGIS Commit] r13442 - trunk/qgis/src/app
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat May 8 15:09:42 EDT 2010
Author: jef
Date: 2010-05-08 15:09:42 -0400 (Sat, 08 May 2010)
New Revision: 13442
Modified:
trunk/qgis/src/app/qgsmaptoolannotation.cpp
trunk/qgis/src/app/qgsmaptoolrotatepointsymbols.cpp
trunk/qgis/src/app/qgsmaptoolsimplify.cpp
Log:
cosmetic changes
Modified: trunk/qgis/src/app/qgsmaptoolannotation.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolannotation.cpp 2010-05-08 19:07:12 UTC (rev 13441)
+++ trunk/qgis/src/app/qgsmaptoolannotation.cpp 2010-05-08 19:09:42 UTC (rev 13442)
@@ -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 @@
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();
Modified: trunk/qgis/src/app/qgsmaptoolrotatepointsymbols.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolrotatepointsymbols.cpp 2010-05-08 19:07:12 UTC (rev 13441)
+++ trunk/qgis/src/app/qgsmaptoolrotatepointsymbols.cpp 2010-05-08 19:09:42 UTC (rev 13442)
@@ -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 )
{
Modified: trunk/qgis/src/app/qgsmaptoolsimplify.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolsimplify.cpp 2010-05-08 19:07:12 UTC (rev 13441)
+++ trunk/qgis/src/app/qgsmaptoolsimplify.cpp 2010-05-08 19:09:42 UTC (rev 13442)
@@ -166,7 +166,7 @@
{
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;
More information about the QGIS-commit
mailing list