From 8e14d08ea64238b98148ce8a8437677fcf6fc4d8 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Tue, 3 Oct 2017 21:44:16 +0200 Subject: [PATCH] Visual indent part 3 --- src/app/qgsmaptoolellipsecenterpoint.cpp | 1 - src/app/qgsmaptoolellipseextent.cpp | 2 -- src/app/qgsmaptoolrectangle3points.cpp | 2 -- src/app/qgsmaptoolrectanglecenter.cpp | 2 -- src/app/qgsmaptoolrectangleextent.cpp | 3 --- src/app/qgsmaptoolregularpolygon2points.cpp | 2 -- src/app/qgsmaptoolregularpolygoncentercorner.cpp | 1 - src/app/qgsmaptoolregularpolygoncenterpoint.cpp | 1 - 8 files changed, 14 deletions(-) diff --git a/src/app/qgsmaptoolellipsecenterpoint.cpp b/src/app/qgsmaptoolellipsecenterpoint.cpp index 17c600a427f..22ccffe4e47 100644 --- a/src/app/qgsmaptoolellipsecenterpoint.cpp +++ b/src/app/qgsmaptoolellipsecenterpoint.cpp @@ -24,7 +24,6 @@ QgsMapToolEllipseCenterPoint::QgsMapToolEllipseCenterPoint( QgsMapToolCapture *p QgsMapCanvas *canvas, CaptureMode mode ) : QgsMapToolAddEllipse( parentTool, canvas, mode ) { - } void QgsMapToolEllipseCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) diff --git a/src/app/qgsmaptoolellipseextent.cpp b/src/app/qgsmaptoolellipseextent.cpp index c2723effb39..a0660eaa10e 100644 --- a/src/app/qgsmaptoolellipseextent.cpp +++ b/src/app/qgsmaptoolellipseextent.cpp @@ -24,7 +24,6 @@ QgsMapToolEllipseExtent::QgsMapToolEllipseExtent( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode ) : QgsMapToolAddEllipse( parentTool, canvas, mode ) { - } void QgsMapToolEllipseExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) @@ -61,7 +60,6 @@ void QgsMapToolEllipseExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e ) { case 1: { - if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) ) { mEllipse = QgsEllipse().fromExtent( mPoints.at( 0 ), mapPoint ); diff --git a/src/app/qgsmaptoolrectangle3points.cpp b/src/app/qgsmaptoolrectangle3points.cpp index ce12253f49e..a6ec5d095e3 100644 --- a/src/app/qgsmaptoolrectangle3points.cpp +++ b/src/app/qgsmaptoolrectangle3points.cpp @@ -43,7 +43,6 @@ void QgsMapToolRectangle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true ); mTempRubberBand->show(); } - } else if ( e->button() == Qt::RightButton ) { @@ -100,5 +99,4 @@ void QgsMapToolRectangle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e ) break; } } - } diff --git a/src/app/qgsmaptoolrectanglecenter.cpp b/src/app/qgsmaptoolrectanglecenter.cpp index f11ba113de8..ea5f65821f4 100644 --- a/src/app/qgsmaptoolrectanglecenter.cpp +++ b/src/app/qgsmaptoolrectanglecenter.cpp @@ -42,7 +42,6 @@ void QgsMapToolRectangleCenter::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true ); mTempRubberBand->show(); } - } else if ( e->button() == Qt::RightButton ) { @@ -64,7 +63,6 @@ void QgsMapToolRectangleCenter::cadCanvasMoveEvent( QgsMapMouseEvent *e ) { case 1: { - if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) ) { double xOffset = fabs( mapPoint.x() - mPoints.at( 0 ).x() ); diff --git a/src/app/qgsmaptoolrectangleextent.cpp b/src/app/qgsmaptoolrectangleextent.cpp index abf9645af67..578a61db514 100644 --- a/src/app/qgsmaptoolrectangleextent.cpp +++ b/src/app/qgsmaptoolrectangleextent.cpp @@ -41,7 +41,6 @@ void QgsMapToolRectangleExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e ) mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true ); mTempRubberBand->show(); } - } else if ( e->button() == Qt::RightButton ) { @@ -65,9 +64,7 @@ void QgsMapToolRectangleExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e ) { if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) ) { - mRectangle = QgsRectangle( mPoints.at( 0 ), mapPoint ); - mTempRubberBand->setGeometry( QgsMapToolAddRectangle::rectangleToPolygon( ) ); } else diff --git a/src/app/qgsmaptoolregularpolygon2points.cpp b/src/app/qgsmaptoolregularpolygon2points.cpp index 7554f1e0ced..b86ef393686 100644 --- a/src/app/qgsmaptoolregularpolygon2points.cpp +++ b/src/app/qgsmaptoolregularpolygon2points.cpp @@ -24,7 +24,6 @@ QgsMapToolRegularPolygon2Points::QgsMapToolRegularPolygon2Points( QgsMapToolCapt QgsMapCanvas *canvas, CaptureMode mode ) : QgsMapToolAddRegularPolygon( parentTool, canvas, mode ) { - } QgsMapToolRegularPolygon2Points::~QgsMapToolRegularPolygon2Points() @@ -51,7 +50,6 @@ void QgsMapToolRegularPolygon2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e mTempRubberBand->show(); createNumberSidesSpinBox(); - } } } diff --git a/src/app/qgsmaptoolregularpolygoncentercorner.cpp b/src/app/qgsmaptoolregularpolygoncentercorner.cpp index aec39ad4244..c9a8137c4a3 100644 --- a/src/app/qgsmaptoolregularpolygoncentercorner.cpp +++ b/src/app/qgsmaptoolregularpolygoncentercorner.cpp @@ -24,7 +24,6 @@ QgsMapToolRegularPolygonCenterCorner::QgsMapToolRegularPolygonCenterCorner( QgsM QgsMapCanvas *canvas, CaptureMode mode ) : QgsMapToolAddRegularPolygon( parentTool, canvas, mode ) { - } QgsMapToolRegularPolygonCenterCorner::~QgsMapToolRegularPolygonCenterCorner() diff --git a/src/app/qgsmaptoolregularpolygoncenterpoint.cpp b/src/app/qgsmaptoolregularpolygoncenterpoint.cpp index 5af609598e7..91d7188cebc 100644 --- a/src/app/qgsmaptoolregularpolygoncenterpoint.cpp +++ b/src/app/qgsmaptoolregularpolygoncenterpoint.cpp @@ -24,7 +24,6 @@ QgsMapToolRegularPolygonCenterPoint::QgsMapToolRegularPolygonCenterPoint( QgsMap QgsMapCanvas *canvas, CaptureMode mode ) : QgsMapToolAddRegularPolygon( parentTool, canvas, mode ) { - } QgsMapToolRegularPolygonCenterPoint::~QgsMapToolRegularPolygonCenterPoint()