VirtualBox

Changeset 76379 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Dec 22, 2018 10:48:10 PM (6 years ago)
Author:
vboxsync
Message:

VBox/GuestHost/DragAndDrop.h: Don't include err.h, dir.h and file.h when all you need is fs.h for RTFSOBJINFO. Also address some misconception in Guest/DragAndDrop of how we use LOG_GROUP (it goes first, before all the headers (and you don't need #ifndef before #undef)). Generally, include the module header first and then all the stuff the implementation needs afterwards. bugref:9344

Location:
trunk/src/VBox
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiDisp.cpp

    r73097 r76379  
    4747
    4848/* typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_LOCK(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock); */
    49 DECLCALLBACK(int) vboxUhgsmiD3DBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
     49DECLCALLBACK(int) vboxUhgsmiD3DBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock,
     50                                          VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
    5051{
    5152    PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pBuffer = VBOXUHGSMDXALLOCBASE_GET_BUFFER(pBuf);

  • trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp

    r74526 r76379  
    11/* $Id$ */
    22/** @file
    3  * DnD: Directory handling.
     3 * DnD - Directory handling.
    44 */
    55
    … …  
    2020*   Header Files                                                                                                                 *
    2121*********************************************************************************************************************************/
     22#define LOG_GROUP LOG_GROUP_GUEST_DND
     23#include <VBox/GuestHost/DragAndDrop.h>
    2224
    2325#include <iprt/assert.h>
    2426#include <iprt/dir.h>
     27#include <iprt/err.h>
     28#include <iprt/file.h>
    2529#include <iprt/path.h>
    2630#include <iprt/string.h>
    2731
    28 #include <VBox/GuestHost/DragAndDrop.h>
    29 
    30 #ifdef LOG_GROUP
    31  #undef LOG_GROUP
    32 #endif
    33 #define LOG_GROUP LOG_GROUP_GUEST_DND
     32
    3433#include <VBox/log.h>
    3534

  • trunk/src/VBox/GuestHost/DragAndDrop/DnDMIME.cpp

    r69500 r76379  
    11/* $Id$ */
    22/** @file
    3  * DnD: Path list class.
     3 * DnD - Path list class.
    44 */
    55
    … …  
    2020*   Header Files                                                                                                                 *
    2121*********************************************************************************************************************************/
     22#define LOG_GROUP LOG_GROUP_GUEST_DND
     23#include <VBox/GuestHost/DragAndDrop.h>
    2224
    2325#include <iprt/string.h>
    2426
    25 #include <VBox/GuestHost/DragAndDrop.h>
    2627
    2728bool DnDMIMEHasFileURLs(const char *pcszFormat, size_t cchFormatMax)

  • trunk/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp

    r69500 r76379  
    2020*   Header Files                                                                                                                 *
    2121*********************************************************************************************************************************/
     22#define LOG_GROUP LOG_GROUP_GUEST_DND
     23#include <VBox/GuestHost/DragAndDrop.h>
    2224
     25#include <iprt/err.h>
    2326#include <iprt/path.h>
    2427#include <iprt/string.h>
    2528
    26 #include <VBox/GuestHost/DragAndDrop.h>
    2729
    2830/**

  • trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

    r74715 r76379  
    11/* $Id$ */
    22/** @file
    3  * DnD: URI list class.
     3 * DnD - URI list class.
    44 */
    55
    … …  
    2020*   Header Files                                                                                                                 *
    2121*********************************************************************************************************************************/
     22#define LOG_GROUP LOG_GROUP_GUEST_DND
     23#include <VBox/GuestHost/DragAndDrop.h>
    2224
    2325#include <iprt/dir.h>
     26#include <iprt/err.h>
    2427#include <iprt/file.h>
    2528#include <iprt/fs.h>
    … …  
    2932#include <iprt/uri.h>
    3033
    31 #ifdef LOG_GROUP
    32  #undef LOG_GROUP
    33 #endif
    34 #define LOG_GROUP LOG_GROUP_GUEST_DND
    3534#include <VBox/log.h>
    3635
    37 #include <VBox/GuestHost/DragAndDrop.h>
    3836
    3937DnDURIList::DnDURIList(void)

  • trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp

    r74714 r76379  
    11/* $Id$ */
    22/** @file
    3  * DnD: URI object class. For handling creation/reading/writing to files and directories
    4  *      on host or guest side.
     3 * DnD - URI object class. For handling creation/reading/writing to files and directories on host or guest side.
    54 */
    65
    … …  
    2120*   Header Files                                                                                                                 *
    2221*********************************************************************************************************************************/
     22#define LOG_GROUP LOG_GROUP_GUEST_DND
     23#include <VBox/GuestHost/DragAndDrop.h>
    2324
    2425#include <iprt/dir.h>
     26#include <iprt/err.h>
    2527#include <iprt/file.h>
    2628#include <iprt/fs.h>
    … …  
    2830#include <iprt/uri.h>
    2931
    30 #ifdef LOG_GROUP
    31  #undef LOG_GROUP
    32 #endif
    33 #define LOG_GROUP LOG_GROUP_GUEST_DND
    3432#include <VBox/log.h>
    3533
    36 #include <VBox/GuestHost/DragAndDrop.h>
    3734
    3835DnDURIObject::DnDURIObject(void)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette