VirtualBox

Ignore:
Timestamp:
Jun 6, 2012 4:19:03 AM (13 years ago)
Author:
vboxsync
Message:

FE/Qt: 6227: Decrease GUI build time: Rework COM wrappers generator to create one header per each COM interface. Update all GUI files to use newly generated headers.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
128 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r41480 r41587  
    725725## @todo kBuild: Non-existing +| targets should be tried remade or what?
    726726VirtualBox_BLDDIRS       += $(VirtualBox_0_OUTDIR)/include
    727 VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/COMWrappers.h
    728 VirtualBox_CLEAN         += \
    729         $(VirtualBox_0_OUTDIR)/include/COMWrappers \
    730         $(VirtualBox_0_OUTDIR)/include/COMWrappers.tmp \
    731         $(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
    732         $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
     727VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/COMEnums.h
     728VirtualBox_CLEAN         += $(wildcard $(VirtualBox_0_OUTDIR)/include/*)
    733729VirtualBox_SOURCES       += $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
    734730
    735731$$(VirtualBox_0_OUTDIR)/include/COMWrappers \
    736 +| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
     732+| $$(VirtualBox_0_OUTDIR)/include/COMEnums.h \
    737733+| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp: \
    738734                $(VBOX_XIDL_FILE) \
    … …  
    740736                | $$(dir $$@)
    741737        $(call MSG_GENERATE,VirtualBox,$<,$@)
    742         $(QUIET)$(RM) -f $@ [email protected] [email protected] [email protected]
     738        $(QUIET)$(RM) -f COMWrappers* COMEnums.h C*.h
    743739        $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_VIRTUALBOX4_SRC)/src/globals/COMWrappers.xsl $<
    744 
    745         $(QUIET)$(SED) -e '1,/\/\/ wrapper definitions/ !d' \
    746                 --output [email protected] $@
    747         $(QUIET)$(CP) --changed [email protected] [email protected]
    748 
    749         $(QUIET)$(APPEND) -t -n [email protected] \
    750                 '/*' \
    751                 ' * DO NOT EDIT! This is a generated file, see COMWrappers.h for details.' \
    752                 ' */' \
    753                 '' \
    754                 '#include "VBoxGlobal.h"' \
    755                 ''
    756         $(QUIET)$(SED) -e '/\/\/ wrapper definitions/,9999999 !d' \
    757                 -e 's/^inline //' \
    758                 --append [email protected] $@
    759         $(QUIET)$(CP) --changed [email protected] [email protected]
    760         $(QUIET)$(RM) -f [email protected]
    761 
     740        $(QUIET)$(VBOX_FILESPLIT) $@ $(VirtualBox_0_OUTDIR)/include
    762741
    763742# alias for generating the COM Wrappers file.

  • trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.h

    r37885 r41587  
    2020#define __UIMediumTypeChangeDialog_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "QIDialog.h"
    2424#include "QIWithRetranslateUI.h"
    25 #include "COMDefs.h"
     25
     26/* COM includes: */
     27#include "COMEnums.h"
     28#include "CProgress.h"
     29#include "CMediumFormat.h"
     30#include "CMedium.h"
    2631
    2732/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp

    r38973 r41587  
    2121# include "precomp.h"
    2222#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    23 /* Global includes: */
     23
     24/* Qt includes: */
    2425#include <QCheckBox>
    2526#include <QDateTime>
    … …  
    3132#include <QTextEdit>
    3233
    33 /* Local includes: */
     34/* GUI includes: */
    3435#include "UIVMLogViewer.h"
    3536#include "QITabWidget.h"
    … …  
    3940#include "UIMessageCenter.h"
    4041#include "VBoxUtils.h"
     42
     43/* COM includes: */
     44#include "COMEnums.h"
     45#include "CSystemProperties.h"
     46
    4147#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4248

  • trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.h

    r38973 r41587  
    2020#define __UIVMLogViewer_h__
    2121
    22 /* Global includes: */
     22/* Qt includes: */
    2323#include <QMainWindow>
    2424#include <QMap>
    2525#include <QPair>
    2626
    27 /* Local includes: */
     27/* GUI includes: */
    2828#include "UIVMLogViewer.gen.h"
    2929#include "QIWithRetranslateUI.h"
    30 #include "COMDefs.h"
     30
     31/* COM includes: */
     32#include "COMEnums.h"
     33#include "CMachine.h"
    3134
    3235/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

    r38311 r41587  
    2020# include "precomp.h"
    2121#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
     22
    2223#define LOG_GROUP LOG_GROUP_GUI
    2324
     25/* Qt includes: */
     26#include <QGLWidget>
     27#include <QFile>
     28#include <QTextStream>
     29
     30/* GUI includes: */
    2431#include "VBoxFBOverlay.h"
    25 
    2632#include "UIMessageCenter.h"
    2733#include "VBoxGlobal.h"
    2834
     35/* COM includes: */
     36#include "CDisplay.h"
     37
     38/* Other VBox includes: */
     39#include <iprt/asm.h>
     40#include <iprt/semaphore.h>
    2941#include <VBox/VBoxGL2D.h>
    30 
    31 /* Qt includes */
    32 #include <QGLWidget>
    33 
    34 #include <iprt/asm.h>
     42#include <VBox/err.h>
    3543
    3644#ifdef VBOX_WITH_VIDEOHWACCEL
    … …  
    3846#include <VBox/types.h>
    3947#include <VBox/vmm/ssm.h>
    40 #endif
    41 #include <iprt/semaphore.h>
    42 
    43 #include <VBox/err.h>
    44 
    45 #include <QFile>
    46 #include <QTextStream>
     48#endif /* VBOX_WITH_VIDEOHWACCEL */
     49
    4750#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4851

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

    r39816 r41587  
    2525//#define VBOXVHWADBG_RENDERCHECK
    2626
    27 #include "COMDefs.h"
     27/* Qt includes: */
    2828#include <QGLWidget>
     29
     30/* GUI includes: */
     31#include "VBoxFBOverlayCommon.h"
     32
     33/* COM includes: */
     34#include "COMEnums.h"
     35#include "CSession.h"
     36
     37/* Other VBox includes: */
    2938#include <iprt/assert.h>
    3039#include <iprt/critsect.h>
    3140#include <iprt/asm.h>
    3241#include <iprt/err.h>
    33 
    3442#include <VBox/VBoxGL2D.h>
    35 #include "VBoxFBOverlayCommon.h"
    3643
    3744#define VBOXVHWA_ALLOW_PRIMARY_AND_OVERLAY_ONLY 1

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp

    r37544 r41587  
    2121# include "precomp.h"
    2222#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    23 /* Qt includes */
     23
     24/* Qt includes: */
    2425#include <QString>
    2526#include <QRegExp>
    2627#include <QVariant>
    2728
     29/* GUI includes: */
    2830#include "VBoxGlobalSettings.h"
    2931#include "UIHotKeyEditor.h"
    30 #include "COMDefs.h"
     32
     33/* COM includes: */
     34#include "COMEnums.h"
     35#include "CVirtualBox.h"
     36
    3137#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    3238

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

    r41372 r41587  
    2121# include "precomp.h"
    2222#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    23 /* Global includes */
     23
     24/* Qt includes: */
    2425#include <QCloseEvent>
    2526#include <QDir>
    … …  
    3435#include <QUrl>
    3536
    36 /* Local includes */
     37/* GUI includes */
    3738#include "VBoxGlobal.h"
    3839#include "VBoxMediaManagerDlg.h"
    … …  
    4647#include "UIVirtualBoxEventHandler.h"
    4748#include "UIMediumTypeChangeDialog.h"
     49
     50/* COM includes: */
     51#include "COMEnums.h"
     52#include "CStorageController.h"
     53#include "CMediumAttachment.h"
     54
    4855#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4956

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.h

    r37893 r41587  
    2020#define __VBoxMediaManagerDlg_h__
    2121
    22 /* Local includes */
     22/* GUI includes */
    2323#include "VBoxMediaManagerDlg.gen.h"
    24 #include "COMDefs.h"
    2524#include "QIMainDialog.h"
    2625#include "QIWithRetranslateUI.h"
    … …  
    2827#include "VBoxMediaComboBox.h"
    2928
    30 /* Local forwards */
     29/* Forward declarations: */
    3130class MediaItem;
    3231class VBoxProgressBar;

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxMedium.cpp

    r38311 r41587  
    2121# include "precomp.h"
    2222#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    23 /* Global includes */
     23
     24/* Qt includes: */
    2425#include <QDir>
    2526
    26 /* Local includes */
     27/* GUI includes */
    2728#include "VBoxMedium.h"
    2829#include "VBoxGlobal.h"
    2930#include "UIMessageCenter.h"
     31
     32/* COM includes: */
     33#include "CSnapshot.h"
     34
    3035#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    3136

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxMedium.h

    r37374 r41587  
    2020#define __VBoxMedium_h__
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QPixmap>
    2424#include <QLinkedList>
    2525
    26 /* Local includes */
    27 #include "COMDefs.h"
    28 
     26/* GUI includes: */
    2927#include <iprt/cpp/utils.h>
     28
     29/* COM includes: */
     30#include "COMEnums.h"
     31#include "CMedium.h"
    3032
    3133/**

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.h

    r28800 r41587  
    2020#define __VBoxSnapshotDetailsDlg_h__
    2121
    22 /* Local includes */
     22/* GUI includes: */
    2323#include "VBoxSnapshotDetailsDlg.gen.h"
    2424#include "QIWithRetranslateUI.h"
    25 #include "COMDefs.h"
    2625
    27 /* Global forwards */
     26/* COM includes: */
     27#include "CSnapshot.h"
     28
     29/* Forward declarations: */
    2830class QScrollArea;
    2931

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp

    r38311 r41587  
    2121# include "precomp.h"
    2222#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    23 /* Global includes */
     23
     24/* Qt includes: */
    2425#include <QPushButton>
    2526
    26 /* Local includes */
     27/* GUI includes: */
    2728#include "VBoxTakeSnapshotDlg.h"
    2829#include "UIMessageCenter.h"
    … …  
    3233# include "VBoxSnapshotsWgt.h"
    3334#endif /* Q_WS_MAC */
     35
     36/* COM includes: */
     37#include "COMEnums.h"
     38#include "CMachine.h"
     39#include "CMedium.h"
     40#include "CMediumAttachment.h"
    3441
    3542#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.h

    r28934 r41587  
    2020#define __VBoxTakeSnapshotDlg_h__
    2121
    22 /* Local includes */
     22/* GUI includes: */
    2323#include "VBoxTakeSnapshotDlg.gen.h"
    2424#include "QIWithRetranslateUI.h"
    25 #include "COMDefs.h"
    2625#include "QIDialog.h"
     26
     27/* Forward declarations: */
     28class CMachine;
    2729
    2830class VBoxTakeSnapshotDlg : public QIWithRetranslateUI<QIDialog>, public Ui::VBoxTakeSnapshotDlg

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

    r41107 r41587  
    2222#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    2323
    24 /* Local Includes */
     24/* Qt includes: */
     25#include <QTimer>
     26#include <QScrollBar>
     27
     28/* GUI includes: */
    2529#include "UIIconPool.h"
    2630#include "UIMachineLogic.h"
    … …  
    3135#include "VBoxVMInformationDlg.h"
    3236
    33 /* Global Includes */
    34 #include <QTimer>
    35 #include <QScrollBar>
     37/* COM includes: */
     38#include "COMEnums.h"
     39#include "CSystemProperties.h"
     40#include "CMachineDebugger.h"
     41#include "CDisplay.h"
     42#include "CGuest.h"
     43#include "CStorageController.h"
     44#include "CMediumAttachment.h"
     45#include "CNetworkAdapter.h"
     46#include "CVRDEServerInfo.h"
    3647
    3748#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.h

    r29794 r41587  
    2020#define __VBoxVMInformationDlg_h__
    2121
     22/* Local includes: */
    2223#include "VBoxVMInformationDlg.gen.h"
    2324#include "QIMainDialog.h"
    24 #include "COMDefs.h"
    2525#include "QIWithRetranslateUI.h"
     26
     27/* COM includes: */
     28#include "COMEnums.h"
     29#include "CSession.h"
    2630
    2731class UIMachineWindow;

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp

    r37015 r41587  
    1818 */
    1919
     20/* COM includes: */
    2021#include "COMDefs.h"
     22#include "CVirtualBoxErrorInfo.h"
    2123
    2224#if !defined (VBOX_WITH_XPCOM)
    … …  
    2527#else /* !defined (VBOX_WITH_XPCOM) */
    2628
    27 /* Qt includes */
     29/* Qt includes: */
    2830#include <QObject>
    2931#include <QSocketNotifier>
    3032
     33/* Other VBox includes: */
     34#include <iprt/env.h>
     35#include <iprt/err.h>
     36#include <iprt/path.h>
     37#include <iprt/param.h>
    3138#include <nsEventQueueUtils.h>
    3239#include <nsIEventQueue.h>
    33 
    34 // for exception fetching
    3540#include <nsIExceptionService.h>
    36 
    37 #include <iprt/env.h>
    38 #include <iprt/path.h>
    39 #include <iprt/param.h>
    40 #include <iprt/err.h>
    4141
    4242/* Mac OS X (Carbon mode) and OS/2 will notify the native queue

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

    r40870 r41587  
    899899};
    900900
    901 /////////////////////////////////////////////////////////////////////////////
    902 
    903 /* Include the generated header containing wrapper definitions: */
    904 #include "COMWrappers.h"
    905 
    906 /* Declare metatypes for particular wrappers: */
    907 Q_DECLARE_METATYPE(CProgress);
    908 Q_DECLARE_METATYPE(CHost);
    909 Q_DECLARE_METATYPE(CMachine);
    910 Q_DECLARE_METATYPE(CConsole);
    911 Q_DECLARE_METATYPE(CHostNetworkInterface);
    912 Q_DECLARE_METATYPE(CMedium);
    913 Q_DECLARE_METATYPE(CMediumFormat);
    914 Q_DECLARE_METATYPE(CGuestOSType);
    915 
    916901/** @} */
    917902

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMWrappers.xsl

    r35643 r41587  
    33<!--
    44/*
    5  *  A template to generate wrapper classes for [XP]COM interfaces (defined
    6  *  in XIDL) to use them in the main Qt-based GUI in platform-independent
    7  *  script-like manner.
     5 *  A template to generate wrapper classes for [XP]COM interfaces
     6 *  (defined in XIDL) to use them in the main Qt-based GUI
     7 *  in platform-independent script-like manner.
     8 */
     9
     10/*
     11 *  Copyright (C) 2006-2012 Oracle Corporation
    812 *
    9  *  The generated header requires COMDefs.h and must be included from there.
    10  */
    11 
    12 /*
    13      Copyright (C) 2006-2008 Oracle Corporation
    14 
    15      This file is part of VirtualBox Open Source Edition (OSE), as
    16      available from http://www.virtualbox.org. This file is free software;
    17      you can redistribute it and/or modify it under the terms of the GNU
    18      General Public License (GPL) as published by the Free Software
    19      Foundation, in version 2 as it comes in the "COPYING" file of the
    20      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
    21      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
     13 *  This file is part of VirtualBox Open Source Edition (OSE), as
     14 *  available from http://www.virtualbox.org. This file is free software;
     15 *  you can redistribute it and/or modify it under the terms of the GNU
     16 *  General Public License (GPL) as published by the Free Software
     17 *  Foundation, in version 2 as it comes in the "COPYING" file of the
     18 *  VirtualBox OSE distribution. VirtualBox OSE is distributed in the
     19 *  hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    2220 */
    2321-->
    … …  
    2523<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
    2624<xsl:output method="text"/>
    27 
    2825<xsl:strip-space elements="*"/>
    2926
    3027
    3128<!--
    32 //  helper definitions
    33 /////////////////////////////////////////////////////////////////////////////
    34 -->
    35 
    36 <!--
    37  *  capitalizes the first letter
     29 *  Capitalizes the first letter:
    3830-->
    3931<xsl:template name="capitalize">
    … …  
    4840
    4941<!--
    50  *  uncapitalizes the first letter only if the second one is not capital
    51  *  otherwise leaves the string unchanged
     42 *  Uncapitalizes the first letter only if the second one is not capital
     43 *  otherwise leaves the string unchanged:
    5244-->
    5345<xsl:template name="uncapitalize">
    … …  
    6860</xsl:template>
    6961
    70 <!--
    71  *  translates the string to uppercase
     62
     63<!--
     64 *  Translates the string to uppercase:
    7265-->
    7366<xsl:template name="uppercase">
    … …  
    8073
    8174<!--
    82 //  templates
    83 /////////////////////////////////////////////////////////////////////////////
    84 -->
    85 
    86 
    87 <!--
    88  *  shut down all implicit templates
     75 *  File start bracket
     76-->
     77<xsl:template name="startFile">
     78  <xsl:param name="file" />
     79  <xsl:value-of select="concat('&#10;// ##### BEGINFILE &quot;', $file, '&quot;&#10;')" />
     80</xsl:template>
     81
     82<!--
     83 *  File end bracket
     84-->
     85<xsl:template name="endFile">
     86  <xsl:param name="file" />
     87  <xsl:value-of select="concat('&#10;// ##### ENDFILE &quot;', $file, '&quot;&#10;&#10;')" />
     88</xsl:template>
     89
     90
     91<!--
     92 *  Shut down all implicit templates
    8993-->
    9094<xsl:template match="*"/>
    … …  
    96100
    97101<!--
    98  *  header
    99 -->
    100 <xsl:template match="/idl">
    101 
    102 <xsl:text>
    103 /*
    104  *  DO NOT EDIT! This is a generated file.
    105  *
    106  *  Qt-based wrapper classes for VirtualBox Main API (COM interfaces)
    107  *  generated from XIDL (XML interface definition).
    108  *
    109  *  Source    : src/VBox/Main/idl/VirtualBox.xidl
    110  *  Generator : src/VBox/Frontends/VirtualBox/include/COMWrappers.xsl
    111  *
    112  *  Note: this header must be included from COMDefs.h, never directly.
    113  */
    114 </xsl:text>
    115 
    116 <!-- all enum declarations -->
    117 <xsl:text>
    118 // all enums
    119 
    120 </xsl:text>
    121   <xsl:for-each select="*/enum">
    122     <xsl:text>enum </xsl:text>
    123     <xsl:value-of select="concat('K',@name)"/>
    124     <xsl:text>&#x0A;{&#x0A;</xsl:text>
    125     <xsl:for-each select="const">
    126       <xsl:text>    </xsl:text>
    127       <xsl:value-of select="concat('K',../@name,'_',@name)"/>
    128       <xsl:text> = ::</xsl:text>
    129       <xsl:value-of select="concat(../@name,'_',@name)"/>
    130       <xsl:text>,&#x0A;</xsl:text>
    131     </xsl:for-each>
    132     <xsl:text>    </xsl:text>
    133     <xsl:value-of select="concat('K',@name)"/>
    134     <xsl:text>_Max&#x0A;</xsl:text>
    135     <xsl:text>};&#x0A;&#x0A;Q_DECLARE_METATYPE(</xsl:text>
    136     <xsl:value-of select="concat('K',@name)"/>
    137     <xsl:text>)&#x0A;&#x0A;</xsl:text>
    138   </xsl:for-each>
    139   <xsl:text>&#x0A;&#x0A;</xsl:text>
    140 
     102 *  Main entry point (idl):
     103-->
     104<xsl:template match="idl">
     105  <!-- Apply underlying template (library): -->
    141106  <xsl:apply-templates/>
    142 
    143 </xsl:template>
    144 
    145 
    146 <!--
    147  *  encloses |if| element's contents (unconditionally expanded by
     107</xsl:template>
     108
     109
     110<!--
     111 *  Encloses |if| element's contents (unconditionally expanded by
    148112 *  <apply-templates mode="define"/>) with #ifdef / #endif.
    149113 *
    … …  
    161125</xsl:template>
    162126
    163 
    164 <!--
    165  *  encloses |if| element's contents (unconditionally expanded by
     127<!--
     128 *  Encloses |if| element's contents (unconditionally expanded by
    166129 *  <apply-templates mode="declare"/>) with #ifdef / #endif.
    167130 *
    … …  
    179142</xsl:template>
    180143
    181 
    182144<!--
    183145 *  |<if target="...">| element): begin and end.
    … …  
    218180
    219181<!--
    220  *  libraries
     182 *  Library
    221183-->
    222184<xsl:template match="library">
    223   <!-- forward declarations -->
    224   <xsl:text>// forward declarations&#x0A;&#x0A;</xsl:text>
    225   <xsl:for-each select="interface">
     185    <!-- Declare enums: -->
     186    <xsl:call-template name="declareEnums"/>
     187
     188    <!-- Declare interfaces: -->
     189    <xsl:apply-templates select="if | interface[not(@internal='yes')]" mode="declare"/>
     190
     191    <!-- Define interfaces: -->
     192    <xsl:call-template name="defineInterfaces"/>
     193</xsl:template>
     194
     195
     196<!--
     197 *  Declare enums:
     198-->
     199<xsl:template name="declareEnums">
     200    <!-- Starting COMEnums.h file: -->
     201    <xsl:call-template name="startFile">
     202        <xsl:with-param name="file" select="'COMEnums.h'" />
     203    </xsl:call-template>
     204
     205    <!-- Write down file header: -->
     206    <xsl:text>/*&#x0A;</xsl:text>
     207    <xsl:text> * DO NOT EDIT! This is a generated file.&#x0A;</xsl:text>
     208    <xsl:text> *&#x0A;</xsl:text>
     209    <xsl:text> * Qt-based wrappers for VirtualBox Main API (COM) enums.&#x0A;</xsl:text>
     210    <xsl:text> * Generated from XIDL (XML interface definition).&#x0A;</xsl:text>
     211    <xsl:text> *&#x0A;</xsl:text>
     212    <xsl:text> * Source    : src/VBox/Main/idl/VirtualBox.xidl&#x0A;</xsl:text>
     213    <xsl:text> * Generator : src/VBox/Frontends/VirtualBox/include/COMWrappers.xsl&#x0A;</xsl:text>
     214    <xsl:text> */&#x0A;&#x0A;</xsl:text>
     215    <xsl:text>#ifndef __COMEnums_h__&#x0A;</xsl:text>
     216    <xsl:text>#define __COMEnums_h__&#x0A;&#x0A;</xsl:text>
     217    <xsl:text>/* GUI includes: */&#x0A;</xsl:text>
     218    <xsl:text>#include "COMDefs.h"&#x0A;&#x0A;</xsl:text>
     219
     220    <!-- Enumerate all enums: -->
     221    <xsl:for-each select="enum">
     222        <xsl:text>/* </xsl:text>
     223        <xsl:value-of select="concat('K',@name)"/>
     224        <xsl:text> enum: */&#x0A;</xsl:text>
     225        <xsl:text>enum </xsl:text>
     226        <xsl:value-of select="concat('K',@name)"/>
     227        <xsl:text>&#x0A;{&#x0A;</xsl:text>
     228        <xsl:for-each select="const">
     229            <xsl:text>    </xsl:text>
     230            <xsl:value-of select="concat('K',../@name,'_',@name)"/>
     231            <xsl:text> = ::</xsl:text>
     232            <xsl:value-of select="concat(../@name,'_',@name)"/>
     233            <xsl:text>,&#x0A;</xsl:text>
     234        </xsl:for-each>
     235        <xsl:text>    </xsl:text>
     236        <xsl:value-of select="concat('K',@name)"/>
     237        <xsl:text>_Max&#x0A;</xsl:text>
     238        <xsl:text>};&#x0A;&#x0A;</xsl:text>
     239    </xsl:for-each>
     240
     241    <!-- Declare enums to QMetaObject: -->
     242    <xsl:text>/* Let QMetaType know about generated enums: */&#x0A;</xsl:text>
     243    <xsl:for-each select="enum">
     244        <xsl:text>Q_DECLARE_METATYPE(</xsl:text>
     245        <xsl:value-of select="concat('K',@name)"/>
     246        <xsl:text>)&#x0A;</xsl:text>
     247    </xsl:for-each>
     248    <xsl:text>&#x0A;</xsl:text>
     249
     250    <!-- Write down file footer: -->
     251    <xsl:text>#endif /* __COMEnums_h__ */&#x0A;&#x0A;</xsl:text>
     252
     253    <!-- Finishing COMEnums.h file: -->
     254    <xsl:call-template name="endFile">
     255        <xsl:with-param name="file" select="'COMEnums.h'" />
     256    </xsl:call-template>
     257</xsl:template>
     258
     259
     260<!--
     261 *  Define interfaces:
     262-->
     263<xsl:template name="defineInterfaces">
     264    <!-- Starting COMWrappers.cpp file: -->
     265    <xsl:call-template name="startFile">
     266        <xsl:with-param name="file" select="'COMWrappers.cpp'" />
     267    </xsl:call-template>
     268
     269    <!-- Write down file header: -->
     270    <xsl:text>/*&#x0A;</xsl:text>
     271    <xsl:text> * DO NOT EDIT! This is a generated file.&#x0A;</xsl:text>
     272    <xsl:text> *&#x0A;</xsl:text>
     273    <xsl:text> * Qt-based wrappers definitions for VirtualBox Main API (COM) interfaces.&#x0A;</xsl:text>
     274    <xsl:text> * Generated from XIDL (XML interface definition).&#x0A;</xsl:text>
     275    <xsl:text> *&#x0A;</xsl:text>
     276    <xsl:text> * Source    : src/VBox/Main/idl/VirtualBox.xidl&#x0A;</xsl:text>
     277    <xsl:text> * Generator : src/VBox/Frontends/VirtualBox/include/COMWrappers.xsl&#x0A;</xsl:text>
     278    <xsl:text> */&#x0A;&#x0A;</xsl:text>
     279    <xsl:text>/* COM includes: */&#x0A;</xsl:text>
     280    <xsl:text>#include "COMEnums.h"&#x0A;</xsl:text>
     281
     282    <!-- Enumerate all interface definitions: -->
     283    <xsl:for-each select="interface[not(@internal='yes')]">
     284        <xsl:text>#include "C</xsl:text>
     285        <xsl:value-of select="substring(@name,2)"/>
     286        <xsl:text>.h"&#x0A;</xsl:text>
     287    </xsl:for-each>
     288    <xsl:text>&#x0A;</xsl:text>
     289    <xsl:apply-templates select="if | interface[not(@internal='yes')]" mode="define"/>
     290
     291    <!-- Finishing COMEnums.h file: -->
     292    <xsl:call-template name="endFile">
     293        <xsl:with-param name="file" select="'COMWrappers.cpp'" />
     294    </xsl:call-template>
     295</xsl:template>
     296
     297
     298<!--
     299 *  Declare interface:
     300-->
     301<xsl:template match="interface" mode="declare">
     302    <!-- Starting file: -->
     303    <xsl:call-template name="startFile">
     304        <xsl:with-param name="file" select="concat('C', substring(@name,2), '.h')" />
     305    </xsl:call-template>
     306
     307    <!-- Write down file header: -->
     308    <xsl:text>/*&#x0A;</xsl:text>
     309    <xsl:text> * DO NOT EDIT! This is a generated file.&#x0A;</xsl:text>
     310    <xsl:text> *&#x0A;</xsl:text>
     311    <xsl:text> * Qt-based wrapper declaration for VirtualBox Main API (COM) interface.&#x0A;</xsl:text>
     312    <xsl:text> * Generated from XIDL (XML interface definition).&#x0A;</xsl:text>
     313    <xsl:text> *&#x0A;</xsl:text>
     314    <xsl:text> * Source    : src/VBox/Main/idl/VirtualBox.xidl&#x0A;</xsl:text>
     315    <xsl:text> * Generator : src/VBox/Frontends/VirtualBox/include/COMWrappers.xsl&#x0A;</xsl:text>
     316    <xsl:text> */&#x0A;&#x0A;</xsl:text>
     317    <xsl:text>#ifndef __C</xsl:text>
     318    <xsl:value-of select="substring(@name,2)"/>
     319    <xsl:text>_h__&#x0A;</xsl:text>
     320    <xsl:text>#define __C</xsl:text>
     321    <xsl:value-of select="substring(@name,2)"/>
     322    <xsl:text>_h__&#x0A;&#x0A;</xsl:text>
     323    <xsl:text>/* GUI includes: */&#x0A;</xsl:text>
     324    <xsl:text>#include "COMDefs.h"&#x0A;&#x0A;</xsl:text>
     325
     326    <!-- Forward declarations: -->
     327    <xsl:text>/* Forward declarations: */&#x0A;</xsl:text>
     328    <xsl:for-each select="//interface[not(@internal='yes')]">
     329        <xsl:text>class C</xsl:text>
     330        <xsl:value-of select="substring(@name,2)"/>
     331        <xsl:text>;&#x0A;</xsl:text>
     332    </xsl:for-each>
     333    <xsl:text>&#x0A;</xsl:text>
     334
     335    <!-- Interface declaration: -->
     336    <xsl:text>/* Interface declaration: */&#x0A;</xsl:text>
    226337    <xsl:text>class C</xsl:text>
    227338    <xsl:value-of select="substring(@name,2)"/>
    228     <xsl:text>;&#x0A;</xsl:text>
    229   </xsl:for-each>
    230   <xsl:text>&#x0A;</xsl:text>
    231   <!-- array typedefs -->
    232   <xsl:text>// array typedefs&#x0A;&#x0A;</xsl:text>
    233   <xsl:for-each select="interface[not(@internal='yes')]">
     339    <xsl:text> : public CInterface&lt;</xsl:text>
     340    <xsl:value-of select="@name"/>
     341
     342    <!-- Use the correct base if supportsErrorInfo: -->
     343    <xsl:call-template name="tryComposeFetchErrorInfo">
     344        <xsl:with-param name="mode" select="'getBaseClassName'"/>
     345    </xsl:call-template>
     346    <xsl:text>&gt;&#x0A;{&#x0A;public:&#x0A;&#x0A;</xsl:text>
     347
     348    <!-- Generate the Base typedef: -->
     349    <xsl:text>    typedef CInterface&lt;</xsl:text>
     350    <xsl:value-of select="@name"/>
     351
     352    <!-- Use the correct base if supportsErrorInfo: -->
     353    <xsl:call-template name="tryComposeFetchErrorInfo">
     354        <xsl:with-param name="mode" select="'getBaseClassName'"/>
     355    </xsl:call-template>
     356    <xsl:text>&gt; Base;&#x0A;&#x0A;</xsl:text>
     357
     358    <!-- Generate member declarations: -->
     359    <xsl:if test="name()='interface'">
     360        <xsl:call-template name="declareMembers"/>
     361    </xsl:if>
     362
     363    <!-- Interface declaration: -->
     364    <xsl:text>};&#x0A;&#x0A;</xsl:text>
     365
     366    <!-- Declare metatype: -->
     367    <xsl:text>/* Let QMetaType know about generated interface: */&#x0A;</xsl:text>
     368    <xsl:text>Q_DECLARE_METATYPE(</xsl:text>
     369    <xsl:value-of select="concat('C',substring(@name,2))"/>
     370    <xsl:text>)&#x0A;&#x0A;</xsl:text>
     371
     372    <!-- Declare safe-array -->
    234373    <xsl:if test="
    235       (//attribute[@safearray='yes' and not(@internal='yes') and @type=current()/@name])
    236       or
    237       (//param[@safearray='yes' and not(../@internal='yes') and @type=current()/@name])
    238     ">
    239       <xsl:text>typedef QVector&lt;C</xsl:text>
    240       <xsl:value-of select="substring(@name,2)"/>
    241       <xsl:text>&gt; C</xsl:text>
    242       <xsl:value-of select="substring(@name,2)"/>
    243       <xsl:text>Vector;&#x0A;</xsl:text>
     374        (name()='interface')
     375        and
     376        ((//attribute[@safearray='yes' and not(@internal='yes') and @type=current()/@name])
     377         or
     378         (//param[@safearray='yes' and not(../@internal='yes') and @type=current()/@name]))
     379        ">
     380            <xsl:text>/* Declare safe-array: */&#x0A;</xsl:text>
     381            <xsl:text>typedef QVector&lt;C</xsl:text>
     382            <xsl:value-of select="substring(@name,2)"/>
     383            <xsl:text>&gt; C</xsl:text>
     384            <xsl:value-of select="substring(@name,2)"/>
     385            <xsl:text>Vector;&#x0A;&#x0A;</xsl:text>
    244386    </xsl:if>
    245   </xsl:for-each>
    246   <xsl:text>&#x0A;</xsl:text>
    247   <!-- wrapper declarations -->
    248   <xsl:text>// wrapper declarations&#x0A;&#x0A;</xsl:text>
    249   <xsl:apply-templates select="
    250       if |
    251       interface[not(@internal='yes')]
    252     "
    253     mode="declare"
    254   />
    255   <!-- wrapper definitions -->
    256   <xsl:text>// wrapper definitions&#x0A;&#x0A;</xsl:text>
    257   <xsl:apply-templates select="
    258       if |
    259       interface[not(@internal='yes')]
    260     "
    261     mode="define"
    262   />
    263 </xsl:template>
    264 
    265 
    266 <!--
    267  *  interface declarations
    268 -->
    269 <xsl:template match="interface" mode="declare">
    270 
    271   <xsl:text>// </xsl:text>
    272   <xsl:value-of select="@name"/>
    273   <xsl:text> wrapper&#x0A;&#x0A;class C</xsl:text>
    274   <xsl:value-of select="substring(@name,2)"/>
    275   <xsl:text> : public CInterface&lt;</xsl:text>
    276   <xsl:value-of select="@name"/>
    277   <!-- use the correct base if supportsErrorInfo -->
    278   <xsl:call-template name="tryComposeFetchErrorInfo">
    279     <xsl:with-param name="mode" select="'getBaseClassName'"/>
    280   </xsl:call-template>
    281   <xsl:text>&gt;&#x0A;{&#x0A;public:&#x0A;&#x0A;</xsl:text>
    282 
    283   <!-- generate the Base typedef-->
    284   <xsl:text>    typedef CInterface&lt;</xsl:text>
    285   <xsl:value-of select="@name"/>
    286   <!-- Use the correct base if supportsErrorInfo -->
    287   <xsl:call-template name="tryComposeFetchErrorInfo">
    288     <xsl:with-param name="mode" select="'getBaseClassName'"/>
    289   </xsl:call-template>
    290   <xsl:text>&gt; Base;&#x0A;&#x0A;</xsl:text>
    291 
    292   <xsl:if test="name()='interface'">
    293     <xsl:call-template name="declareMembers"/>
    294   </xsl:if>
    295 
    296   <xsl:text>};&#x0A;&#x0A;</xsl:text>
    297 
     387
     388    <!-- Write down file footer: -->
     389    <xsl:text>#endif /* __C</xsl:text>
     390    <xsl:value-of select="substring(@name,2)"/>
     391    <xsl:text>_h__ */&#x0A;&#x0A;</xsl:text>
     392
     393    <!-- Finishing file: -->
     394    <xsl:call-template name="endFile">
     395        <xsl:with-param name="file" select="concat('C', substring(@name,2), '.h')" />
     396    </xsl:call-template>
    298397</xsl:template>
    299398
    … …  
    386485<xsl:text>    void SetExtraDataBool(const QString &amp;strKey, bool fValue);
    387486    bool GetExtraDataBool(const QString &amp;strKey, bool fDef = true);
    388 
    389487    void SetExtraDataInt(const QString &amp;strKey, int value);
    390488    int GetExtraDataInt(const QString &amp;strKey, int def = 0);
    391 
    392489    void SetExtraDataRect(const QString &amp;strKey, const QRect &amp;value);
    393490    QRect GetExtraDataRect(const QString &amp;strKey, const QRect &amp;def = QRect());
    394 
    395491    void SetExtraDataStringList(const QString &amp;strKey, const QStringList &amp;value);
    396492    QStringList GetExtraDataStringList(const QString &amp;strKey, QStringList def = QStringList());
    397 
    398493    void SetExtraDataIntList(const QString &amp;strKey, const QList&lt;int&gt; &amp;value);
    399494    QList&lt;int&gt; GetExtraDataIntList(const QString &amp;strKey, QList&lt;int&gt; def = QList&lt;int&gt;());
    … …  
    405500<xsl:template name="declareMembers">
    406501
    407   <xsl:text>    // constructors and assignments taking CUnknown and </xsl:text>
    408   <xsl:text>raw iface pointer&#x0A;&#x0A;</xsl:text>
     502  <xsl:text>    /* Constructors and assignments taking CUnknown and raw iface pointer: */&#x0A;&#x0A;</xsl:text>
    409503  <!-- default constructor -->
    410504  <xsl:text>    C</xsl:text>
    … …  
    491585  <xsl:text>&#x0A;</xsl:text>
    492586
    493   <xsl:text>    // attributes (properties)&#x0A;&#x0A;</xsl:text>
     587  <xsl:text>    /* Attributes (properties): */&#x0A;</xsl:text>
    494588  <xsl:call-template name="declareAttributes">
    495589    <xsl:with-param name="iface" select="."/>
    496590  </xsl:call-template>
    497591
    498   <xsl:text>    // methods&#x0A;&#x0A;</xsl:text>
     592  <xsl:text>    /* Methods: */&#x0A;</xsl:text>
    499593  <xsl:call-template name="declareMethods">
    500594    <xsl:with-param name="iface" select="."/>
    … …  
    502596
    503597  <xsl:if test="@name='IVirtualBox' or @name='IMachine'">
    504     <xsl:text>    // ExtraData helpers&#x0A;&#x0A;</xsl:text>
     598    <xsl:text>    /* ExtraData helpers: */&#x0A;</xsl:text>
    505599    <xsl:call-template name="declareExtraDataHelpers">
    506600      <xsl:with-param name="iface" select="."/>
    … …  
    508602  </xsl:if>
    509603
    510   <xsl:text>    // friend wrappers&#x0A;&#x0A;</xsl:text>
     604  <xsl:text>    /* Friend wrappers: */&#x0A;</xsl:text>
    511605  <xsl:text>    friend class CUnknown;&#x0A;</xsl:text>
    512606  <xsl:variable name="name" select="@name"/>
    … …  
    844938  </xsl:call-template>
    845939  <xsl:if test="@name='IVirtualBox' or @name='IMachine'">
    846     <xsl:text>// ExtraData helpers&#x0A;&#x0A;</xsl:text>
     940    <xsl:text>/* ExtraData helpers: */&#x0A;</xsl:text>
    847941    <xsl:call-template name="defineExtraDataHelpers">
    848942      <xsl:with-param name="iface" select="."/>
    … …  
    9331027      <xsl:choose>
    9341028        <xsl:when test="$define">
    935           <xsl:text>inline </xsl:text>
     1029          <xsl:text></xsl:text>
    9361030        </xsl:when>
    9371031        <xsl:otherwise>
    … …  
    9661060      <xsl:choose>
    9671061        <xsl:when test="$define">
    968           <xsl:text>inline </xsl:text>
     1062          <xsl:text></xsl:text>
    9691063        </xsl:when>
    9701064        <xsl:otherwise>

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp

    r39349 r41587  
    1818 */
    1919
    20 /* Local includes */
     20/* Qt includes: */
     21#include <QMutex>
     22
     23/* GUI includes: */
    2124#include "UIExtraDataEventHandler.h"
    2225#include "UIMainEventListener.h"
    … …  
    2427#include "VBoxGlobalSettings.h"
    2528
    26 /* Global includes */
    27 //#include <iprt/thread.h>
    28 //#include <iprt/stream.h>
    29 #include <QMutex>
     29/* COM includes: */
     30#include "COMEnums.h"
     31#include "CEventSource.h"
    3032
    3133class UIExtraDataEventHandlerPrivate: public QObject

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.h

    r39349 r41587  
    2020#define __UIExtraDataEventHandler_h__
    2121
    22 /* Local includes */
    23 #include "COMDefs.h"
     22/* COM includes: */
     23#include "CEventListener.h"
    2424
    25 /* Local forward declarations */
     25/* Forward declarations: */
    2626class UIExtraDataEventHandlerPrivate;
    2727

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

    r41051 r41587  
    1818 */
    1919
    20 /* Local includes */
     20/* GUI includes: */
    2121#include "UIMainEventListener.h"
    2222
    23 /* Global includes */
    24 //#include <iprt/thread.h>
    25 //#include <iprt/stream.h>
     23/* COM includes: */
     24#include "COMEnums.h"
     25#include "CVirtualBoxErrorInfo.h"
     26#include "CUSBDevice.h"
     27#include "CEvent.h"
     28#include "CMachineStateChangedEvent.h"
     29#include "CMachineDataChangedEvent.h"
     30#include "CExtraDataCanChangeEvent.h"
     31#include "CExtraDataChangedEvent.h"
     32#include "CMachineRegisteredEvent.h"
     33#include "CSessionStateChangedEvent.h"
     34#include "CSnapshotChangedEvent.h"
     35#include "CMousePointerShapeChangedEvent.h"
     36#include "CMouseCapabilityChangedEvent.h"
     37#include "CKeyboardLedsChangedEvent.h"
     38#include "CStateChangedEvent.h"
     39#include "CNetworkAdapterChangedEvent.h"
     40#include "CMediumChangedEvent.h"
     41#include "CUSBDeviceStateChangedEvent.h"
     42#include "CRuntimeErrorEvent.h"
     43#include "CCanShowWindowEvent.h"
     44#include "CShowWindowEvent.h"
     45#include "CGuestMonitorChangedEvent.h"
    2646
    2747UIMainEventListener::UIMainEventListener()

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

    r41051 r41587  
    2020#define __UIMainEventListener_h__
    2121
    22 /* Local includes */
    23 #include "COMDefs.h"
     22/* COM includes: */
     23#include "COMEnums.h"
     24#include "CVirtualBoxErrorInfo.h"
     25#include "CMediumAttachment.h"
     26#include "CNetworkAdapter.h"
     27#include "CUSBDevice.h"
    2428
    25 /* VBox includes */
     29/* Other VBox includes: */
    2630#include <VBox/com/listeners.h>
    2731

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QDir>
    2222#include <QDesktopWidget>
    … …  
    2626#ifdef Q_WS_MAC
    2727# include <QPushButton>
    28 #endif
    29 
    30 #include <iprt/err.h>
    31 #include <iprt/param.h>
    32 #include <iprt/path.h>
    33 
    34 /* Local includes */
     28#endif /* Q_WS_MAC */
     29
     30/* GUI includes: */
    3531#include "UIMessageCenter.h"
    3632#include "VBoxGlobal.h"
    … …  
    4743#ifdef Q_WS_MAC
    4844# include "VBoxUtils-darwin.h"
    49 #endif
    50 
    51 #if defined (Q_WS_WIN32)
     45#endif /* Q_WS_MAC */
     46#ifdef Q_WS_WIN
    5247# include <Htmlhelp.h>
    53 #endif
     48#endif /* Q_WS_WIN */
     49
     50/* COM includes: */
     51#include "CSystemProperties.h"
     52#include "CVirtualBoxErrorInfo.h"
     53#include "CMediumAttachment.h"
     54#include "CMediumFormat.h"
     55#include "CAppliance.h"
     56#include "CExtPackManager.h"
     57#include "CExtPackFile.h"
     58#include "CHostNetworkInterface.h"
     59
     60/* Other VBox includes: */
     61#include <iprt/err.h>
     62#include <iprt/param.h>
     63#include <iprt/path.h>
    5464
    5565bool UIMessageCenter::isAnyWarningShown()

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

    r41153 r41587  
    2020#define __UIMessageCenter_h__
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QObject>
    2424#include <QPointer>
    2525
    26 /* Local includes */
    27 #include "COMDefs.h"
     26/* GUI includes: */
     27#include "CProgress.h"
    2828#include "QIMessageBox.h"
    2929
    30 /* Forward declarations */
     30/* COM includes: */
     31#include "COMEnums.h"
     32
     33/* Forward declarations: */
    3134class VBoxMedium;
    3235struct StorageSlot;

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r41480 r41587  
    1616 */
    1717
    18 #include "VBoxGlobal.h"
    19 #include <VBox/vd.h>
    20 #include <VBox/version.h>
    21 
    22 #include "VBoxUtils.h"
    23 #include "VBoxDefs.h"
    24 #include "UISelectorWindow.h"
    25 #include "UIMessageCenter.h"
    26 #include "QIMessageBox.h"
    27 #include "QIDialogButtonBox.h"
    28 #include "UIIconPool.h"
    29 #include "UIActionPoolSelector.h"
    30 #include "UIActionPoolRuntime.h"
    31 #include "UIExtraDataEventHandler.h"
    32 #include "QIFileDialog.h"
    33 #include "UINetworkManager.h"
    34 #include "UIUpdateManager.h"
    35 
    36 #include "UIMachine.h"
    37 #include "UISession.h"
    38 #ifdef VBOX_WITH_REGISTRATION
    39 # include "UIRegistrationWzd.h"
    40 #endif
    41 #ifdef VBOX_WITH_VIDEOHWACCEL
    42 # include "VBoxFBOverlay.h"
    43 #endif /* VBOX_WITH_VIDEOHWACCEL */
    44 
    45 #ifdef Q_WS_MAC
    46 # include "UIMachineWindowFullscreen.h"
    47 # include "UIMachineWindowSeamless.h"
    48 #endif /* Q_WS_MAC */
    49 
    50 /* Qt includes */
     18/* Qt includes: */
    5119#include <QProgressDialog>
    5220#include <QLibraryInfo>
    … …  
    6836#include <QNetworkProxy>
    6937
     38#ifdef Q_WS_WIN
     39# include <QEventLoop>
     40#endif /* Q_WS_WIN */
     41
     42#ifdef Q_WS_X11
     43# include <QTextBrowser>
     44# include <QScrollBar>
     45# include <QX11Info>
     46#endif /* Q_WS_X11 */
     47
    7048#ifdef VBOX_GUI_WITH_PIDFILE
    7149# include <QTextStream>
    7250#endif /* VBOX_GUI_WITH_PIDFILE */
    7351
    74 #include <math.h>
     52/* GUI includes: */
     53#include "VBoxGlobal.h"
     54#include "VBoxUtils.h"
     55#include "VBoxDefs.h"
     56#include "UISelectorWindow.h"
     57#include "UIMessageCenter.h"
     58#include "QIMessageBox.h"
     59#include "QIDialogButtonBox.h"
     60#include "UIIconPool.h"
     61#include "UIActionPoolSelector.h"
     62#include "UIActionPoolRuntime.h"
     63#include "UIExtraDataEventHandler.h"
     64#include "QIFileDialog.h"
     65#include "UINetworkManager.h"
     66#include "UIUpdateManager.h"
     67#include "UIMachine.h"
     68#include "UISession.h"
    7569
    7670#ifdef Q_WS_X11
    … …  
    7973#  include "VBoxLicenseViewer.h"
    8074# endif /* VBOX_OSE */
    81 # include <QTextBrowser>
    82 # include <QScrollBar>
    83 # include <QX11Info>
    8475# include "VBoxX11Helper.h"
    85 #endif
     76#endif /* Q_WS_X11 */
    8677
    8778#ifdef Q_WS_MAC
    8879# include "VBoxUtils-darwin.h"
     80# include "UIMachineWindowFullscreen.h"
     81# include "UIMachineWindowSeamless.h"
    8982#endif /* Q_WS_MAC */
    9083
    91 #if defined (Q_WS_WIN)
     84#ifdef VBOX_WITH_VIDEOHWACCEL
     85# include "VBoxFBOverlay.h"
     86#endif /* VBOX_WITH_VIDEOHWACCEL */
     87
     88#ifdef VBOX_WITH_REGISTRATION
     89# include "UIRegistrationWzd.h"
     90#endif /* VBOX_WITH_REGISTRATION */
     91
     92#ifdef VBOX_GUI_WITH_SYSTRAY
     93#include <iprt/process.h>
     94#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
     95#define HOSTSUFF_EXE ".exe"
     96#else /* !RT_OS_WINDOWS */
     97#define HOSTSUFF_EXE ""
     98#endif /* !RT_OS_WINDOWS */
     99#endif /* VBOX_GUI_WITH_SYSTRAY */
     100
     101/* COM includes: */
     102#include "CSystemProperties.h"
     103#include "CUSBDevice.h"
     104#include "CUSBDeviceFilter.h"
     105#include "CBIOSSettings.h"
     106#include "CVRDEServer.h"
     107#include "CStorageController.h"
     108#include "CMediumAttachment.h"
     109#include "CAudioAdapter.h"
     110#include "CNetworkAdapter.h"
     111#include "CSerialPort.h"
     112#include "CParallelPort.h"
     113#include "CUSBController.h"
     114#include "CHostUSBDevice.h"
     115#include "CMediumFormat.h"
     116#include "CSharedFolder.h"
     117
     118/* Other VBox includes: */
     119#include <iprt/asm.h>
     120#include <iprt/err.h>
     121#include <iprt/param.h>
     122#include <iprt/path.h>
     123#include <iprt/env.h>
     124#include <iprt/file.h>
     125#include <iprt/ldr.h>
     126#include <iprt/system.h>
     127
     128#include <VBox/vd.h>
     129#include <VBox/version.h>
     130#include <VBox/sup.h>
     131#include <VBox/com/Guid.h>
     132#include <VBox/VBoxOGLTest.h>
     133
     134#ifdef Q_WS_X11
     135#include <iprt/mem.h>
     136#endif /* Q_WS_X11 */
     137
     138/* External includes: */
     139#include <math.h>
     140
     141#ifdef Q_WS_WIN
    92142#include "shlobj.h"
    93 #include <QEventLoop>
    94 #endif
    95 
    96 #if defined (Q_WS_X11)
     143#endif /* Q_WS_WIN */
     144
     145#ifdef Q_WS_X11
    97146#undef BOOL /* typedef CARD8 BOOL in Xmd.h conflicts with #define BOOL PRBool
    98147             * in COMDefs.h. A better fix would be to isolate X11-specific
    … …  
    104153#include <X11/extensions/Xinerama.h>
    105154#define BOOL PRBool
    106 #endif
    107 
    108 #include <VBox/sup.h>
    109 #include <VBox/com/Guid.h>
    110 
    111 #include <iprt/asm.h>
    112 #include <iprt/err.h>
    113 #include <iprt/param.h>
    114 #include <iprt/path.h>
    115 #include <iprt/env.h>
    116 #include <iprt/file.h>
    117 #include <iprt/ldr.h>
    118 #include <iprt/system.h>
    119 
    120 #ifdef VBOX_GUI_WITH_SYSTRAY
    121 #include <iprt/process.h>
    122 
    123 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
    124 #define HOSTSUFF_EXE ".exe"
    125 #else /* !RT_OS_WINDOWS */
    126 #define HOSTSUFF_EXE ""
    127 #endif /* !RT_OS_WINDOWS */
    128 #endif
    129 
    130 #if defined (Q_WS_X11)
    131 #include <iprt/mem.h>
    132 #endif
    133 
    134 #include <VBox/VBoxOGLTest.h>
     155#endif /* Q_WS_X11 */
    135156
    136157//#define VBOX_WITH_FULL_DETAILS_REPORT /* hidden for now */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

    r41331 r41587  
    2020#define __VBoxGlobal_h__
    2121
    22 #include "COMDefs.h"
    23 #include "VBox/com/Guid.h"
    24 
    25 #include "VBoxGlobalSettings.h"
    26 #include "VBoxMedium.h"
    27 
    28 /* Qt includes */
     22/* Qt includes: */
    2923#include <QApplication>
    3024#include <QLayout>
    … …  
    3529#include <QFileIconProvider>
    3630
     31/* GUI includes: */
     32#include "VBoxGlobalSettings.h"
     33#include "VBoxMedium.h"
     34
     35/* COM includes: */
     36#include "VBox/com/Guid.h"
     37#include "COMEnums.h"
     38#include "CHost.h"
     39#include "CVirtualBox.h"
     40#include "CSession.h"
     41#include "CConsole.h"
     42#include "CMachine.h"
     43#include "CMedium.h"
     44#include "CGuestOSType.h"
     45#include "CUSBDevice.h"
     46
     47/* Other VBox includes: */
    3748#ifdef Q_WS_X11
    3849# include <sys/wait.h>
    39 #endif
    40 
     50#endif /* Q_WS_X11 */
     51
     52/* Forward declarations: */
    4153class QAction;
    4254class QLabel;

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

    r41153 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QNetworkReply>
    2222#include <QTimer>
    … …  
    2525#include <VBox/version.h>
    2626
    27 /* Local includes: */
     27/* GUI includes: */
    2828#include "UIUpdateDefs.h"
    2929#include "UIUpdateManager.h"
    … …  
    3737#include "VBoxDefs.h"
    3838
     39/* COM includes: */
     40#include "CExtPack.h"
     41#include "CExtPackManager.h"
     42
    3943/* Forward declarations: */
    4044class UIUpdateStep;

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp

    r41051 r41587  
    1818 */
    1919
    20 /* Local includes */
     20/* GUI includes: */
    2121#include "UIConsoleEventHandler.h"
    2222#include "UIMainEventListener.h"
    2323#include "VBoxGlobal.h"
    2424#include "UISession.h"
    25 
    2625#ifdef Q_WS_MAC
    2726# include "VBoxUtils.h"
    2827#endif /* Q_WS_MAC */
    2928
    30 /* Global includes */
    31 //#include <iprt/thread.h>
    32 //#include <iprt/stream.h>
     29/* COM includes: */
     30#include "CEventSource.h"
    3331
    3432/* static */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h

    r41051 r41587  
    2020#define __UIConsoleEventHandler_h__
    2121
    22 /* Local includes */
    23 #include "COMDefs.h"
     22/* COM includes: */
     23#include "COMEnums.h"
     24#include "CVirtualBoxErrorInfo.h"
     25#include "CEventListener.h"
     26#include "CMediumAttachment.h"
     27#include "CNetworkAdapter.h"
     28#include "CUSBDevice.h"
    2429
    25 /* Local forward declarations */
     30/* Forward declarations: */
    2631class UISession;
    2732

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

    r41216 r41587  
    2020#define ___UIFrameBuffer_h___
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QRegion>
    2424#include <QPaintEvent>
    2525
    26 /* Local includes */
    27 #include "COMDefs.h"
     26/* GUI includes: */
     27#include "VBoxDefs.h"
     28#include "CFramebuffer.h"
     29
     30/* Other VBox includes: */
    2831#include <iprt/critsect.h>
    2932
     33/* Forward declarations: */
    3034class UIMachineView;
    3135

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

    r38318 r41587  
    1818 */
    1919
    20 /* Global includes */
    21 #include <iprt/time.h>
     20/* Qt includes: */
    2221#include <QTimer>
    2322
    24 /* Local includes */
     23/* GUI includes: */
    2524#include "UIIndicatorsPool.h"
    2625#include "VBoxGlobal.h"
    27 #include "COMDefs.h"
    2826#include "UIMachineDefs.h"
    2927#include "QIWithRetranslateUI.h"
     28
     29/* COM includes: */
     30#include "CSystemProperties.h"
     31#include "CMachineDebugger.h"
     32#include "CGuest.h"
     33#include "CStorageController.h"
     34#include "CMediumAttachment.h"
     35#include "CNetworkAdapter.h"
     36#include "CUSBController.h"
     37#include "CUSBDevice.h"
     38#include "CSharedFolder.h"
     39#include "CVRDEServer.h"
     40
     41/* Other VBox includes: */
     42#include <iprt/time.h>
    3043
    3144class UIIndicatorHardDisks : public QIWithRetranslateUI<QIStateIndicator>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h

    r38815 r41587  
    2020#define ___UIKeyboardHandler_h___
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QObject>
    2424#include <QMap>
    2525
    26 /* Local includes */
     26/* GUI includes: */
    2727#include "UIMachineDefs.h"
    28 #include "COMDefs.h"
    29 
    3028#ifdef Q_WS_MAC
    3129# include <CoreFoundation/CFBase.h>
    … …  
    3331#endif /* Q_WS_MAC */
    3432
    35 /* Global forwards */
     33/* COM includes: */
     34#include "CKeyboard.h"
     35
     36/* Forward declarations: */
    3637class QWidget;
    37 
    38 /* Local forwards */
    3938class CSession;
    4039class UISession;
    … …  
    174173    bool m_fPassCAD : 1;
    175174    /** Whether the debugger is active.
    176      * Currently only affects auto capturing. */ 
     175     * Currently only affects auto capturing. */
    177176    bool m_fDebuggerActive : 1;
    178177

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

    r38348 r41587  
    2020#define __UIMachine_h__
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QObject>
    2424
    25 /* Local includes */
    26 #include "COMDefs.h"
     25/* GUI includes:  */
    2726#include "UIMachineDefs.h"
    2827
    29 /* Global forwards: */
     28/* COM includes: */
     29#include "COMEnums.h"
     30#include "CSession.h"
     31
     32/* Forward declarations: */
    3033class QWidget;
    31 
    32 /* Local forwards */
    3334class UISession;
    3435class UIVisualState;

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r41519 r41587  
    1818 */
    1919
    20 /* Local includes */
    21 #include "COMDefs.h"
     20/* Qt includes: */
     21#include <QDesktopWidget>
     22#include <QDir>
     23#include <QFileInfo>
     24#include <QImageWriter>
     25#include <QPainter>
     26#include <QTimer>
     27
     28/* GUI includes: */
    2229#include "QIFileDialog.h"
    2330#include "UIActionPoolRuntime.h"
    … …  
    4653#endif /* Q_WS_MAC */
    4754
    48 /* Global includes */
     55/* COM includes: */
     56#include "CVirtualBoxErrorInfo.h"
     57#include "CMachineDebugger.h"
     58#include "CSnapshot.h"
     59#include "CDisplay.h"
     60#include "CStorageController.h"
     61#include "CMediumAttachment.h"
     62#include "CHostUSBDevice.h"
     63#include "CUSBDevice.h"
     64#include "CVRDEServer.h"
     65
     66/* Other VBox includes: */
    4967#include <iprt/path.h>
    50 
    5168#ifdef VBOX_WITH_DEBUGGER_GUI
    5269# include <iprt/ldr.h>
    5370#endif /* VBOX_WITH_DEBUGGER_GUI */
    5471
     72/* External includes: */
    5573#ifdef Q_WS_X11
    5674# include <XKeyboard.h>
    5775# include <QX11Info>
    5876#endif /* Q_WS_X11 */
    59 
    60 #include <QDesktopWidget>
    61 #include <QDir>
    62 #include <QFileInfo>
    63 #include <QImageWriter>
    64 #include <QPainter>
    65 #include <QTimer>
    6677
    6778struct MediumTarget

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

    r41108 r41587  
    2020#define __UIMachineLogic_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIMachineDefs.h"
    2424#include <QIWithRetranslateUI.h>
    … …  
    3030class QAction;
    3131class QActionGroup;
    32 class CSession;
    33 class CMachine;
    34 class CSnapshot;
    35 class CUSBDevice;
    36 class CVirtualBoxErrorInfo;
    3732class UISession;
    3833class UIKeyboardHandler;
    … …  
    4136class UIMachineView;
    4237class UIDockIconPreview;
     38class CSession;
     39class CMachine;
     40class CSnapshot;
     41class CUSBDevice;
     42class CVirtualBoxErrorInfo;
    4343
    4444/* Machine logic interface: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

    r41527 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222#include <QMainWindow>
    … …  
    2727#include <VBox/VBoxVideo.h>
    2828#include <iprt/asm.h>
    29 
    30 /* Local includes */
     29#ifdef Q_WS_X11
     30# include <QX11Info>
     31#endif /* Q_WS_X11 */
     32
     33/* GUI includes: */
    3134#include "VBoxGlobal.h"
    3235#include "UIMessageCenter.h"
    … …  
    4952#ifdef VBOX_WITH_DRAG_AND_DROP
    5053# include "UIDnDHandler.h"
    51 #endif
    52 
     54#endif /* VBOX_WITH_DRAG_AND_DROP */
     55
     56/* COM includes: */
     57#include "CSession.h"
     58#include "CDisplay.h"
     59#include "CFramebuffer.h"
     60
     61/* Other VBox includes: */
    5362#ifdef Q_WS_X11
    54 # include <QX11Info>
    5563# include <X11/XKBlib.h>
    5664# ifdef KeyPress

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

    r41404 r41587  
    2020#define ___UIMachineView_h___
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QAbstractScrollArea>
    2424#include <QEventLoop>
    2525
    26 /* Local includes */
    27 #include "COMDefs.h"
     26/* GUI includes: */
    2827#include "UIMachineDefs.h"
    29 
    3028#ifdef Q_WS_MAC
    3129# include <CoreFoundation/CFBase.h>
    3230#endif /* Q_WS_MAC */
    3331
    34 /* Local forwards */
     32/* COM includes: */
     33#include "COMEnums.h"
     34
     35/* Forward declarations: */
    3536class UISession;
    3637class UIMachineLogic;
    3738class UIMachineWindow;
    3839class UIFrameBuffer;
     40class CSession;
    3941
    4042class UIMachineView : public QAbstractScrollArea

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

    r41487 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QCloseEvent>
    2222#include <QTimer>
    2323#include <VBox/version.h>
    24 #ifdef VBOX_BLEEDING_EDGE
    25 # include <iprt/buildconfig.h>
    26 #endif /* VBOX_BLEEDING_EDGE */
    27 
    28 /* Local includes: */
    29 #include "COMDefs.h"
     24
     25/* GUI includes: */
    3026#include "VBoxGlobal.h"
    3127#include "UIMessageCenter.h"
    … …  
    4440# include <X11/Xlib.h>
    4541#endif /* Q_WS_X11 */
     42
     43/* COM includes: */
     44#include "CSnapshot.h"
     45
     46/* Other VBox includes: */
     47#ifdef VBOX_BLEEDING_EDGE
     48# include <iprt/buildconfig.h>
     49#endif /* VBOX_BLEEDING_EDGE */
    4650
    4751/* static */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

    r41487 r41587  
    2020#define __UIMachineWindow_h__
    2121
    22 /* Global includes: */
     22/* Qt includes: */
    2323#include <QMainWindow>
    2424
    25 /* Local includes: */
     25/* GUI includes: */
    2626#include "QIWithRetranslateUI.h"
    2727#include "UIMachineDefs.h"
    28 #include "COMDefs.h"
     28
     29/* COM includes: */
     30#include "COMEnums.h"
     31#include "CMachine.h"
    2932
    3033/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

    r41107 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222#include <QMouseEvent>
    2323
    24 /* Local includes */
     24/* GUI includes: */
    2525#include "VBoxGlobal.h"
    2626#include "UIMessageCenter.h"
    … …  
    5454# include "VBoxUtils-darwin.h"
    5555#endif /* Q_WS_MAC */
     56
     57/* COM includes: */
     58#include "CMouse.h"
     59#include "CFramebuffer.h"
     60#include "CDisplay.h"
    5661
    5762/* Factory function to create mouse-handler: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h

    r35906 r41587  
    2020#define ___UIMouseHandler_h___
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QObject>
    2424#include <QPoint>
    … …  
    2626#include <QRect>
    2727
    28 /* Local includes */
     28/* GUI includes: */
    2929#include "UIMachineDefs.h"
    3030
    31 /* Global forwards */
     31/* Forward declarations: */
    3232class QWidget;
    33 
    34 /* Local forwards */
    35 class CSession;
    3633class UISession;
    3734class UIMachineLogic;
    … …  
    4138typedef union  _XEvent XEvent;
    4239#endif /* Q_WS_X11 */
     40class CSession;
    4341
    4442/* Delegate to control VM mouse functionality: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp

    r38348 r41587  
    1818 */
    1919
    20 /* Local includes */
     20/* Qt includes: */
     21#include <QApplication>
     22#include <QDesktopWidget>
     23#include <QMap>
     24#include <QMenu>
     25
     26/* GUI includes: */
    2127#include "UIMultiScreenLayout.h"
    22 #include "COMDefs.h"
    2328#include "UIActionPoolRuntime.h"
    2429#include "UIMachineLogic.h"
    … …  
    2631#include "UIMessageCenter.h"
    2732
    28 /* Global includes */
    29 #include <QApplication>
    30 #include <QDesktopWidget>
    31 #include <QMap>
    32 #include <QMenu>
     33/* COM includes: */
     34#include "COMEnums.h"
     35#include "CSession.h"
     36#include "CConsole.h"
     37#include "CMachine.h"
     38#include "CDisplay.h"
    3339
    3440UIMultiScreenLayout::UIMultiScreenLayout(UIMachineLogic *pMachineLogic)

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

    r41487 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QApplication>
    2222#include <QWidget>
    2323#include <QTimer>
    2424
    25 /* Local includes */
     25/* GUI includes: */
    2626#include "VBoxGlobal.h"
    2727#include "UISession.h"
    … …  
    3737#ifdef VBOX_WITH_VIDEOHWACCEL
    3838# include "VBoxFBOverlay.h"
    39 #endif
     39#endif /* VBOX_WITH_VIDEOHWACCEL */
    4040
    4141#ifdef Q_WS_X11
    … …  
    4545# ifndef VBOX_WITHOUT_XCURSOR
    4646#  include <X11/Xcursor/Xcursor.h>
    47 # endif
    48 #endif
     47# endif /* VBOX_WITHOUT_XCURSOR */
     48#endif /* Q_WS_X11 */
    4949
    5050#ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
    … …  
    5252# include <signal.h>
    5353#endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */
     54
     55/* COM includes: */
     56#include "CSystemProperties.h"
     57#include "CMachineDebugger.h"
     58#include "CGuest.h"
     59#include "CStorageController.h"
     60#include "CMediumAttachment.h"
     61#include "CDisplay.h"
     62#include "CFramebuffer.h"
     63#include "CNetworkAdapter.h"
     64#include "CVRDEServer.h"
     65#include "CUSBController.h"
    5466
    5567UISession::UISession(UIMachine *pMachine, CSession &sessionReference)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

    r41487 r41587  
    2020#define ___UIConsole_h___
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QObject>
    2424#include <QCursor>
    2525
    26 /* Local includes */
    27 #include "COMDefs.h"
     26/* GUI includes: */
    2827#include "UIMachineDefs.h"
    2928
    30 /* Global forwards */
     29/* COM includes: */
     30#include "COMEnums.h"
     31
     32/* Forward declarations: */
    3133class QMenu;
    3234class QMenuBar;
    … …  
    4042# endif /* !Q_WS_MAC */
    4143#endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */
    42 
    43 /* Local forwards */
    4444class UIFrameBuffer;
    4545class UIMachine;
    4646class UIMachineLogic;
    4747class UIMachineMenuBar;
     48class CSession;
     49class CUSBDevice;
     50class CNetworkAdapter;
     51class CMediumAttachment;
    4852
    4953/* CConsole callback event types: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

    r41114 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222
    23 /* Local includes: */
    24 #include "COMDefs.h"
     23/* GUI includes: */
    2524#include "VBoxGlobal.h"
    2625#include "UIMessageCenter.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

    r41487 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222#include <QMenu>
    … …  
    2626#endif /* Q_WS_MAC */
    2727
    28 /* Local includes: */
     28/* GUI includes: */
    2929#include "VBoxMiniToolBar.h"
    3030#include "UISession.h"
    … …  
    3232#include "UIMachineLogicFullscreen.h"
    3333#include "UIMachineWindowFullscreen.h"
     34
     35/* COM includes: */
     36#include "CMachine.h"
     37#include "CSnapshot.h"
    3438
    3539UIMachineWindowFullscreen::UIMachineWindowFullscreen(UIMachineLogic *pMachineLogic, ulong uScreenId)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

    r41114 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QMenu>
    2222
    23 /* Local includes: */
    24 #include "COMDefs.h"
     23/* GUI includes: */
    2524#include "VBoxGlobal.h"
    2625#include "UIMessageCenter.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r41487 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222#include <QMenuBar>
    … …  
    2525#include <QResizeEvent>
    2626
    27 /* Local includes: */
     27/* GUI includes: */
    2828#include "VBoxGlobal.h"
    2929#include "UISession.h"
    … …  
    4242# include "UIImageTools.h"
    4343#endif /* Q_WS_MAC */
     44
     45/* COM includes: */
     46#include "CMediumAttachment.h"
     47#include "CUSBController.h"
    4448
    4549UIMachineWindowNormal::UIMachineWindowNormal(UIMachineLogic *pMachineLogic, ulong uScreenId)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

    r41114 r41587  
    1818 */
    1919
    20 /* Local includes: */
    21 #include "COMDefs.h"
     20/* GUI includes: */
    2221#include "VBoxGlobal.h"
    2322#include "UIMessageCenter.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

    r41107 r41587  
    1818 */
    1919
    20 /* Local includes */
     20/* Qt includes: */
     21#include <QDesktopWidget>
     22#include <QMainWindow>
     23#include <QTimer>
     24
     25/* GUI includes */
    2126#include "VBoxGlobal.h"
    2227#include "UISession.h"
    … …  
    3035#endif /* VBOX_GUI_USE_QUARTZ2D */
    3136
    32 /* Global includes */
    33 #include <QDesktopWidget>
    34 #include <QMainWindow>
    35 #include <QTimer>
     37/* COM includes: */
     38#include "CDisplay.h"
    3639
    3740UIMachineViewScale::UIMachineViewScale(  UIMachineWindow *pMachineWindow

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

    r41487 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222#include <QMenu>
    … …  
    2828#endif /* Q_WS_MAC */
    2929
    30 /* Local includes: */
     30/* GUI includes: */
    3131#include "UISession.h"
    3232#include "UIMachineLogic.h"
    … …  
    4040# include "UIImageTools.h"
    4141#endif /* Q_WS_MAC */
     42
     43/* COM includes: */
     44#include "CMachine.h"
    4245
    4346UIMachineWindowScale::UIMachineWindowScale(UIMachineLogic *pMachineLogic, ulong uScreenId)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

    r41114 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222
    23 /* Local includes: */
    24 #include "COMDefs.h"
     23/* GUI includes: */
    2524#include "VBoxGlobal.h"
    2625#include "UIMessageCenter.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

    r41107 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QApplication>
    2222#include <QDesktopWidget>
    … …  
    2525#ifdef Q_WS_MAC
    2626#include <QMenuBar>
    27 #endif
    28 #ifdef Q_WS_X11
    29 #include <limits.h>
    30 #endif
    31 
    32 /* Local includes */
     27#endif /* Q_WS_MAC */
     28
     29/* GUI includes: */
    3330#include "VBoxGlobal.h"
    3431#include "UISession.h"
    … …  
    3734#include "UIMachineViewSeamless.h"
    3835#include "UIFrameBuffer.h"
     36
     37/* COM includes: */
     38#include "CDisplay.h"
     39
     40/* External includes: */
     41#ifdef Q_WS_X11
     42#include <limits.h>
     43#endif /* Q_WS_X11 */
    3944
    4045UIMachineViewSeamless::UIMachineViewSeamless(  UIMachineWindow *pMachineWindow

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

    r41487 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDesktopWidget>
    2222#include <QMenu>
    … …  
    2626#endif /* Q_WS_MAC */
    2727
    28 /* Local includes: */
     28/* GUI includes: */
    2929#include "VBoxGlobal.h"
    3030#include "UISession.h"
    … …  
    3939# include "VBoxUtils.h"
    4040#endif /* Q_WS_MAC */
     41
     42/* COM includes: */
     43#include "CSnapshot.h"
    4144
    4245UIMachineWindowSeamless::UIMachineWindowSeamless(UIMachineLogic *pMachineLogic, ulong uScreenId)

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

    r39932 r41587  
    2020#define __UISelectorWindow_h__
    2121
    22 /* Global includes: */
     22/* Qt includes: */
    2323#include <QMainWindow>
    2424#include <QUrl>
    … …  
    2727#endif /* VBOX_GUI_WITH_SYSTRAY */
    2828
    29 /* Local includes: */
     29/* GUI includes: */
    3030#include "QIWithRetranslateUI.h"
    3131#include "VBoxMedium.h"
    32 #include "COMDefs.h"
    3332#include "UINetworkDefs.h"
    3433

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

    r41255 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QDir>
    2222#include <QLabel>
    … …  
    2727#include <QUrl>
    2828
    29 #include <iprt/assert.h>
    30 
    31 /* Local includes */
     29/* GUI includes */
    3230#include "QILabel.h"
    3331#include "UIBar.h"
    … …  
    4442#include "UIToolBar.h"
    4543#include "VBoxUtils.h"
     44
     45/* COM includes: */
     46#include "CSystemProperties.h"
     47#include "CStorageController.h"
     48#include "CMediumAttachment.h"
     49#include "CVRDEServer.h"
     50#include "CAudioAdapter.h"
     51#include "CNetworkAdapter.h"
     52#include "CSerialPort.h"
     53#include "CUSBController.h"
     54#include "CUSBDeviceFilter.h"
     55#include "CSharedFolder.h"
     56
     57/* Other VBox includes: */
     58#include <iprt/assert.h>
    4659
    4760/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

    r38311 r41587  
    2222#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    2323
    24 /* Local includes */
     24/* Qt includes: */
     25#include <QFileInfo>
     26
     27/* GUI includes: */
    2528#include "UIVMItem.h"
    26 
    27 /* Qt includes */
    28 #include <QFileInfo>
    29 
    3029#ifdef Q_WS_MAC
    31 //# include "VBoxUtils.h"
    3230# include <ApplicationServices/ApplicationServices.h>
    3331#endif /* Q_WS_MAC */
     32
     33/* COM includes: */
     34#include "CSnapshot.h"
    3435
    3536#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h

    r35433 r41587  
    2020#define __UIVMItem_h__
    2121
    22 /* Local includes */
     22/* Qt includes: */
     23#include <QDateTime>
     24#include <QMimeData>
     25
     26/* GUI includes: */
    2327#include "VBoxGlobal.h"
    2428
    25 /* Global includes */
    26 #include <QDateTime>
    27 #include <QMimeData>
     29/* COM includes: */
     30#include "CVirtualBoxErrorInfo.h"
    2831
    2932class UIVMItem

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp

    r39261 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QContextMenuEvent>
    2222#include <QMenu>
    … …  
    2424#include <QTimer>
    2525
    26 /* Local includes: */
     26/* GUI includes: */
    2727#include "UIVMPreviewWindow.h"
    2828#include "UIVirtualBoxEventHandler.h"
    2929#include "UIImageTools.h"
    3030#include "VBoxGlobal.h"
     31
     32/* COM includes: */
     33#include "CDisplay.h"
    3134
    3235/* Initialize map: */

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.h

    r39261 r41587  
    2020#define __UIVMPreviewWindow_h__
    2121
    22 /* Local includes */
    23 #include "QIWithRetranslateUI.h"
    24 #include "COMDefs.h"
    25 
    26 /* Global includes: */
     22/* Qt includes: */
    2723#include <QWidget>
    2824#include <QHash>
     25
     26/* GUI includes: */
     27#include "QIWithRetranslateUI.h"
     28
     29/* COM includes: */
     30#include "COMEnums.h"
     31#include "CSession.h"
     32#include "CMachine.h"
    2933
    3034/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp

    r35722 r41587  
    1818 */
    1919
    20 /* Local includes */
     20/* GUI includes: */
    2121#include "UIVirtualBoxEventHandler.h"
    2222#include "UIMainEventListener.h"
    2323#include "VBoxGlobal.h"
    2424
    25 /* Global includes */
    26 //#include <iprt/thread.h>
    27 //#include <iprt/stream.h>
     25/* COM includes: */
     26#include "CEventSource.h"
    2827
    2928/* static */

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h

    r30868 r41587  
    2020#define __UIVirtualBoxEventHandler_h__
    2121
    22 /* Local includes */
    23 #include "COMDefs.h"
     22/* COM includes: */
     23#include "COMEnums.h"
     24#include "CEventListener.h"
    2425
    2526class UIVirtualBoxEventHandler: public QObject

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h

    r37628 r41587  
    2424#include <QMap>
    2525
    26 /* VBox includes: */
    27 #include "COMDefs.h"
     26/* COM includes: */
     27#include "COMEnums.h"
    2828
    2929/* Settings dialog namespace: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

    r41042 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QStackedWidget>
    2222#include <QThread>
    … …  
    2525#include <QTimer>
    2626
    27 /* Local includes */
     27/* GUI includes: */
    2828#include "UISettingsDialogSpecific.h"
    2929#include "UISettingsDefs.h"
    … …  
    5353#include "UIMachineSettingsUSB.h"
    5454#include "UIMachineSettingsSF.h"
     55
     56/* COM includes: */
     57#include "CUSBController.h"
    5558
    5659#if 0 /* Global USB filters are DISABLED now: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

    r41042 r41587  
    2020#define __UISettingsDialogSpecific_h__
    2121
    22 /* Local includes */
    23 #include "COMDefs.h"
     22/* GUI includes: */
    2423#include "UISettingsDialog.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CSession.h"
     28#include "CConsole.h"
     29#include "CMachine.h"
    2530
    2631/* Dialog which encapsulate all the specific functionalities of the Global Settings */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h

    r37143 r41587  
    2020#define __UISettingsPage_h__
    2121
    22 /* Qt includes */
     22/* Qt includes: */
    2323#include <QWidget>
    2424#include <QVariant>
    2525
    26 /* Other includes */
     26/* GUI includes: */
    2727#include "QIWithRetranslateUI.h"
    28 #include "COMDefs.h"
    2928#include "UISettingsDefs.h"
    3029#include "VBoxGlobalSettings.h"
    3130
    32 /* Forward declarations */
     31/* COM includes: */
     32#include "COMEnums.h"
     33#include "CMachine.h"
     34#include "CConsole.h"
     35#include "CSystemProperties.h"
     36
     37/* Forward declarations: */
    3338class QIWidgetValidator;
    3439class QShowEvent;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

    r39878 r41587  
    1616 */
    1717
    18 /* Global includes */
     18/* Qt includes: */
    1919#include <QHeaderView>
    2020
    21 /* Local includes */
     21/* GUI includes: */
    2222#include "UIGlobalSettingsExtension.h"
    2323#include "UIIconPool.h"
    … …  
    2626#include "UIMessageCenter.h"
    2727#include "VBoxLicenseViewer.h"
     28
     29/* COM includes: */
     30#include "CExtPackManager.h"
     31#include "CExtPack.h"
     32#include "CExtPackFile.h"
    2833
    2934/* Extension package item: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

    r39968 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QHeaderView>
    2222#include <QHostAddress>
    2323
    24 /* Local includes */
     24/* GUI includes: */
    2525#include "QIWidgetValidator.h"
    2626#include "UIIconPool.h"
    … …  
    2929#include "VBoxGlobal.h"
    3030#include "UIMessageCenter.h"
     31
     32/* COM includes: */
     33#include "CHostNetworkInterface.h"
     34#include "CDHCPServer.h"
    3135
    3236/* Host-network item constructor: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp

    r37126 r41587  
    1818 */
    1919
     20/* GUI includes: */
    2021#include "UIMachineSettingsAudio.h"
    2122#include "VBoxGlobal.h"
     23
     24/* COM includes: */
     25#include "CAudioAdapter.h"
    2226
    2327UIMachineSettingsAudio::UIMachineSettingsAudio()

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h

    r37143 r41587  
    2020#define __UIMachineSettingsAudio_h__
    2121
     22/* GUI includes: */
    2223#include "UISettingsPage.h"
    2324#include "UIMachineSettingsAudio.gen.h"
    24 #include "COMDefs.h"
    2525
    2626/* Machine settings / Audio page / Data: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

    r40192 r41587  
    1818 */
    1919
     20/* Qt includes: */
     21#include <QDesktopWidget>
     22
     23/* GUI includes: */
    2024#include "QIWidgetValidator.h"
    2125#include "UIMachineSettingsDisplay.h"
    … …  
    2327#include "UIMessageCenter.h"
    2428
    25 #include <QDesktopWidget>
     29/* COM includes: */
     30#include "CVRDEServer.h"
    2631
    2732/**

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

    r37168 r41587  
    2020#define __UIMachineSettingsDisplay_h__
    2121
    22 #include "COMDefs.h"
     22/* GUI includes: */
    2323#include "UISettingsPage.h"
    2424#include "UIMachineSettingsDisplay.gen.h"
     25
     26/* COM includes: */
     27#include "CGuestOSType.h"
    2528
    2629/* Machine settings / Display page / Data: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

    r37168 r41587  
    2020#define __UIMachineSettingsGeneral_h__
    2121
     22/* Local includes: */
    2223#include "UISettingsPage.h"
    2324#include "UIMachineSettingsGeneral.gen.h"
    24 #include "COMDefs.h"
    2525
    2626/* Machine settings / General page / Data: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

    r39968 r41587  
    1818 */
    1919
    20 /* Local includes: */
     20/* GUI includes: */
    2121#include "QIWidgetValidator.h"
    2222#include "QIArrowButtonSwitch.h"
    … …  
    2525#include "QITabWidget.h"
    2626
     27/* COM includes: */
     28#include "CNetworkAdapter.h"
     29#include "CNATEngine.h"
     30#include "CHostNetworkInterface.h"
     31
     32/* Other VBox includes: */
    2733#ifdef VBOX_WITH_VDE
    2834# include <iprt/ldr.h>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp

    r37126 r41587  
    1818 */
    1919
     20/* Qt includes: */
     21#include <QDir>
     22
     23/* GUI includes: */
    2024#include "UIMachineSettingsParallel.h"
    2125#include "QIWidgetValidator.h"
    … …  
    2327#include "QITabWidget.h"
    2428
    25 #include <QDir>
     29/* COM includes: */
     30#include "CParallelPort.h"
    2631
    2732/* UIMachineSettingsParallel stuff */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h

    r37143 r41587  
    2020#define __UIMachineSettingsParallel_h__
    2121
     22/* GUI includes: */
    2223#include "UISettingsPage.h"
    2324#include "UIMachineSettingsParallel.gen.h"
    24 #include "COMDefs.h"
    2525
    26 /* Forward declarations */
     26/* Forward declarations: */
    2727class UIMachineSettingsParallelPage;
    2828class QITabWidget;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h

    r36928 r41587  
    2020#define __UIMachineSettingsPortForwardingDlg_h__
    2121
    22 /* Local includes */
     22/* GUI includes */
    2323#include "QIWithRetranslateUI.h"
    2424#include "QIDialog.h"
    25 #include "COMDefs.h"
     25
     26/* COM includes: */
     27#include "COMEnums.h"
    2628
    2729/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h

    r37143 r41587  
    2020#define __UIMachineSettingsSF_h__
    2121
    22 /* Local includes */
     22/* GUI includes: */
    2323#include "UISettingsPage.h"
    2424#include "UIMachineSettingsSF.gen.h"
    2525
    26 /* Local forwards */
     26/* COM includes: */
     27#include "CSharedFolder.h"
     28
     29/* Forward declarations: */
    2730class SFTreeViewItem;
    2831

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp

    r37126 r41587  
    1818 */
    1919
     20/* Qt includes: */
     21#include <QDir>
     22
     23/* GUI includes: */
    2024#include "UIMachineSettingsSerial.h"
    2125#include "QIWidgetValidator.h"
    … …  
    2327#include "QITabWidget.h"
    2428
    25 #include <QDir>
     29/* COM includes: */
     30#include "CSerialPort.h"
    2631
    2732/* UIMachineSettingsSerial stuff */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h

    r37143 r41587  
    2020#define __UIMachineSettingsSerial_h__
    2121
     22/* GUI includes: */
    2223#include "UISettingsPage.h"
    2324#include "UIMachineSettingsSerial.gen.h"
    24 #include "COMDefs.h"
    2525
    2626/* Forward declarations */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

    r40870 r41587  
    1818 */
    1919
    20 /* Local Includes */
    21 #include "QIWidgetValidator.h"
    22 #include "UIIconPool.h"
    23 #include "UIWizardNewVD.h"
    24 #include "VBoxGlobal.h"
    25 #include "QIFileDialog.h"
    26 #include "UIMessageCenter.h"
    27 #include "UIMachineSettingsStorage.h"
    28 
    29 /* Global Includes */
     20/* Qt includes: */
    3021#include <QHeaderView>
    3122#include <QItemEditorFactory>
    … …  
    3627#include <QTimer>
    3728#include <QCommonStyle>
     29
     30/* GUI includes: */
     31#include "QIWidgetValidator.h"
     32#include "UIIconPool.h"
     33#include "UIWizardNewVD.h"
     34#include "VBoxGlobal.h"
     35#include "QIFileDialog.h"
     36#include "UIMessageCenter.h"
     37#include "UIMachineSettingsStorage.h"
     38
     39/* COM includes: */
     40#include "CStorageController.h"
     41#include "CMediumAttachment.h"
    3842
    3943QString compressText (const QString &aText)

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

    r37956 r41587  
    2020#define __UIMachineSettingsStorage_h__
    2121
    22 /* Global includes */
     22/* Qt includes: */
    2323#include <QtGlobal> /* for Q_WS_MAC */
    2424#ifdef Q_WS_MAC
    … …  
    3131#include <QPointer>
    3232
    33 /* Local includes */
     33/* GUI includes: */
    3434#include "UISettingsPage.h"
    3535#include "UIMachineSettingsStorage.gen.h"
    36 #include "COMDefs.h"
    37 
    38 /* Local forwards */
     36
     37/* Forward declarations: */
    3938class AttachmentItem;
    4039class ControllerItem;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

    r39968 r41587  
    1818 */
    1919
    20 /* Local includes */
     20/* Qt includes: */
     21#include <QHeaderView>
     22
     23/* GUI includes: */
    2124#include "QIWidgetValidator.h"
    2225#include "UIIconPool.h"
    … …  
    2427#include "UIMachineSettingsSystem.h"
    2528
    26 /* Global includes */
     29/* COM includes: */
     30#include "CBIOSSettings.h"
     31
     32/* Other VBox includes: */
    2733#include <iprt/cdefs.h>
    28 #include <QHeaderView>
    2934
    3035UIMachineSettingsSystem::UIMachineSettingsSystem()

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

    r37712 r41587  
    2020#define __UIMachineSettingsSystem_h__
    2121
    22 #include "COMDefs.h"
     22/* GUI includes: */
    2323#include "UISettingsPage.h"
    2424#include "UIMachineSettingsSystem.gen.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

    r39968 r41587  
    1818 */
    1919
    20 /* Global includes */
     20/* Qt includes: */
    2121#include <QHeaderView>
    2222
    23 /* Local includes */
     23/* GUI includes: */
    2424#include "QIWidgetValidator.h"
    2525#include "UIIconPool.h"
    … …  
    3030#include "UIMachineSettingsUSBFilterDetails.h"
    3131#include "VBoxDefs.h"
     32
     33/* COM includes: */
     34#include "CUSBController.h"
     35#include "CUSBDevice.h"
     36#include "CUSBDeviceFilter.h"
     37#include "CHostUSBDevice.h"
     38#include "CHostUSBDeviceFilter.h"
     39#include "CExtPackManager.h"
     40#include "CExtPack.h"
    3241
    3342/* Using declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h

    r37143 r41587  
    2020#define __UIMachineSettingsUSB_h__
    2121
     22/* GUI includes: */
    2223#include "UISettingsPage.h"
    2324#include "UIMachineSettingsUSB.gen.h"
    24 #include "COMDefs.h"
    25 
     25
     26/* Forward declarations: */
    2627class VBoxUSBMenu;
    2728class UIToolBar;

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

    r38384 r41587  
    1818 */
    1919
    20 /* VBox includes */
    21 #include "UIApplianceEditorWidget.h"
    22 #include "VBoxGlobal.h"
    23 #include "UIMessageCenter.h"
    24 #include "VBoxOSTypeSelectorButton.h"
    25 #include "UILineTextEdit.h"
    26 
    27 /* Qt includes */
     20/* Qt includes: */
    2821#include <QItemDelegate>
    2922#include <QSortFilterProxyModel>
    … …  
    3326#include <QSpinBox>
    3427#include <QComboBox>
     28
     29/* GUI includes: */
     30#include "UIApplianceEditorWidget.h"
     31#include "VBoxGlobal.h"
     32#include "UIMessageCenter.h"
     33#include "VBoxOSTypeSelectorButton.h"
     34#include "UILineTextEdit.h"
     35
     36/* COM includes: */
     37#include "CSystemProperties.h"
    3538
    3639////////////////////////////////////////////////////////////////////////////////

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h

    r38384 r41587  
    2020#define __UIApplianceEditorWidget_h__
    2121
    22 /* VBox includes */
    23 #include "COMDefs.h"
     22/* Qt includes: */
     23#include <QSortFilterProxyModel>
     24#include <QItemDelegate>
     25
     26/* GUI includes: */
    2427#include "UIApplianceEditorWidget.gen.h"
    2528#include "QIWithRetranslateUI.h"
    2629
    27 /* Qt includes */
    28 #include <QSortFilterProxyModel>
    29 #include <QItemDelegate>
    30 
    31 /* vbOX Forward declarations */
     30/* COM includes: */
     31#include "COMEnums.h"
     32#include "CVirtualSystemDescription.h"
     33
     34/* Forward declarations: */
    3235class ModelItem;
    3336

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp

    r38410 r41587  
    1818 */
    1919
    20 /* VBox includes */
     20/* GUI includes: */
    2121#include "UIApplianceExportEditorWidget.h"
    2222#include "VBoxGlobal.h"
    2323#include "UIMessageCenter.h"
     24
     25/* COM includes: */
     26#include "CAppliance.h"
    2427
    2528////////////////////////////////////////////////////////////////////////////////

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h

    r38410 r41587  
    2020#define __UIApplianceExportEditorWidget_h__
    2121
     22/* GUI includes: */
    2223#include "UIApplianceEditorWidget.h"
    2324

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp

    r38412 r41587  
    1818 */
    1919
    20 /* VBox includes */
     20/* GUI includes: */
    2121#include "UIApplianceImportEditorWidget.h"
    2222#include "VBoxGlobal.h"
    2323#include "UIMessageCenter.h"
     24
     25/* COM includes: */
     26#include "CAppliance.h"
    2427
    2528////////////////////////////////////////////////////////////////////////////////

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.h

    r38412 r41587  
    2020#define __UIApplianceImportEditorWidget_h__
    2121
    22 /* VBox includes */
     22/* GUI includes: */
    2323#include "UIApplianceEditorWidget.h"
    2424

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.h

    r34063 r41587  
    2020#define __UIBootTable_h__
    2121
    22 /* Local includes */
    23 #include <COMDefs.h>
     22/* Qt includes: */
     23#include <QListWidget>
     24
     25/* GUI includes: */
    2426#include "QIWithRetranslateUI.h"
    2527
    26 /* Global includes */
    27 #include <QListWidget>
     28/* COM includes: */
     29#include "COMEnums.h"
    2830
    2931class UIBootTableItem : public QListWidgetItem

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

    r37572 r41587  
    1818 */
    1919
    20 /* VBox includes */
    21 #include "UIProgressDialog.h"
    22 #include "COMDefs.h"
    23 #include "QIDialogButtonBox.h"
    24 #include "QILabel.h"
    25 #include "UISpecialControls.h"
    26 #include "VBoxGlobal.h"
    27 
    28 #ifdef Q_WS_MAC
    29 # include "VBoxUtils-darwin.h"
    30 #endif /* Q_WS_MAC */
    31 
    32 /* Qt includes */
     20/* Qt includes: */
    3321#include <QCloseEvent>
    3422#include <QEventLoop>
    … …  
    3725#include <QTimer>
    3826#include <QVBoxLayout>
     27
     28/* GUI includes: */
     29#include "UIProgressDialog.h"
     30#include "QIDialogButtonBox.h"
     31#include "QILabel.h"
     32#include "UISpecialControls.h"
     33#include "VBoxGlobal.h"
     34#ifdef Q_WS_MAC
     35# include "VBoxUtils-darwin.h"
     36#endif /* Q_WS_MAC */
     37
     38/* COM includes: */
     39#include "CProgress.h"
    3940
    4041const char *UIProgressDialog::m_spcszOpDescTpl = "%1 ... (%2/%3)";

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h

    r34479 r41587  
    2020#define __UIProgressDialog_h__
    2121
    22 /* Qt includes */
     22/* Qt includes: */
    2323#include "QIDialog.h"
    2424
    25 /* VBox forward declarations */
    26 class CProgress;
     25/* Forward declarations: */
     26class QProgressBar;
    2727class QILabel;
    2828class UIMiniCancelButton;
    29 
    30 /* Qt forward declarations */
    31 class QProgressBar;
     29class CProgress;
    3230
    3331/**

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp

    r39968 r41587  
    1818 */
    1919
    20 /* VBox includes */
     20/* GUI includes: */
    2121#include "VBoxGuestRAMSlider.h"
    2222#include "VBoxGlobal.h"
     23
     24/* COM includes: */
     25#include "CSystemProperties.h"
    2326
    2427VBoxGuestRAMSlider::VBoxGuestRAMSlider (QWidget *aParent /* = 0 */)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp

    r41415 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVariant>
    2222
    23 /* Local includes: */
     23/* GUI includes: */
    2424#include "UIWizardCloneVD.h"
    2525#include "UIWizardCloneVDPageBasic1.h"
    … …  
    3030#include "VBoxGlobal.h"
    3131#include "UIMessageCenter.h"
     32
     33/* COM includes: */
     34#include "CMediumFormat.h"
    3235
    3336UIWizardCloneVD::UIWizardCloneVD(QWidget *pParent, const CMedium &sourceVirtualDisk)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.h

    r41372 r41587  
    2020#define __UIWizardCloneVD_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizard.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMedium.h"
    2528
    2629/* Clone Virtual Hard Drive wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.h

    r41398 r41587  
    2020#define __UIWizardCloneVDPageBasic1_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizardPage.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMedium.h"
    2528
    2629/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222#include <QButtonGroup>
    2323#include <QRadioButton>
    2424
    25 /* Local includes: */
     25/* GUI includes: */
    2626#include "UIWizardCloneVDPageBasic2.h"
    2727#include "UIWizardCloneVD.h"
    2828#include "VBoxGlobal.h"
    2929#include "QIRichTextLabel.h"
     30
     31/* COM includes: */
     32#include "CSystemProperties.h"
    3033
    3134UIWizardCloneVDPage2::UIWizardCloneVDPage2()

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.h

    r41398 r41587  
    2020#define __UIWizardCloneVDPageBasic2_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizardPage.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMediumFormat.h"
    2528
    2629/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222#include <QButtonGroup>
    … …  
    2424#include <QCheckBox>
    2525
    26 /* Local includes: */
     26/* GUI includes: */
    2727#include "UIWizardCloneVDPageBasic3.h"
    2828#include "UIWizardCloneVD.h"
    29 #include "COMDefs.h"
    3029#include "QIRichTextLabel.h"
     30
     31/* COM includes: */
     32#include "CMediumFormat.h"
    3133
    3234UIWizardCloneVDPage3::UIWizardCloneVDPage3()

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic4.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDir>
    2222#include <QVBoxLayout>
    … …  
    2424#include <QLineEdit>
    2525
    26 /* Local includes: */
     26/* GUI includes: */
    2727#include "UIWizardCloneVDPageBasic4.h"
    2828#include "UIWizardCloneVD.h"
    29 #include "COMDefs.h"
    3029#include "VBoxGlobal.h"
    3130#include "UIMessageCenter.h"
    … …  
    3433#include "QIRichTextLabel.h"
    3534#include "QIToolButton.h"
     35
     36/* COM includes: */
     37#include "CMediumFormat.h"
    3638
    3739UIWizardCloneVDPage4::UIWizardCloneVDPage4()

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic4.h

    r41398 r41587  
    2020#define __UIWizardCloneVDPageBasic4_h__
    2121
    22 /* Global includes: */
     22/* Qt includes: */
    2323#include <QVariant>
    2424
    25 /* Local includes: */
     25/* GUI includes: */
    2626#include "UIWizardPage.h"
    27 #include "COMDefs.h"
    2827
    2928/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QGridLayout>
    2222#include <QVBoxLayout>
    … …  
    2828#include <QLineEdit>
    2929
    30 /* Local includes: */
     30/* GUI includes: */
    3131#include "UIWizardCloneVDPageExpert.h"
    3232#include "UIWizardCloneVD.h"
    … …  
    3535#include "VBoxMediaComboBox.h"
    3636#include "QIToolButton.h"
     37
     38/* COM includes: */
     39#include "CSystemProperties.h"
    3740
    3841UIWizardCloneVDPageExpert::UIWizardCloneVDPageExpert(const CMedium &sourceVirtualDisk)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.h

    r41373 r41587  
    2020#define __UIWizardCloneVM_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizard.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMachine.h"
     28#include "CSnapshot.h"
    2529
    2630/* Clone VM wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222#include <QLineEdit>
    2323#include <QCheckBox>
    2424
    25 /* Local includes: */
     25/* GUI includes: */
    2626#include "UIWizardCloneVMPageBasic1.h"
    2727#include "UIWizardCloneVM.h"
    28 #include "COMDefs.h"
    2928#include "QIRichTextLabel.h"
    3029

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222#include <QRadioButton>
    2323#include <QButtonGroup>
    2424
    25 /* Local includes: */
     25/* GUI includes: */
    2626#include "UIWizardCloneVMPageBasic2.h"
    2727#include "UIWizardCloneVM.h"
    28 #include "COMDefs.h"
    2928#include "QIRichTextLabel.h"
    3029

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.h

    r41399 r41587  
    2020#define __UIWizardCloneVMPageBasic3_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizardPage.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
    2527
    2628/* Forward declaration: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

    r41415 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVariant>
    2222#include <QFileInfo>
    2323
    24 /* Local includes: */
     24/* GUI includes: */
    2525#include "UIWizardExportApp.h"
    2626#include "UIWizardExportAppDefs.h"
    … …  
    3030#include "UIWizardExportAppPageBasic4.h"
    3131#include "UIWizardExportAppPageExpert.h"
    32 #include "COMDefs.h"
    3332#include "UIMessageCenter.h"
     33
     34/* COM includes: */
     35#include "CAppliance.h"
     36#include "CVFSExplorer.h"
    3437
    3538UIWizardExportApp::UIWizardExportApp(QWidget *pParent, const QStringList &selectedVMNames)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic4.cpp

    r41372 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222
    23 /* Local includes: */
     23/* GUI includes: */
    2424#include "UIWizardExportAppPageBasic4.h"
    2525#include "UIWizardExportApp.h"
    … …  
    2828#include "QILabelSeparator.h"
    2929#include "QIRichTextLabel.h"
     30
     31/* COM includes: */
     32#include "CAppliance.h"
    3033
    3134UIWizardExportAppPage4::UIWizardExportAppPage4()

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp

    r41415 r41587  
    1818 */
    1919
    20 /* Local includes: */
     20/* GUI includes: */
    2121#include "UIWizardFirstRun.h"
    2222#include "UIWizardFirstRunPageBasic.h"
    2323#include "VBoxGlobal.h"
    2424#include "UIMessageCenter.h"
     25
     26/* COM includes: */
     27#include "CStorageController.h"
     28#include "CMediumAttachment.h"
    2529
    2630UIWizardFirstRun::UIWizardFirstRun(QWidget *pParent, const CMachine &machine)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.h

    r41373 r41587  
    2020#define __UIWizardFirstRun_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizard.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMachine.h"
    2528
    2629/* First Run wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

    r41401 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222#include <QHBoxLayout>
    2323
    24 /* Local includes: */
     24/* GUI includes: */
    2525#include "UIWizardFirstRunPageBasic.h"
    2626#include "UIWizardFirstRun.h"
    27 #include "COMDefs.h"
    2827#include "UIIconPool.h"
    2928#include "VBoxGlobal.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

    r41415 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVariant>
    2222
    23 /* Local includes: */
     23/* GUI includes: */
    2424#include "UIWizardNewVD.h"
    2525#include "UIWizardNewVDPageBasic1.h"
    … …  
    2929#include "VBoxGlobal.h"
    3030#include "UIMessageCenter.h"
     31
     32/* COM includes: */
     33#include "CMediumFormat.h"
    3134
    3235UIWizardNewVD::UIWizardNewVD(QWidget *pParent,

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h

    r41415 r41587  
    2020#define __UIWizardNewVD_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizard.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMedium.h"
    2528
    2629/* New Virtual Hard Drive wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222#include <QButtonGroup>
    2323#include <QRadioButton>
    2424
    25 /* Local includes: */
     25/* GUI includes: */
    2626#include "UIWizardNewVDPageBasic1.h"
    2727#include "UIWizardNewVD.h"
    2828#include "VBoxGlobal.h"
    2929#include "QIRichTextLabel.h"
     30
     31/* COM includes: */
     32#include "CSystemProperties.h"
    3033
    3134UIWizardNewVDPage1::UIWizardNewVDPage1()

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.h

    r41392 r41587  
    2020#define __UIWizardNewVDPageBasic1_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizardPage.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMediumFormat.h"
    2528
    2629/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QVBoxLayout>
    2222#include <QButtonGroup>
    … …  
    2424#include <QCheckBox>
    2525
    26 /* Local includes: */
     26/* GUI includes: */
    2727#include "UIWizardNewVDPageBasic2.h"
    2828#include "UIWizardNewVD.h"
    29 #include "COMDefs.h"
    3029#include "QIRichTextLabel.h"
     30
     31/* COM includes: */
     32#include "CMediumFormat.h"
    3133
    3234UIWizardNewVDPage2::UIWizardNewVDPage2()

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDir>
    2222#include <QRegExpValidator>
    … …  
    2828#include <QSpacerItem>
    2929
    30 /* Local includes: */
     30/* GUI includes: */
    3131#include "UIWizardNewVDPageBasic3.h"
    3232#include "UIWizardNewVD.h"
    33 #include "COMDefs.h"
    3433#include "VBoxGlobal.h"
    3534#include "UIMessageCenter.h"
    … …  
    3938#include "QIToolButton.h"
    4039#include "QILineEdit.h"
     40
     41/* COM includes: */
     42#include "CSystemProperties.h"
     43#include "CMediumFormat.h"
    4144
    4245UIWizardNewVDPage3::UIWizardNewVDPage3(const QString &strDefaultName, const QString &strDefaultPath)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.h

    r41392 r41587  
    2020#define __UIWizardNewVDPageBasic3_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizardPage.h"
    24 #include "COMDefs.h"
    2524
    2625/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

    r41479 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QGridLayout>
    2222#include <QVBoxLayout>
    … …  
    3030#include <QLabel>
    3131
    32 /* Local includes: */
     32/* GUI includes: */
    3333#include "UIWizardNewVDPageExpert.h"
    3434#include "UIWizardNewVD.h"
    … …  
    3939#include "QIToolButton.h"
    4040#include "QILineEdit.h"
     41
     42/* COM includes: */
     43#include "CSystemProperties.h"
    4144
    4245UIWizardNewVDPageExpert::UIWizardNewVDPageExpert(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

    r41415 r41587  
    1818 */
    1919
    20 /* Local includes: */
     20/* GUI includes: */
    2121#include "UIWizardNewVM.h"
    2222#include "UIWizardNewVMPageBasic1.h"
    … …  
    2727#include "VBoxGlobal.h"
    2828#include "UIMessageCenter.h"
     29
     30/* COM includes: */
     31#include "CAudioAdapter.h"
     32#include "CUSBController.h"
     33#include "CExtPackManager.h"
     34#include "CStorageController.h"
    2935
    3036/* Using declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

    r41373 r41587  
    2020#define __UIWizardNewVM_h__
    2121
    22 /* Local includes: */
     22/* GUI includes: */
    2323#include "UIWizard.h"
    24 #include "COMDefs.h"
     24
     25/* COM includes: */
     26#include "COMEnums.h"
     27#include "CMachine.h"
    2528
    2629/* New Virtual Machine wizard: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

    r41389 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QDir>
    2222#include <QVBoxLayout>
    … …  
    2424#include <QLineEdit>
    2525
    26 /* Local includes: */
     26/* GUI includes: */
    2727#include "UIWizardNewVMPageBasic1.h"
    2828#include "UIWizardNewVM.h"
    … …  
    3030#include "UINameAndSystemEditor.h"
    3131#include "QIRichTextLabel.h"
     32
     33/* COM includes: */
     34#include "CSystemProperties.h"
    3235
    3336/* Defines some patterns to guess the right OS type. Should be in sync with

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp

    r41389 r41587  
    1818 */
    1919
    20 /* Global includes: */
     20/* Qt includes: */
    2121#include <QIntValidator>
    2222#include <QVBoxLayout>
    … …  
    2525#include <QLabel>
    2626
    27 /* Local includes: */
     27/* GUI includes: */
    2828#include "UIWizardNewVMPageBasic2.h"
    2929#include "UIWizardNewVM.h"
    30 #include "COMDefs.h"
    3130#include "VBoxGlobal.h"
    3231#include "VBoxGuestRAMSlider.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h

    r41415 r41587  
    2020#define __UIWizardNewVMPageBasic3_h__
    2121
    22 /* Global includes: */
     22/* Qt includes: */
    2323#include <QVariant>
    2424
    25 /* Local includes: */
     25/* GUI includes: */
    2626#include "UIWizardPage.h"
    27 #include "COMDefs.h"
     27
     28/* COM includes: */
     29#include "COMEnums.h"
     30#include "CMedium.h"
    2831
    2932/* Forward declarations: */
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