Changeset 107421 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 6, 2025 4:01:26 PM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166473

Message:

FE/Qt: bugref:3409: Runtime UI: Fixing few parfait warnings in Machine-view code, related to implicit type conversion.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (9 diffs)
• UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -1189 +1189 @@
     QPixmap pixmapMask = uimachine()->cursorMaskPixmap();
     const QPoint hotspot = uimachine()->cursorHotspot();
-    uint uXHot = hotspot.x();
-    uint uYHot = hotspot.y();
+    int iXHot = hotspot.x();
+    int iYHot = hotspot.y();
 
     /* If there is no mask: */
@@ -1197 +1197 @@
         /* Scale the shape pixmap and
          * compose the cursor on the basis of shape only: */
-        updateMousePointerPixmapScaling(pixmapShape, uXHot, uYHot);
-        m_cursor = QCursor(pixmapShape, uXHot, uYHot);
+        updateMousePointerPixmapScaling(pixmapShape, iXHot, iYHot);
+        m_cursor = QCursor(pixmapShape, iXHot, iYHot);
     }
     /* Otherwise: */
@@ -1205 +1205 @@
         /* Scale the shape and the mask pixmaps and
          * compose the cursor on the basis of shape and mask both: */
-        updateMousePointerPixmapScaling(pixmapShape, uXHot, uYHot);
-        /// @todo updateMousePointerPixmapScaling(pixmapMask, uXHot, uYHot);
-        m_cursor = QCursor(QBitmap::fromPixmap(pixmapShape), QBitmap::fromPixmap(pixmapMask), uXHot, uYHot);
+        updateMousePointerPixmapScaling(pixmapShape, iXHot, iYHot);
+        /// @todo updateMousePointerPixmapScaling(pixmapMask, iXHot, iYHot);
+        m_cursor = QCursor(QBitmap::fromPixmap(pixmapShape), QBitmap::fromPixmap(pixmapMask), iXHot, iYHot);
     }
 
@@ -2196 +2196 @@
 }
 
-void UIMachineView::updateMousePointerPixmapScaling(QPixmap &pixmap, uint &uXHot, uint &uYHot)
+void UIMachineView::updateMousePointerPixmapScaling(QPixmap &pixmap, int &iXHot, int &iYHot)
 {
 #if defined(VBOX_WS_MAC)
@@ -2208 +2208 @@
         pixmap = pixmap.scaled(pixmap.width() * dScaleFactor, pixmap.height() * dScaleFactor,
                                Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-        uXHot *= dScaleFactor;
-        uYHot *= dScaleFactor;
+        iXHot *= dScaleFactor;
+        iYHot *= dScaleFactor;
     }
 
@@ -2221 +2221 @@
         /* Scale the pixmap down: */
         pixmap.setDevicePixelRatio(dDevicePixelRatio);
-        uXHot /= dDevicePixelRatio;
-        uYHot /= dDevicePixelRatio;
+        iXHot /= dDevicePixelRatio;
+        iYHot /= dDevicePixelRatio;
     }
 
@@ -2253 +2253 @@
         pixmap = pixmap.scaled(pixmap.width() * dScaleMultiplier, pixmap.height() * dScaleMultiplier,
                                Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-        uXHot *= dScaleMultiplier;
-        uYHot *= dScaleMultiplier;
+        iXHot *= dScaleMultiplier;
+        iYHot *= dScaleMultiplier;
     }
 
@@ -2263 +2263 @@
         /* Scale the pixmap down: */
         pixmap.setDevicePixelRatio(dDevicePixelRatio);
-        uXHot /= dDevicePixelRatio;
-        uYHot /= dDevicePixelRatio;
+        iXHot /= dDevicePixelRatio;
+        iYHot /= dDevicePixelRatio;
     }
 # endif
@@ -2271 +2271 @@
 
     Q_UNUSED(pixmap);
-    Q_UNUSED(uXHot);
-    Q_UNUSED(uYHot);
+    Q_UNUSED(iXHot);
+    Q_UNUSED(iYHot);
 
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -383 +383 @@
     QSize scaledBackward(QSize size) const;
 
-    /** Updates mouse pointer @a pixmap, @a uXHot and @a uYHot according to scaling attributes. */
-    void updateMousePointerPixmapScaling(QPixmap &pixmap, uint &uXHot, uint &uYHot);
+    /** Updates mouse pointer @a pixmap, @a iXHot and @a iYHot according to scaling attributes. */
+    void updateMousePointerPixmapScaling(QPixmap &pixmap, int &iXHot, int &iYHot);
 
     /* Protected members: */