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

Timestamp:

Aug 16, 2010 3:00:05 PM (14 years ago)

Author:

vboxsync

Message:

Main, frontends: unsigned long long -> long long

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.h (modified) (1 diff)
• runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• runtime/UIFrameBuffer.h (modified) (3 diffs)
• runtime/UIIndicatorsPool.cpp (modified) (2 diffs)
• runtime/UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -2048 +2048 @@
 
 #endif /* #ifndef __VBoxFBOverlay_h__ */
-

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

@@ -46 +46 @@
 {
     AssertMsg(m_pMachineView, ("UIMachineView must not be null\n"));
-    m_uWinId = (m_pMachineView && m_pMachineView->viewport()) ? (ULONG64)m_pMachineView->viewport()->winId() : 0;
+    m_WinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
     int rc = RTCritSectInit(&m_critSect);
     AssertRC(rc);
@@ -129 +129 @@
 }
 
-STDMETHODIMP UIFrameBuffer::COMGETTER(WinId) (ULONG64 *puWinId)
-{
-    if (!puWinId)
-        return E_POINTER;
-    *puWinId = m_uWinId;
+STDMETHODIMP UIFrameBuffer::COMGETTER(WinId) (LONG64 *pWinId)
+{
+    if (!pWinId)
+        return E_POINTER;
+    *pWinId = m_WinId;
     return S_OK;
 }
@@ -248 +248 @@
 {
     m_pMachineView = pView;
-    m_uWinId = (m_pMachineView && m_pMachineView->viewport()) ? (ULONG64)m_pMachineView->viewport()->winId() : 0;
+    m_WinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
 }
 #endif
-

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

@@ -156 +156 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *puHeightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **ppOverlay);
-    STDMETHOD(COMGETTER(WinId)) (ULONG64 *pWinId);
+    STDMETHOD(COMGETTER(WinId)) (LONG64 *pWinId);
 
     STDMETHOD(Lock)();
@@ -239 +239 @@
     int m_height;
     QSize m_scaledSize;
-    uint64_t m_uWinId;
+    int64_t m_WinId;
     bool m_fIsDeleted;
 
@@ -250 +250 @@
 
 #endif // !___UIFrameBuffer_h___
-

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

@@ -280 +280 @@
 
         QString strFlags, strCount;
-        ULONG64 uTimestamp;
-        machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, uTimestamp, strFlags);
-        bool fPropsValid = (u64Now - uTimestamp < UINT64_C(60000000000)); /* timeout beacon */
+        LONG64 iTimestamp;
+        machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, iTimestamp, strFlags);
+        bool fPropsValid = (u64Now - iTimestamp < UINT64_C(60000000000)); /* timeout beacon */
 
         QStringList ipList, macList;
@@ -729 +729 @@
 
 #include "UIIndicatorsPool.moc"
-

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

@@ -231 +231 @@
 
 #endif // !___UIMachineView_h___
-