|
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(); |
|
0 commit comments