Changeset 82029 in vbox

Timestamp:

Nov 20, 2019 3:43:46 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9598: UIMousePointerShapeData: Rename hot point to hot-spot.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMousePointerShapeData.cpp (modified) (3 diffs)
• globals/UIMousePointerShapeData.h (modified) (3 diffs)
• runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMousePointerShapeData.cpp

@@ -21 +21 @@
 UIMousePointerShapeData::UIMousePointerShapeData(bool fVisible /* = false */,
                                                  bool fAlpha /* = false */,
-                                                 const QPoint &hotPoint /* = QPoint() */,
+                                                 const QPoint &hotSpot /* = QPoint() */,
                                                  const QSize &shapeSize /* = QSize() */,
                                                  const QVector<BYTE> &shape /* = QVector<BYTE>() */)
     : m_fVisible(fVisible)
     , m_fAlpha(fAlpha)
-    , m_hotPoint(hotPoint)
+    , m_hotSpot(hotSpot)
     , m_shapeSize(shapeSize)
     , m_shape(shape)
@@ -35 +35 @@
     : m_fVisible(another.isVisible())
     , m_fAlpha(another.hasAlpha())
-    , m_hotPoint(another.hotPoint())
+    , m_hotSpot(another.hotSpot())
     , m_shapeSize(another.shapeSize())
     , m_shape(another.shape())
@@ -45 +45 @@
     m_fVisible = another.isVisible();
     m_fAlpha = another.hasAlpha();
-    m_hotPoint = another.hotPoint();
+    m_hotSpot = another.hotSpot();
     m_shapeSize = another.shapeSize();
     m_shape = another.shape();

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMousePointerShapeData.h

@@ -43 +43 @@
       * @param  fVisible   Brings whether mouse pointer should be visible.
       * @param  fAlpha     Brings whether mouse pointer chape has alpha channel.
-      * @param  hotPoint   Brings the mouse pointer hot point.
+      * @param  hotSpot    Brings the mouse pointer hot-spot.
       * @param  shapeSize  Brings the mouse pointer shape size.
       * @param  shape      Brings the mouse pointer shape byte array. */
     UIMousePointerShapeData(bool fVisible = false,
                             bool fAlpha = false,
-                            const QPoint &hotPoint = QPoint(),
+                            const QPoint &hotSpot = QPoint(),
                             const QSize &shapeSize = QSize(),
                             const QVector<BYTE> &shape = QVector<BYTE>());
@@ -62 +62 @@
     /** Returns whether mouse pointer chape has alpha channel. */
     bool hasAlpha() const { return m_fAlpha; }
-    /** Returns the mouse pointer hot point. */
-    const QPoint &hotPoint() const { return m_hotPoint; }
+    /** Returns the mouse pointer hot-spot. */
+    const QPoint &hotSpot() const { return m_hotSpot; }
     /** Returns the mouse pointer shape size. */
     const QSize &shapeSize() const { return m_shapeSize; }
@@ -75 +75 @@
     /** Holds whether mouse pointer chape has alpha channel. */
     bool           m_fAlpha;
-    /** Holds the mouse pointer hot point. */
-    QPoint         m_hotPoint;
+    /** Holds the mouse pointer hot-spot. */
+    QPoint         m_hotSpot;
     /** Holds the mouse pointer shape size. */
     QSize          m_shapeSize;

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

@@ -1658 +1658 @@
     /* Fetch incoming shape data: */
     const bool fHasAlpha = m_shapeData.hasAlpha();
-    uint uXHot = m_shapeData.hotPoint().x();
-    uint uYHot = m_shapeData.hotPoint().y();
+    uint uXHot = m_shapeData.hotSpot().x();
+    uint uYHot = m_shapeData.hotSpot().y();
     const uint uWidth = m_shapeData.shapeSize().width();
     const uint uHeight = m_shapeData.shapeSize().height();