Changeset 76423 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Dec 23, 2018 8:30:52 PM (6 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h
r72057 r76423 48 48 #include <iprt/critsect.h> 49 49 #include <iprt/asm.h> 50 #include <iprt/err.h>51 50 #include <iprt/list.h> 52 51 #include <VBox/VBoxGL2D.h> -
trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp
r74878 r76423 44 44 45 45 /* Other VBox includes: */ 46 # include <iprt/env.h>47 # include <iprt/err.h>48 # include <iprt/path.h>49 # include <iprt/param.h>50 46 # include <nsEventQueueUtils.h> 51 47 # include <nsIEventQueue.h> -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
r75668 r76423 91 91 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ 92 92 93 #include <iprt/err .h>93 #include <iprt/errcore.h> 94 94 95 95 -
trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
r76366 r76423 47 47 48 48 /* Other VBox includes: */ 49 # include <iprt/err.h>49 //# include <iprt/err.h> 50 50 # include <iprt/path.h> 51 51 # include <iprt/system.h> -
trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp
r71659 r76423 37 37 #endif 38 38 #ifdef VBOX_WITH_KBD_LEDS_SYNC 39 # include <iprt/err .h>39 # include <iprt/errcore.h> 40 40 # include <iprt/semaphore.h> 41 41 # include <VBox/sup.h> -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp
r76381 r76423 16 16 */ 17 17 18 #ifdef LOG_GROUP19 # undef LOG_GROUP20 #endif21 18 #define LOG_GROUP LOG_GROUP_GUEST_DND 22 19 #include <VBox/log.h> … … 27 24 28 25 #include <iprt/mem.h> 29 #include <iprt/err .h>26 #include <iprt/errcore.h> 30 27 #include <iprt/path.h> 31 28 #include <iprt/semaphore.h> -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp
r76346 r76423 34 34 #define LOG_GROUP LOG_GROUP_GUEST_DND 35 35 #include <VBox/log.h> 36 #include <iprt/err .h>36 #include <iprt/errcore.h> 37 37 38 38 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
r76169 r76423 91 91 #include <VBox/VBoxOGL.h> 92 92 #include <VBoxVideo.h> 93 #ifdef VBOX_WS_MAC 94 # include <VBox/err.h> 95 #endif /* VBOX_WS_MAC */ 93 #include <iprt/errcore.h> 96 94 97 95 /* External includes: */ … … 1579 1577 1580 1578 #ifdef VBOX_WITH_DRAG_AND_DROP 1579 1581 1580 bool UIMachineView::dragAndDropCanAccept(void) const 1582 1581 { 1583 1582 bool fAccept = m_pDnDHandler 1584 # ifdef VBOX_WITH_DRAG_AND_DROP_GH1583 # ifdef VBOX_WITH_DRAG_AND_DROP_GH 1585 1584 && !m_fIsDraggingFromGuest 1586 # endif1585 # endif 1587 1586 && machine().GetDnDMode() != KDnDMode_Disabled; 1588 1587 return fAccept; … … 1668 1667 if (!dragAndDropIsActive()) 1669 1668 rc = VERR_ACCESS_DENIED; 1670 # ifdef VBOX_WITH_DRAG_AND_DROP_GH1669 # ifdef VBOX_WITH_DRAG_AND_DROP_GH 1671 1670 else if (!m_fIsDraggingFromGuest) 1672 1671 { … … 1679 1678 else /* Already dragging, so report success. */ 1680 1679 rc = VINF_SUCCESS; 1681 # else1680 # else 1682 1681 rc = VERR_NOT_SUPPORTED; 1683 # endif1682 # endif 1684 1683 1685 1684 DNDDEBUG(("DnD: dragCheckPending ended with rc=%Rrc\n", rc)); … … 1693 1692 if (!dragAndDropIsActive()) 1694 1693 rc = VERR_ACCESS_DENIED; 1695 # ifdef VBOX_WITH_DRAG_AND_DROP_GH1694 # ifdef VBOX_WITH_DRAG_AND_DROP_GH 1696 1695 else if (!m_fIsDraggingFromGuest) 1697 1696 rc = VERR_WRONG_ORDER; … … 1704 1703 m_fIsDraggingFromGuest = false; 1705 1704 } 1706 # else1705 # else 1707 1706 rc = VERR_NOT_SUPPORTED; 1708 # endif1707 # endif 1709 1708 1710 1709 DNDDEBUG(("DnD: dragStart ended with rc=%Rrc\n", rc)); … … 1718 1717 if (!dragAndDropIsActive()) 1719 1718 rc = VERR_ACCESS_DENIED; 1720 # ifdef VBOX_WITH_DRAG_AND_DROP_GH1719 # ifdef VBOX_WITH_DRAG_AND_DROP_GH 1721 1720 else if (!m_fIsDraggingFromGuest) 1722 1721 rc = VERR_WRONG_ORDER; 1723 1722 else 1724 1723 rc = m_pDnDHandler->dragStop(screenId()); 1725 # else1724 # else 1726 1725 rc = VERR_NOT_SUPPORTED; 1727 # endif1726 # endif 1728 1727 1729 1728 DNDDEBUG(("DnD: dragStop ended with rc=%Rrc\n", rc)); … … 1756 1755 DNDDEBUG(("DnD: dropEvent ended with rc=%Rrc\n", rc)); 1757 1756 } 1757 1758 1758 #endif /* VBOX_WITH_DRAG_AND_DROP */ 1759 1759 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp
r76212 r76423 40 40 41 41 /* Other VBox includes: */ 42 #include <iprt/err .h>42 #include <iprt/errcore.h> 43 43 44 44
Note:
See TracChangeset
for help on using the changeset viewer.