VirtualBox

Changeset 73924 in vbox for trunk


Ignore:
Timestamp:
Aug 28, 2018 7:49:26 AM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: A bit of cleanup for UIMachineDefs.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/runtime
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

    r73871 r73924  
    465465int UIKeyboardHandler::state() const
    466466{
    467     return (m_fIsKeyboardCaptured ? UIViewStateType_KeyboardCaptured : 0) |
    468            (m_bIsHostComboPressed ? UIViewStateType_HostKeyPressed : 0) |
    469            (m_fHostKeyComboPressInserted ? UIViewStateType_HostKeyPressedInsertion : 0);
     467    return (m_fIsKeyboardCaptured ? UIKeyboardStateType_KeyboardCaptured : 0) |
     468           (m_bIsHostComboPressed ? UIKeyboardStateType_HostKeyPressed : 0) |
     469           (m_fHostKeyComboPressInserted ? UIKeyboardStateType_HostKeyPressedInsertion : 0);
    470470}
    471471
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h

    r73871 r73924  
    55
    66/*
    7  * Copyright (C) 2010-2017 Oracle Corporation
     7 * Copyright (C) 2010-2018 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
     
    1616 */
    1717
    18 #ifndef __UIMachineDefs_h__
    19 #define __UIMachineDefs_h__
     18#ifndef ___UIMachineDefs_h___
     19#define ___UIMachineDefs_h___
    2020
    21 /* Global includes */
     21/* Other VBox includes: */
    2222#include <iprt/cdefs.h>
    2323
    24 /* Machine elements enum: */
     24/** Machine window visual element types. */
    2525enum UIVisualElement
    2626{
     
    4040#ifndef VBOX_WS_MAC
    4141    UIVisualElement_MiniToolBar           = RT_BIT(13),
    42 #endif /* !VBOX_WS_MAC */
     42#endif
    4343    UIVisualElement_AllStuff              = 0xFFFF
    4444};
    4545
    46 /* Mouse states enum: */
     46/** Mouse state types. */
    4747enum UIMouseStateType
    4848{
     
    5353};
    5454
    55 /* Machine View states enum: */
    56 enum UIViewStateType
     55/** Keyboard state types. */
     56enum UIKeyboardStateType
    5757{
    58     UIViewStateType_KeyboardCaptured          = RT_BIT(0),
    59     UIViewStateType_HostKeyPressed            = RT_BIT(1),
    60     /* A host key combo press has been inserted to the guest but not a release yet. */
    61     UIViewStateType_HostKeyPressedInsertion   = RT_BIT(2)
     58    UIKeyboardStateType_KeyboardCaptured        = RT_BIT(0),
     59    UIKeyboardStateType_HostKeyPressed          = RT_BIT(1),
     60    UIKeyboardStateType_HostKeyPressedInsertion = RT_BIT(2)
    6261};
    6362
    64 #endif // __UIMachineDefs_h__
     63#endif /* !___UIMachineDefs_h___ */
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