Replace use of deprecated QMouseEvent::posF()

nyalldawson · nyalldawson · commit 422963e99597 · 2017-09-05T14:03:34.000+10:00
diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -94,12 +94,12 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )
     return;
   }
 
-  mLastMousePosition = e->posF();
+  mLastMousePosition = e->pos();
 
   QgsMapCanvasAnnotationItem *item = selectedItem();
   if ( item )
   {
-    mCurrentMoveAction = item->moveActionForPosition( e->posF() );
+    mCurrentMoveAction = item->moveActionForPosition( e->pos() );
     if ( mCurrentMoveAction != QgsMapCanvasAnnotationItem::NoAction )
     {
       return;
@@ -110,7 +110,7 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )
   {
     //select a new item if there is one at this position
     mCanvas->scene()->clearSelection();
-    QgsMapCanvasAnnotationItem *existingItem = itemAtPos( e->posF() );
+    QgsMapCanvasAnnotationItem *existingItem = itemAtPos( e->pos() );
     if ( existingItem )
     {
       existingItem->setSelected( true );
@@ -124,8 +124,8 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )
         QgsPointXY mapPos = transformCanvasToAnnotation( toMapCoordinates( e->pos() ), annotation );
         annotation->setMapPosition( mapPos );
         annotation->setMapPositionCrs( mCanvas->mapSettings().destinationCrs() );
-        annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(),
-                                         e->posF().y() / mCanvas->height() ) );
+        annotation->setRelativePosition( QPointF( e->pos().x() / mCanvas->width(),
+                                         e->pos().y() / mCanvas->height() ) );
         annotation->setFrameSize( QSizeF( 200, 100 ) );
 
         QgsProject::instance()->annotationManager()->addAnnotation( annotation );
@@ -184,17 +184,17 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )
     {
       QgsPointXY mapPos = transformCanvasToAnnotation( e->snapPoint(), annotation );
       annotation->setMapPosition( mapPos );
-      annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(),
-                                       e->posF().y() / mCanvas->height() ) );
+      annotation->setRelativePosition( QPointF( e->pos().x() / mCanvas->width(),
+                                       e->pos().y() / mCanvas->height() ) );
       item->update();
       QgsProject::instance()->setDirty( true );
     }
     else if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::MoveFramePosition )
     {
-      QPointF newCanvasPos = item->pos() + ( e->posF() - mLastMousePosition );
+      QPointF newCanvasPos = item->pos() + ( e->pos() - mLastMousePosition );
       if ( annotation->hasFixedMapPosition() )
       {
-        annotation->setFrameOffsetFromReferencePoint( annotation->frameOffsetFromReferencePoint() + ( e->posF() - mLastMousePosition ) );
+        annotation->setFrameOffsetFromReferencePoint( annotation->frameOffsetFromReferencePoint() + ( e->pos() - mLastMousePosition ) );
         annotation->setRelativePosition( QPointF( newCanvasPos.x() / mCanvas->width(),
                                          newCanvasPos.y() / mCanvas->height() ) );
       }
@@ -223,27 +223,27 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown ||
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp )
       {
-        xmax += e->posF().x() - mLastMousePosition.x();
+        xmax += e->pos().x() - mLastMousePosition.x();
       }
       if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeft ||
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown ||
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp )
       {
-        xmin += e->posF().x() - mLastMousePosition.x();
-        relPosX = ( relPosX * mCanvas->width() + e->posF().x() - mLastMousePosition.x() ) / ( double )mCanvas->width();
+        xmin += e->pos().x() - mLastMousePosition.x();
+        relPosX = ( relPosX * mCanvas->width() + e->pos().x() - mLastMousePosition.x() ) / ( double )mCanvas->width();
       }
       if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameUp ||
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp ||
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp )
       {
-        ymin += e->posF().y() - mLastMousePosition.y();
-        relPosY = ( relPosY * mCanvas->height() + e->posF().y() - mLastMousePosition.y() ) / ( double )mCanvas->height();
+        ymin += e->pos().y() - mLastMousePosition.y();
+        relPosY = ( relPosY * mCanvas->height() + e->pos().y() - mLastMousePosition.y() ) / ( double )mCanvas->height();
       }
       if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameDown ||
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown ||
            mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown )
       {
-        ymax += e->posF().y() - mLastMousePosition.y();
+        ymax += e->pos().y() - mLastMousePosition.y();
       }
 
       //switch min / max if necessary
@@ -270,18 +270,18 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )
   }
   else if ( item )
   {
-    QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition( e->posF() );
+    QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition( e->pos() );
     if ( mCanvas )
     {
       mCanvas->setCursor( QCursor( item->cursorShapeForAction( moveAction ) ) );
     }
   }
-  mLastMousePosition = e->posF();
+  mLastMousePosition = e->pos();
 }
 
 void QgsMapToolAnnotation::canvasDoubleClickEvent( QgsMapMouseEvent *e )
 {
-  QgsMapCanvasAnnotationItem *item = itemAtPos( e->posF() );
+  QgsMapCanvasAnnotationItem *item = itemAtPos( e->pos() );
   if ( !item )
   {
     return;
diff --git a/src/app/qgsmaptoolannotation.h b/src/app/qgsmaptoolannotation.h
@@ -60,7 +60,7 @@ class APP_EXPORT QgsMapToolAnnotation: public QgsMapTool
     QgsPointXY transformCanvasToAnnotation( QgsPointXY p, QgsAnnotation *annotation ) const;
 
     QgsMapCanvasAnnotationItem::MouseMoveAction mCurrentMoveAction = QgsMapCanvasAnnotationItem::NoAction;
-    QPointF mLastMousePosition = QPointF( 0, 0 );
+    QPoint mLastMousePosition = QPoint( 0, 0 );
 };
 
 #endif // QGSMAPTOOLANNOTATION_H
diff --git a/src/gui/layout/qgslayoutruler.cpp b/src/gui/layout/qgslayoutruler.cpp
@@ -571,7 +571,7 @@ void QgsLayoutRuler::setCursorPosition( QPointF position )
 
 void QgsLayoutRuler::mouseMoveEvent( QMouseEvent *event )
 {
-  mMarkerPos = event->posF();
+  mMarkerPos = event->pos();
   update();
 
   QPointF displayPos;
@@ -651,7 +651,7 @@ void QgsLayoutRuler::mouseMoveEvent( QMouseEvent *event )
     }
 
     //update cursor position in status bar
-    displayPos = mTransform.inverted().map( event->posF() );
+    displayPos = mTransform.inverted().map( event->pos() );
     switch ( mOrientation )
     {
       case Qt::Horizontal:
diff --git a/src/gui/layout/qgslayoutruler.h b/src/gui/layout/qgslayoutruler.h
@@ -104,7 +104,7 @@ class GUI_EXPORT QgsLayoutRuler: public QWidget
     QgsLayoutView *mView = nullptr;
 
     QTransform mTransform;
-    QPointF mMarkerPos;
+    QPoint mMarkerPos;
 
     QFont mRulerFont;
     std::unique_ptr< QFontMetrics > mRulerFontMetrics;
diff --git a/src/gui/qgscolorwidgets.cpp b/src/gui/qgscolorwidgets.cpp
@@ -601,7 +601,7 @@ void QgsColorWheel::setColorFromPos( const QPointF pos )
 
 void QgsColorWheel::mouseMoveEvent( QMouseEvent *event )
 {
-  setColorFromPos( event->posF() );
+  setColorFromPos( event->pos() );
   QgsColorWidget::mouseMoveEvent( event );
 }
 
@@ -621,7 +621,7 @@ void QgsColorWheel::mousePressEvent( QMouseEvent *event )
   {
     mClickedPart = QgsColorWheel::Wheel;
   }
-  setColorFromPos( event->posF() );
+  setColorFromPos( event->pos() );
 }
 
 void QgsColorWheel::mouseReleaseEvent( QMouseEvent *event )
@@ -1162,7 +1162,7 @@ void QgsColorRampWidget::setMarkerSize( const int markerSize )
 
 void QgsColorRampWidget::mouseMoveEvent( QMouseEvent *event )
 {
-  setColorFromPoint( event->posF() );
+  setColorFromPoint( event->pos() );
   QgsColorWidget::mouseMoveEvent( event );
 }
 
@@ -1191,7 +1191,7 @@ void QgsColorRampWidget::wheelEvent( QWheelEvent *event )
 
 void QgsColorRampWidget::mousePressEvent( QMouseEvent *event )
 {
-  setColorFromPoint( event->posF() );
+  setColorFromPoint( event->pos() );
 }
 
 void QgsColorRampWidget::keyPressEvent( QKeyEvent *event )
diff --git a/src/gui/qgscomposerruler.cpp b/src/gui/qgscomposerruler.cpp
@@ -386,11 +386,11 @@ void QgsComposerRuler::setSceneTransform( const QTransform &transform )
 void QgsComposerRuler::mouseMoveEvent( QMouseEvent *event )
 {
   //qWarning( "QgsComposerRuler::mouseMoveEvent" );
-  updateMarker( event->posF() );
-  setSnapLinePosition( event->posF() );
+  updateMarker( event->pos() );
+  setSnapLinePosition( event->pos() );
 
   //update cursor position in status bar
-  QPointF displayPos = mTransform.inverted().map( event->posF() );
+  QPointF displayPos = mTransform.inverted().map( event->pos() );
   if ( mDirection == Horizontal )
   {
     //mouse is over a horizontal ruler, so don't show a y coordinate

Original file line number	Diff line number	Diff line change
`@@ -94,12 +94,12 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )`
`94`	`94`	`return;`
`95`	`95`	`}`
`96`	`96`
`97`		`- mLastMousePosition = e->posF();`
	`97`	`+ mLastMousePosition = e->pos();`
`98`	`98`
`99`	`99`	`QgsMapCanvasAnnotationItem *item = selectedItem();`
`100`	`100`	`if ( item )`
`101`	`101`	`{`
`102`		`- mCurrentMoveAction = item->moveActionForPosition( e->posF() );`
	`102`	`+ mCurrentMoveAction = item->moveActionForPosition( e->pos() );`
`103`	`103`	`if ( mCurrentMoveAction != QgsMapCanvasAnnotationItem::NoAction )`
`104`	`104`	`{`
`105`	`105`	`return;`
`@@ -110,7 +110,7 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )`
`110`	`110`	`{`
`111`	`111`	`//select a new item if there is one at this position`
`112`	`112`	`mCanvas->scene()->clearSelection();`
`113`		`- QgsMapCanvasAnnotationItem *existingItem = itemAtPos( e->posF() );`
	`113`	`+ QgsMapCanvasAnnotationItem *existingItem = itemAtPos( e->pos() );`
`114`	`114`	`if ( existingItem )`
`115`	`115`	`{`
`116`	`116`	`existingItem->setSelected( true );`
`@@ -124,8 +124,8 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e )`
`124`	`124`	`QgsPointXY mapPos = transformCanvasToAnnotation( toMapCoordinates( e->pos() ), annotation );`
`125`	`125`	`annotation->setMapPosition( mapPos );`
`126`	`126`	`annotation->setMapPositionCrs( mCanvas->mapSettings().destinationCrs() );`
`127`		`- annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(),`
`128`		`- e->posF().y() / mCanvas->height() ) );`
	`127`	`+ annotation->setRelativePosition( QPointF( e->pos().x() / mCanvas->width(),`
	`128`	`+ e->pos().y() / mCanvas->height() ) );`
`129`	`129`	`annotation->setFrameSize( QSizeF( 200, 100 ) );`
`130`	`130`
`131`	`131`	`QgsProject::instance()->annotationManager()->addAnnotation( annotation );`
`@@ -184,17 +184,17 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )`
`184`	`184`	`{`
`185`	`185`	`QgsPointXY mapPos = transformCanvasToAnnotation( e->snapPoint(), annotation );`
`186`	`186`	`annotation->setMapPosition( mapPos );`
`187`		`- annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(),`
`188`		`- e->posF().y() / mCanvas->height() ) );`
	`187`	`+ annotation->setRelativePosition( QPointF( e->pos().x() / mCanvas->width(),`
	`188`	`+ e->pos().y() / mCanvas->height() ) );`
`189`	`189`	`item->update();`
`190`	`190`	`QgsProject::instance()->setDirty( true );`
`191`	`191`	`}`
`192`	`192`	`else if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::MoveFramePosition )`
`193`	`193`	`{`
`194`		`- QPointF newCanvasPos = item->pos() + ( e->posF() - mLastMousePosition );`
	`194`	`+ QPointF newCanvasPos = item->pos() + ( e->pos() - mLastMousePosition );`
`195`	`195`	`if ( annotation->hasFixedMapPosition() )`
`196`	`196`	`{`
`197`		`- annotation->setFrameOffsetFromReferencePoint( annotation->frameOffsetFromReferencePoint() + ( e->posF() - mLastMousePosition ) );`
	`197`	`+ annotation->setFrameOffsetFromReferencePoint( annotation->frameOffsetFromReferencePoint() + ( e->pos() - mLastMousePosition ) );`
`198`	`198`	`annotation->setRelativePosition( QPointF( newCanvasPos.x() / mCanvas->width(),`
`199`	`199`	`newCanvasPos.y() / mCanvas->height() ) );`
`200`	`200`	`}`
`@@ -223,27 +223,27 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )`
`223`	`223`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown \|\|`
`224`	`224`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp )`
`225`	`225`	`{`
`226`		`- xmax += e->posF().x() - mLastMousePosition.x();`
	`226`	`+ xmax += e->pos().x() - mLastMousePosition.x();`
`227`	`227`	`}`
`228`	`228`	`if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeft \|\|`
`229`	`229`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown \|\|`
`230`	`230`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp )`
`231`	`231`	`{`
`232`		`- xmin += e->posF().x() - mLastMousePosition.x();`
`233`		`- relPosX = ( relPosX * mCanvas->width() + e->posF().x() - mLastMousePosition.x() ) / ( double )mCanvas->width();`
	`232`	`+ xmin += e->pos().x() - mLastMousePosition.x();`
	`233`	`+ relPosX = ( relPosX * mCanvas->width() + e->pos().x() - mLastMousePosition.x() ) / ( double )mCanvas->width();`
`234`	`234`	`}`
`235`	`235`	`if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameUp \|\|`
`236`	`236`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp \|\|`
`237`	`237`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp )`
`238`	`238`	`{`
`239`		`- ymin += e->posF().y() - mLastMousePosition.y();`
`240`		`- relPosY = ( relPosY * mCanvas->height() + e->posF().y() - mLastMousePosition.y() ) / ( double )mCanvas->height();`
	`239`	`+ ymin += e->pos().y() - mLastMousePosition.y();`
	`240`	`+ relPosY = ( relPosY * mCanvas->height() + e->pos().y() - mLastMousePosition.y() ) / ( double )mCanvas->height();`
`241`	`241`	`}`
`242`	`242`	`if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameDown \|\|`
`243`	`243`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown \|\|`
`244`	`244`	`mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown )`
`245`	`245`	`{`
`246`		`- ymax += e->posF().y() - mLastMousePosition.y();`
	`246`	`+ ymax += e->pos().y() - mLastMousePosition.y();`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`//switch min / max if necessary`
`@@ -270,18 +270,18 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )`
`270`	`270`	`}`
`271`	`271`	`else if ( item )`
`272`	`272`	`{`
`273`		`- QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition( e->posF() );`
	`273`	`+ QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition( e->pos() );`
`274`	`274`	`if ( mCanvas )`
`275`	`275`	`{`
`276`	`276`	`mCanvas->setCursor( QCursor( item->cursorShapeForAction( moveAction ) ) );`
`277`	`277`	`}`
`278`	`278`	`}`
`279`		`- mLastMousePosition = e->posF();`
	`279`	`+ mLastMousePosition = e->pos();`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`void QgsMapToolAnnotation::canvasDoubleClickEvent( QgsMapMouseEvent *e )`
`283`	`283`	`{`
`284`		`- QgsMapCanvasAnnotationItem *item = itemAtPos( e->posF() );`
	`284`	`+ QgsMapCanvasAnnotationItem *item = itemAtPos( e->pos() );`
`285`	`285`	`if ( !item )`
`286`	`286`	`{`
`287`	`287`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ void QgsLayoutRuler::setCursorPosition( QPointF position )`
`571`	`571`
`572`	`572`	`void QgsLayoutRuler::mouseMoveEvent( QMouseEvent *event )`
`573`	`573`	`{`
`574`		`- mMarkerPos = event->posF();`
	`574`	`+ mMarkerPos = event->pos();`
`575`	`575`	`update();`
`576`	`576`
`577`	`577`	`QPointF displayPos;`
`@@ -651,7 +651,7 @@ void QgsLayoutRuler::mouseMoveEvent( QMouseEvent *event )`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`//update cursor position in status bar`
`654`		`- displayPos = mTransform.inverted().map( event->posF() );`
	`654`	`+ displayPos = mTransform.inverted().map( event->pos() );`
`655`	`655`	`switch ( mOrientation )`
`656`	`656`	`{`
`657`	`657`	`case Qt::Horizontal:`
Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ void QgsColorWheel::setColorFromPos( const QPointF pos )`
`601`	`601`
`602`	`602`	`void QgsColorWheel::mouseMoveEvent( QMouseEvent *event )`
`603`	`603`	`{`
`604`		`- setColorFromPos( event->posF() );`
	`604`	`+ setColorFromPos( event->pos() );`
`605`	`605`	`QgsColorWidget::mouseMoveEvent( event );`
`606`	`606`	`}`
`607`	`607`
`@@ -621,7 +621,7 @@ void QgsColorWheel::mousePressEvent( QMouseEvent *event )`
`621`	`621`	`{`
`622`	`622`	`mClickedPart = QgsColorWheel::Wheel;`
`623`	`623`	`}`
`624`		`- setColorFromPos( event->posF() );`
	`624`	`+ setColorFromPos( event->pos() );`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`void QgsColorWheel::mouseReleaseEvent( QMouseEvent *event )`
`@@ -1162,7 +1162,7 @@ void QgsColorRampWidget::setMarkerSize( const int markerSize )`
`1162`	`1162`
`1163`	`1163`	`void QgsColorRampWidget::mouseMoveEvent( QMouseEvent *event )`
`1164`	`1164`	`{`
`1165`		`- setColorFromPoint( event->posF() );`
	`1165`	`+ setColorFromPoint( event->pos() );`
`1166`	`1166`	`QgsColorWidget::mouseMoveEvent( event );`
`1167`	`1167`	`}`
`1168`	`1168`
`@@ -1191,7 +1191,7 @@ void QgsColorRampWidget::wheelEvent( QWheelEvent *event )`
`1191`	`1191`
`1192`	`1192`	`void QgsColorRampWidget::mousePressEvent( QMouseEvent *event )`
`1193`	`1193`	`{`
`1194`		`- setColorFromPoint( event->posF() );`
	`1194`	`+ setColorFromPoint( event->pos() );`
`1195`	`1195`	`}`
`1196`	`1196`
`1197`	`1197`	`void QgsColorRampWidget::keyPressEvent( QKeyEvent *event )`
Original file line number	Diff line number	Diff line change
`@@ -386,11 +386,11 @@ void QgsComposerRuler::setSceneTransform( const QTransform &transform )`
`386`	`386`	`void QgsComposerRuler::mouseMoveEvent( QMouseEvent *event )`
`387`	`387`	`{`
`388`	`388`	`//qWarning( "QgsComposerRuler::mouseMoveEvent" );`
`389`		`- updateMarker( event->posF() );`
`390`		`- setSnapLinePosition( event->posF() );`
	`389`	`+ updateMarker( event->pos() );`
	`390`	`+ setSnapLinePosition( event->pos() );`
`391`	`391`
`392`	`392`	`//update cursor position in status bar`
`393`		`- QPointF displayPos = mTransform.inverted().map( event->posF() );`
	`393`	`+ QPointF displayPos = mTransform.inverted().map( event->pos() );`
`394`	`394`	`if ( mDirection == Horizontal )`
`395`	`395`	`{`
`396`	`396`	`//mouse is over a horizontal ruler, so don't show a y coordinate`