diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-01-01 03:22:50 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-01-01 03:22:50 +0000 |
| commit | e32521bdf99a0c32c5745fab6b33fcd2689cfbc3 (patch) | |
| tree | 318f385e516753b115bb68029a32fa350c1d47cc | |
| parent | f95af1d56106bb9ec1e3d9a5f0592fe72d93047d (diff) | |
| download | VirtualBox-svn-e32521bdf99a0c32c5745fab6b33fcd2689cfbc3.tar.gz | |
Main: Use MAIN_INCLUDED_ and MAIN_INCLUDED_SRC_ as header guard prefixes with scm.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@76562 cfe28804-0f27-0410-a406-dd0f0b0b656f
139 files changed, 423 insertions, 421 deletions
diff --git a/src/VBox/Main/.scm-settings b/src/VBox/Main/.scm-settings index dd6e53502e2..78a21815ed9 100644 --- a/src/VBox/Main/.scm-settings +++ b/src/VBox/Main/.scm-settings @@ -34,6 +34,10 @@ /src-all/win/VBoxAPIWrap-precomp_vcc.h: --no-fix-header-guards /src-client/win/precomp_vcc.h: --no-fix-header-guards /src-server/win/precomp_vcc.h: --no-fix-header-guards +/*.h: --guard-relative-to-dir . --guard-prefix MAIN_INCLUDED_SRC_ --fix-header-guard-endif +/include/*.h: --guard-relative-to-dir include --guard-prefix MAIN_INCLUDED_ +/include/*.h: --guard-relative-to-dir include --guard-prefix MAIN_INCLUDED_ +/cbinding/VBoxCAPI*.h: --guard-relative-to-dir '' # IDL and XML /idl/VirtualBox.xidl: --treat-as .xml diff --git a/src/VBox/Main/include/AdditionsFacilityImpl.h b/src/VBox/Main/include/AdditionsFacilityImpl.h index 2c4e72d47f8..6e48e5c00ed 100644 --- a/src/VBox/Main/include/AdditionsFacilityImpl.h +++ b/src/VBox/Main/include/AdditionsFacilityImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_ADDITIONSFACILITYIMPL -#define ____H_ADDITIONSFACILITYIMPL +#ifndef MAIN_INCLUDED_AdditionsFacilityImpl_h +#define MAIN_INCLUDED_AdditionsFacilityImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -96,5 +96,5 @@ private: } mData; }; -#endif // ____H_ADDITIONSFACILITYIMPL +#endif /* !MAIN_INCLUDED_AdditionsFacilityImpl_h */ diff --git a/src/VBox/Main/include/ApplianceImpl.h b/src/VBox/Main/include/ApplianceImpl.h index ed8a7bf5299..4e64ba34e74 100644 --- a/src/VBox/Main/include/ApplianceImpl.h +++ b/src/VBox/Main/include/ApplianceImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_APPLIANCEIMPL -#define ____H_APPLIANCEIMPL +#ifndef MAIN_INCLUDED_ApplianceImpl_h +#define MAIN_INCLUDED_ApplianceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -331,5 +331,5 @@ private: friend class Machine; }; -#endif // !____H_APPLIANCEIMPL +#endif /* !MAIN_INCLUDED_ApplianceImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ApplianceImplPrivate.h b/src/VBox/Main/include/ApplianceImplPrivate.h index 971d6a10fe7..5bf4ad6d3f4 100644 --- a/src/VBox/Main/include/ApplianceImplPrivate.h +++ b/src/VBox/Main/include/ApplianceImplPrivate.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_APPLIANCEIMPLPRIVATE -#define ____H_APPLIANCEIMPLPRIVATE +#ifndef MAIN_INCLUDED_ApplianceImplPrivate_h +#define MAIN_INCLUDED_ApplianceImplPrivate_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -511,5 +511,5 @@ ovf::CIMOSType_T convertVBoxOSType2CIMOSType(const char *pcszVBox, BOOL fLongMod Utf8Str convertNetworkAttachmentTypeToString(NetworkAttachmentType_T type); -#endif // !____H_APPLIANCEIMPLPRIVATE +#endif /* !MAIN_INCLUDED_ApplianceImplPrivate_h */ diff --git a/src/VBox/Main/include/AudioAdapterImpl.h b/src/VBox/Main/include/AudioAdapterImpl.h index c3ebdacd1d8..aafb5357b7d 100644 --- a/src/VBox/Main/include/AudioAdapterImpl.h +++ b/src/VBox/Main/include/AudioAdapterImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_AUDIOADAPTER -#define ____H_AUDIOADAPTER +#ifndef MAIN_INCLUDED_AudioAdapterImpl_h +#define MAIN_INCLUDED_AudioAdapterImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -78,5 +78,5 @@ private: Backupable<settings::AudioAdapter> mData; }; -#endif // ____H_AUDIOADAPTER +#endif /* !MAIN_INCLUDED_AudioAdapterImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/AudioDriver.h b/src/VBox/Main/include/AudioDriver.h index be83c5e56d4..2404a2ee026 100644 --- a/src/VBox/Main/include/AudioDriver.h +++ b/src/VBox/Main/include/AudioDriver.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_AUDIODRIVER -#define ____H_AUDIODRIVER +#ifndef MAIN_INCLUDED_AudioDriver_h +#define MAIN_INCLUDED_AudioDriver_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -111,5 +111,5 @@ protected: bool mfAttached; }; -#endif /* !____H_AUDIODRIVER */ +#endif /* !MAIN_INCLUDED_AudioDriver_h */ diff --git a/src/VBox/Main/include/AuthLibrary.h b/src/VBox/Main/include/AuthLibrary.h index 2c9056553bc..61cc4de1ccd 100644 --- a/src/VBox/Main/include/AuthLibrary.h +++ b/src/VBox/Main/include/AuthLibrary.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_AUTHLIBRARY -#define ____H_AUTHLIBRARY +#ifndef MAIN_INCLUDED_AuthLibrary_h +#define MAIN_INCLUDED_AuthLibrary_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -41,4 +41,4 @@ AuthResult AuthLibAuthenticate(const AUTHLIBRARYCONTEXT *pAuthLibCtx, uint32_t u32ClientId); void AuthLibDisconnect(const AUTHLIBRARYCONTEXT *pAuthLibCtx, PCRTUUID pUuid, uint32_t u32ClientId); -#endif /* !____H_AUTHLIBRARY */ +#endif /* !MAIN_INCLUDED_AuthLibrary_h */ diff --git a/src/VBox/Main/include/AutoCaller.h b/src/VBox/Main/include/AutoCaller.h index 9d7faaf0421..51856fb1cce 100644 --- a/src/VBox/Main/include/AutoCaller.h +++ b/src/VBox/Main/include/AutoCaller.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_AUTOCALLER -#define ____H_AUTOCALLER +#ifndef MAIN_INCLUDED_AutoCaller_h +#define MAIN_INCLUDED_AutoCaller_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -503,4 +503,4 @@ private: bool mUninitFailed : 1; }; -#endif // !____H_AUTOCALLER +#endif /* !MAIN_INCLUDED_AutoCaller_h */ diff --git a/src/VBox/Main/include/AutoStateDep.h b/src/VBox/Main/include/AutoStateDep.h index 35cb02daef7..1786830652e 100644 --- a/src/VBox/Main/include/AutoStateDep.h +++ b/src/VBox/Main/include/AutoStateDep.h @@ -1,6 +1,7 @@ /* $Id$ */ -#ifndef ____H_AUTOSTATEDEP -#define ____H_AUTOSTATEDEP + +#ifndef MAIN_INCLUDED_AutoStateDep_h +#define MAIN_INCLUDED_AutoStateDep_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -199,5 +200,5 @@ */ typedef AutoStateDependency<Machine::MutableOrSavedOrRunningStateDep> AutoMutableOrSavedOrRunningStateDependency; -#endif // ____H_AUTOSTATEDEP +#endif /* !MAIN_INCLUDED_AutoStateDep_h */ diff --git a/src/VBox/Main/include/AutostartDb.h b/src/VBox/Main/include/AutostartDb.h index 5e2b1538721..bb164df50f6 100644 --- a/src/VBox/Main/include/AutostartDb.h +++ b/src/VBox/Main/include/AutostartDb.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___autostart_h -#define ___autostart_h +#ifndef MAIN_INCLUDED_AutostartDb_h +#define MAIN_INCLUDED_AutostartDb_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -95,5 +95,5 @@ class AutostartDb #endif }; -#endif /* !___autostart_h */ +#endif /* !MAIN_INCLUDED_AutostartDb_h */ diff --git a/src/VBox/Main/include/BIOSSettingsImpl.h b/src/VBox/Main/include/BIOSSettingsImpl.h index 12980292048..5748b9d5645 100644 --- a/src/VBox/Main/include/BIOSSettingsImpl.h +++ b/src/VBox/Main/include/BIOSSettingsImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_BIOSSETTINGS -#define ____H_BIOSSETTINGS +#ifndef MAIN_INCLUDED_BIOSSettingsImpl_h +#define MAIN_INCLUDED_BIOSSettingsImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -86,6 +86,6 @@ private: Data *m; }; -#endif // ____H_BIOSSETTINGS +#endif /* !MAIN_INCLUDED_BIOSSettingsImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/BandwidthControlImpl.h b/src/VBox/Main/include/BandwidthControlImpl.h index 2762a184842..af406e4f42b 100644 --- a/src/VBox/Main/include/BandwidthControlImpl.h +++ b/src/VBox/Main/include/BandwidthControlImpl.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_BANDWIDTHCONTROLIMPL -#define ____H_BANDWIDTHCONTROLIMPL +#ifndef MAIN_INCLUDED_BandwidthControlImpl_h +#define MAIN_INCLUDED_BandwidthControlImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -97,5 +97,5 @@ private: Data *m; }; -#endif // ____H_BANDWIDTHCONTROLIMPL +#endif /* !MAIN_INCLUDED_BandwidthControlImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/BandwidthGroupImpl.h b/src/VBox/Main/include/BandwidthGroupImpl.h index 9a75ad73f70..314c16ec339 100644 --- a/src/VBox/Main/include/BandwidthGroupImpl.h +++ b/src/VBox/Main/include/BandwidthGroupImpl.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_BANDWIDTHGROUPIMPL -#define ____H_BANDWIDTHGROUPIMPL +#ifndef MAIN_INCLUDED_BandwidthGroupImpl_h +#define MAIN_INCLUDED_BandwidthGroupImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -101,5 +101,5 @@ private: Data *m; }; -#endif // ____H_BANDWIDTHGROUPIMPL +#endif /* !MAIN_INCLUDED_BandwidthGroupImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/BusAssignmentManager.h b/src/VBox/Main/include/BusAssignmentManager.h index 3b0720adc31..a494a744882 100644 --- a/src/VBox/Main/include/BusAssignmentManager.h +++ b/src/VBox/Main/include/BusAssignmentManager.h @@ -14,8 +14,9 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___H_BUSASSIGNMENTMANAGER -#define ___H_BUSASSIGNMENTMANAGER + +#ifndef MAIN_INCLUDED_BusAssignmentManager_h +#define MAIN_INCLUDED_BusAssignmentManager_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -76,4 +77,4 @@ public: virtual void listAttachedPCIDevices(std::vector<PCIDeviceInfo> &aAttached); }; -#endif // __BusAssignmentManager_h +#endif /* !MAIN_INCLUDED_BusAssignmentManager_h */ diff --git a/src/VBox/Main/include/CertificateImpl.h b/src/VBox/Main/include/CertificateImpl.h index 134bedbea28..9e3cae8d864 100644 --- a/src/VBox/Main/include/CertificateImpl.h +++ b/src/VBox/Main/include/CertificateImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_CERTIFICATEIMPL -#define ____H_CERTIFICATEIMPL +#ifndef MAIN_INCLUDED_CertificateImpl_h +#define MAIN_INCLUDED_CertificateImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -98,5 +98,5 @@ private: Data *m; }; -#endif // !____H_CERTIFICATEIMPL +#endif /* !MAIN_INCLUDED_CertificateImpl_h */ diff --git a/src/VBox/Main/include/ClientToken.h b/src/VBox/Main/include/ClientToken.h index 83399cdfe42..efbb0479f4b 100644 --- a/src/VBox/Main/include/ClientToken.h +++ b/src/VBox/Main/include/ClientToken.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_CLIENTTOKEN -#define ____H_CLIENTTOKEN +#ifndef MAIN_INCLUDED_ClientToken_h +#define MAIN_INCLUDED_ClientToken_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -104,5 +104,5 @@ private: #endif }; -#endif /* !____H_CLIENTTOKEN */ +#endif /* !MAIN_INCLUDED_ClientToken_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ClientTokenHolder.h b/src/VBox/Main/include/ClientTokenHolder.h index 080d9067e50..a5160105cd7 100644 --- a/src/VBox/Main/include/ClientTokenHolder.h +++ b/src/VBox/Main/include/ClientTokenHolder.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_CLIENTTOKENHOLDER -#define ____H_CLIENTTOKENHOLDER +#ifndef MAIN_INCLUDED_ClientTokenHolder_h +#define MAIN_INCLUDED_ClientTokenHolder_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -98,5 +98,5 @@ private: #endif }; -#endif /* !____H_CLIENTTOKENHOLDER */ +#endif /* !MAIN_INCLUDED_ClientTokenHolder_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ClientWatcher.h b/src/VBox/Main/include/ClientWatcher.h index 5b90ca4d1e7..a615d1da591 100644 --- a/src/VBox/Main/include/ClientWatcher.h +++ b/src/VBox/Main/include/ClientWatcher.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_CLIENTWATCHER -#define ____H_CLIENTWATCHER +#ifndef MAIN_INCLUDED_ClientWatcher_h +#define MAIN_INCLUDED_ClientWatcher_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -132,5 +132,5 @@ private: #endif }; -#endif /* !____H_CLIENTWATCHER */ +#endif /* !MAIN_INCLUDED_ClientWatcher_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/CloudProviderManagerImpl.h b/src/VBox/Main/include/CloudProviderManagerImpl.h index 28d0e8e04cb..3c1868ce556 100644 --- a/src/VBox/Main/include/CloudProviderManagerImpl.h +++ b/src/VBox/Main/include/CloudProviderManagerImpl.h @@ -15,9 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - -#ifndef ____H_CLOUDPROVIDERMANAGERIMPL -#define ____H_CLOUDPROVIDERMANAGERIMPL +#ifndef MAIN_INCLUDED_CloudProviderManagerImpl_h +#define MAIN_INCLUDED_CloudProviderManagerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -65,6 +64,6 @@ private: CloudProviderVec m_apCloudProviders; }; -#endif // !____H_CLOUDPROVIDERMANAGERIMPL +#endif /* !MAIN_INCLUDED_CloudProviderManagerImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ConsoleImpl.h b/src/VBox/Main/include/ConsoleImpl.h index ce20f79b52a..d2e70c52b0e 100644 --- a/src/VBox/Main/include/ConsoleImpl.h +++ b/src/VBox/Main/include/ConsoleImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_CONSOLEIMPL -#define ____H_CONSOLEIMPL +#ifndef MAIN_INCLUDED_ConsoleImpl_h +#define MAIN_INCLUDED_ConsoleImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -1068,5 +1068,5 @@ private: friend class ConsoleVRDPServer; }; -#endif // !____H_CONSOLEIMPL +#endif /* !MAIN_INCLUDED_ConsoleImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ConsoleVRDPServer.h b/src/VBox/Main/include/ConsoleVRDPServer.h index f5bce965336..66daf201484 100644 --- a/src/VBox/Main/include/ConsoleVRDPServer.h +++ b/src/VBox/Main/include/ConsoleVRDPServer.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_CONSOLEVRDPSERVER -#define ____H_CONSOLEVRDPSERVER +#ifndef MAIN_INCLUDED_ConsoleVRDPServer_h +#define MAIN_INCLUDED_ConsoleVRDPServer_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -410,5 +410,5 @@ private: Console * const mParent; }; -#endif // ____H_CONSOLEVRDPSERVER +#endif /* !MAIN_INCLUDED_ConsoleVRDPServer_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/DHCPServerImpl.h b/src/VBox/Main/include/DHCPServerImpl.h index b2ceca11f99..4af41f7b18a 100644 --- a/src/VBox/Main/include/DHCPServerImpl.h +++ b/src/VBox/Main/include/DHCPServerImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_DHCPSERVERIMPL -#define ____H_DHCPSERVERIMPL +#ifndef MAIN_INCLUDED_DHCPServerImpl_h +#define MAIN_INCLUDED_DHCPServerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -141,4 +141,4 @@ private: const Utf8Str mName; }; -#endif // ____H_H_DHCPSERVERIMPL +#endif /* !MAIN_INCLUDED_DHCPServerImpl_h */ diff --git a/src/VBox/Main/include/DataStreamImpl.h b/src/VBox/Main/include/DataStreamImpl.h index cdb57e10fb3..7e9e59c3966 100644 --- a/src/VBox/Main/include/DataStreamImpl.h +++ b/src/VBox/Main/include/DataStreamImpl.h @@ -15,9 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - -#ifndef ____H_DATASTREAMIMPL -#define ____H_DATASTREAMIMPL +#ifndef MAIN_INCLUDED_DataStreamImpl_h +#define MAIN_INCLUDED_DataStreamImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -64,6 +63,6 @@ private: bool m_fEos; }; -#endif // !____H_DATASTREAMIMPL +#endif /* !MAIN_INCLUDED_DataStreamImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/DisplayImpl.h b/src/VBox/Main/include/DisplayImpl.h index 9a5261f9a71..4f95b9dc8b3 100644 --- a/src/VBox/Main/include/DisplayImpl.h +++ b/src/VBox/Main/include/DisplayImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_DISPLAYIMPL -#define ____H_DISPLAYIMPL +#ifndef MAIN_INCLUDED_DisplayImpl_h +#define MAIN_INCLUDED_DisplayImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -637,5 +637,5 @@ private: ULONG mBitsPerPixel; }; -#endif // !____H_DISPLAYIMPL +#endif /* !MAIN_INCLUDED_DisplayImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/DisplayUtils.h b/src/VBox/Main/include/DisplayUtils.h index 9089896cc43..031cca47c56 100644 --- a/src/VBox/Main/include/DisplayUtils.h +++ b/src/VBox/Main/include/DisplayUtils.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_DISPLAYUTILS -#define ____H_DISPLAYUTILS +#ifndef MAIN_INCLUDED_DisplayUtils_h +#define MAIN_INCLUDED_DisplayUtils_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -39,5 +39,5 @@ int readSavedGuestScreenInfo(const Utf8Str &strStateFilePath, uint32_t u32Screen int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData, uint32_t *pu32Width, uint32_t *pu32Height); void freeSavedDisplayScreenshot(uint8_t *pu8Data); -#endif +#endif /* !MAIN_INCLUDED_DisplayUtils_h */ diff --git a/src/VBox/Main/include/DrvAudioRec.h b/src/VBox/Main/include/DrvAudioRec.h index 07c1813f5b0..e2870a0ca5b 100644 --- a/src/VBox/Main/include/DrvAudioRec.h +++ b/src/VBox/Main/include/DrvAudioRec.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_DRVAUDIORECORDING -#define ____H_DRVAUDIORECORDING +#ifndef MAIN_INCLUDED_DrvAudioRec_h +#define MAIN_INCLUDED_DrvAudioRec_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -66,5 +66,5 @@ private: struct settings::RecordingSettings mVideoRecCfg; }; -#endif /* !____H_DRVAUDIORECORDING */ +#endif /* !MAIN_INCLUDED_DrvAudioRec_h */ diff --git a/src/VBox/Main/include/DrvAudioVRDE.h b/src/VBox/Main/include/DrvAudioVRDE.h index 546232c0355..e911a0a1f2f 100644 --- a/src/VBox/Main/include/DrvAudioVRDE.h +++ b/src/VBox/Main/include/DrvAudioVRDE.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_DRVAUDIOVRDE -#define ____H_DRVAUDIOVRDE +#ifndef MAIN_INCLUDED_DrvAudioVRDE_h +#define MAIN_INCLUDED_DrvAudioVRDE_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -72,5 +72,5 @@ private: struct DRVAUDIOVRDE *mpDrv; }; -#endif /* !____H_DRVAUDIOVRDE */ +#endif /* !MAIN_INCLUDED_DrvAudioVRDE_h */ diff --git a/src/VBox/Main/include/EBMLWriter.h b/src/VBox/Main/include/EBMLWriter.h index 6e7aaa58c48..03afac9932f 100644 --- a/src/VBox/Main/include/EBMLWriter.h +++ b/src/VBox/Main/include/EBMLWriter.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_EBMLWRITER -#define ____H_EBMLWRITER +#ifndef MAIN_INCLUDED_EBMLWriter_h +#define MAIN_INCLUDED_EBMLWriter_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -137,5 +137,5 @@ private: void operator=(const EBMLWriter &); }; -#endif +#endif /* !MAIN_INCLUDED_EBMLWriter_h */ diff --git a/src/VBox/Main/include/EBML_MKV.h b/src/VBox/Main/include/EBML_MKV.h index 523ab7f6e61..e07f9d4772e 100644 --- a/src/VBox/Main/include/EBML_MKV.h +++ b/src/VBox/Main/include/EBML_MKV.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_EBMLMKV -#define ____H_EBMLMKV +#ifndef MAIN_INCLUDED_EBML_MKV_h +#define MAIN_INCLUDED_EBML_MKV_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -92,5 +92,5 @@ enum MkvElem MkvElem_CueClusterPosition = 0xF1 }; -#endif +#endif /* !MAIN_INCLUDED_EBML_MKV_h */ diff --git a/src/VBox/Main/include/EmulatedUSBImpl.h b/src/VBox/Main/include/EmulatedUSBImpl.h index f55050d06bc..eefb16df8f6 100644 --- a/src/VBox/Main/include/EmulatedUSBImpl.h +++ b/src/VBox/Main/include/EmulatedUSBImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_EMULATEDUSBIMPL -#define ____H_EMULATEDUSBIMPL +#ifndef MAIN_INCLUDED_EmulatedUSBImpl_h +#define MAIN_INCLUDED_EmulatedUSBImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -81,6 +81,6 @@ private: Data m; }; -#endif +#endif /* !MAIN_INCLUDED_EmulatedUSBImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/EventImpl.h b/src/VBox/Main/include/EventImpl.h index 45cf9f35762..18ec9f4f1b2 100644 --- a/src/VBox/Main/include/EventImpl.h +++ b/src/VBox/Main/include/EventImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_EVENTIMPL -#define ____H_EVENTIMPL +#ifndef MAIN_INCLUDED_EventImpl_h +#define MAIN_INCLUDED_EventImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -179,4 +179,4 @@ private: }; -#endif // ____H_EVENTIMPL +#endif /* !MAIN_INCLUDED_EventImpl_h */ diff --git a/src/VBox/Main/include/ExtPackManagerImpl.h b/src/VBox/Main/include/ExtPackManagerImpl.h index 3ef261639e3..67b82cad960 100644 --- a/src/VBox/Main/include/ExtPackManagerImpl.h +++ b/src/VBox/Main/include/ExtPackManagerImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_EXTPACKMANAGERIMPL -#define ____H_EXTPACKMANAGERIMPL +#ifndef MAIN_INCLUDED_ExtPackManagerImpl_h +#define MAIN_INCLUDED_ExtPackManagerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -286,5 +286,5 @@ private: friend class ExtPackUninstallTask; }; -#endif +#endif /* !MAIN_INCLUDED_ExtPackManagerImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ExtPackUtil.h b/src/VBox/Main/include/ExtPackUtil.h index 8a6dae37c13..7b004893dca 100644 --- a/src/VBox/Main/include/ExtPackUtil.h +++ b/src/VBox/Main/include/ExtPackUtil.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_EXTPACKUTIL -#define ____H_EXTPACKUTIL +#ifndef MAIN_INCLUDED_ExtPackUtil_h +#define MAIN_INCLUDED_ExtPackUtil_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -142,5 +142,5 @@ int VBoxExtPackValidateTarball(RTFILE hTarballFile, const char * PRTMANIFEST phValidManifest, PRTVFSFILE phXmlFile, RTCString *pStrDigest); #endif /* __cplusplus */ -#endif +#endif /* !MAIN_INCLUDED_ExtPackUtil_h */ diff --git a/src/VBox/Main/include/Global.h b/src/VBox/Main/include/Global.h index a11be6e9025..7a40e1c8189 100644 --- a/src/VBox/Main/include/Global.h +++ b/src/VBox/Main/include/Global.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GLOBAL -#define ____H_GLOBAL +#ifndef MAIN_INCLUDED_Global_h +#define MAIN_INCLUDED_Global_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -192,5 +192,5 @@ public: static HRESULT vboxStatusCodeToCOM(int aVBoxStatus); }; -#endif /* !____H_GLOBAL */ +#endif /* !MAIN_INCLUDED_Global_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/GuestCtrlImplPrivate.h b/src/VBox/Main/include/GuestCtrlImplPrivate.h index 32b280fc9e5..87cfd69983b 100644 --- a/src/VBox/Main/include/GuestCtrlImplPrivate.h +++ b/src/VBox/Main/include/GuestCtrlImplPrivate.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTIMPLPRIVATE -#define ____H_GUESTIMPLPRIVATE +#ifndef MAIN_INCLUDED_GuestCtrlImplPrivate_h +#define MAIN_INCLUDED_GuestCtrlImplPrivate_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -1211,5 +1211,5 @@ protected: uint32_t mObjectID; /** @} */ }; -#endif // !____H_GUESTIMPLPRIVATE +#endif /* !MAIN_INCLUDED_GuestCtrlImplPrivate_h */ diff --git a/src/VBox/Main/include/GuestDirectoryImpl.h b/src/VBox/Main/include/GuestDirectoryImpl.h index ef16446275f..7b61d601ceb 100644 --- a/src/VBox/Main/include/GuestDirectoryImpl.h +++ b/src/VBox/Main/include/GuestDirectoryImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTDIRECTORYIMPL -#define ____H_GUESTDIRECTORYIMPL +#ifndef MAIN_INCLUDED_GuestDirectoryImpl_h +#define MAIN_INCLUDED_GuestDirectoryImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -86,5 +86,5 @@ private: } mData; }; -#endif /* !____H_GUESTDIRECTORYIMPL */ +#endif /* !MAIN_INCLUDED_GuestDirectoryImpl_h */ diff --git a/src/VBox/Main/include/GuestDnDPrivate.h b/src/VBox/Main/include/GuestDnDPrivate.h index 5e92641c4b6..3c3c1adb15c 100644 --- a/src/VBox/Main/include/GuestDnDPrivate.h +++ b/src/VBox/Main/include/GuestDnDPrivate.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTDNDPRIVATE -#define ____H_GUESTDNDPRIVATE +#ifndef MAIN_INCLUDED_GuestDnDPrivate_h +#define MAIN_INCLUDED_GuestDnDPrivate_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -1195,5 +1195,5 @@ protected: GuestDnDMsgList m_lstMsgOut; } mDataBase; }; -#endif /* ____H_GUESTDNDPRIVATE */ +#endif /* !MAIN_INCLUDED_GuestDnDPrivate_h */ diff --git a/src/VBox/Main/include/GuestDnDSourceImpl.h b/src/VBox/Main/include/GuestDnDSourceImpl.h index 3a7257354ba..df10b95c586 100644 --- a/src/VBox/Main/include/GuestDnDSourceImpl.h +++ b/src/VBox/Main/include/GuestDnDSourceImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTDNDSOURCEIMPL -#define ____H_GUESTDNDSOURCEIMPL +#ifndef MAIN_INCLUDED_GuestDnDSourceImpl_h +#define MAIN_INCLUDED_GuestDnDSourceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -117,5 +117,5 @@ protected: friend class RecvDataTask; }; -#endif /* !____H_GUESTDNDSOURCEIMPL */ +#endif /* !MAIN_INCLUDED_GuestDnDSourceImpl_h */ diff --git a/src/VBox/Main/include/GuestDnDTargetImpl.h b/src/VBox/Main/include/GuestDnDTargetImpl.h index f7d82e5e252..11f90b645f3 100644 --- a/src/VBox/Main/include/GuestDnDTargetImpl.h +++ b/src/VBox/Main/include/GuestDnDTargetImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTDNDTARGETIMPL -#define ____H_GUESTDNDTARGETIMPL +#ifndef MAIN_INCLUDED_GuestDnDTargetImpl_h +#define MAIN_INCLUDED_GuestDnDTargetImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -109,5 +109,5 @@ protected: friend class SendDataTask; }; -#endif /* !____H_GUESTDNDTARGETIMPL */ +#endif /* !MAIN_INCLUDED_GuestDnDTargetImpl_h */ diff --git a/src/VBox/Main/include/GuestFileImpl.h b/src/VBox/Main/include/GuestFileImpl.h index 2554fc51929..45375d31cad 100644 --- a/src/VBox/Main/include/GuestFileImpl.h +++ b/src/VBox/Main/include/GuestFileImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTFILEIMPL -#define ____H_GUESTFILEIMPL +#ifndef MAIN_INCLUDED_GuestFileImpl_h +#define MAIN_INCLUDED_GuestFileImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -136,5 +136,5 @@ private: } mData; }; -#endif /* !____H_GUESTFILEIMPL */ +#endif /* !MAIN_INCLUDED_GuestFileImpl_h */ diff --git a/src/VBox/Main/include/GuestFsObjInfoImpl.h b/src/VBox/Main/include/GuestFsObjInfoImpl.h index 7da3b05913a..f4c9a4f9f04 100644 --- a/src/VBox/Main/include/GuestFsObjInfoImpl.h +++ b/src/VBox/Main/include/GuestFsObjInfoImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTFSOBJINFOIMPL -#define ____H_GUESTFSOBJINFOIMPL +#ifndef MAIN_INCLUDED_GuestFsObjInfoImpl_h +#define MAIN_INCLUDED_GuestFsObjInfoImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -71,5 +71,5 @@ private: GuestFsObjData mData; }; -#endif /* !____H_GUESTFSOBJINFOIMPL */ +#endif /* !MAIN_INCLUDED_GuestFsObjInfoImpl_h */ diff --git a/src/VBox/Main/include/GuestImpl.h b/src/VBox/Main/include/GuestImpl.h index e1c75097d23..c65e1871097 100644 --- a/src/VBox/Main/include/GuestImpl.h +++ b/src/VBox/Main/include/GuestImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTIMPL -#define ____H_GUESTIMPL +#ifndef MAIN_INCLUDED_GuestImpl_h +#define MAIN_INCLUDED_GuestImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -247,5 +247,5 @@ private: }; #define GUEST_MAGIC 0xCEED2006u /** @todo r=andy Not very well defined!? */ -#endif // ____H_GUESTIMPL +#endif /* !MAIN_INCLUDED_GuestImpl_h */ diff --git a/src/VBox/Main/include/GuestOSTypeImpl.h b/src/VBox/Main/include/GuestOSTypeImpl.h index 830f70b574a..e5bb5c26034 100644 --- a/src/VBox/Main/include/GuestOSTypeImpl.h +++ b/src/VBox/Main/include/GuestOSTypeImpl.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTOSTYPEIMPL -#define ____H_GUESTOSTYPEIMPL +#ifndef MAIN_INCLUDED_GuestOSTypeImpl_h +#define MAIN_INCLUDED_GuestOSTypeImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -109,5 +109,5 @@ private: const AudioCodecType_T mAudioCodecType; }; -#endif // ____H_GUESTOSTYPEIMPL +#endif /* !MAIN_INCLUDED_GuestOSTypeImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/GuestProcessImpl.h b/src/VBox/Main/include/GuestProcessImpl.h index 515698a0b3b..b1dca6e1fc4 100644 --- a/src/VBox/Main/include/GuestProcessImpl.h +++ b/src/VBox/Main/include/GuestProcessImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTPROCESSIMPL -#define ____H_GUESTPROCESSIMPL +#ifndef MAIN_INCLUDED_GuestProcessImpl_h +#define MAIN_INCLUDED_GuestProcessImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -276,5 +276,5 @@ protected: GuestProcessStream mStdErr; }; -#endif /* !____H_GUESTPROCESSIMPL */ +#endif /* !MAIN_INCLUDED_GuestProcessImpl_h */ diff --git a/src/VBox/Main/include/GuestSessionImpl.h b/src/VBox/Main/include/GuestSessionImpl.h index b12383d5b34..ba3fdbc5da1 100644 --- a/src/VBox/Main/include/GuestSessionImpl.h +++ b/src/VBox/Main/include/GuestSessionImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTSESSIONIMPL -#define ____H_GUESTSESSIONIMPL +#ifndef MAIN_INCLUDED_GuestSessionImpl_h +#define MAIN_INCLUDED_GuestSessionImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -428,5 +428,5 @@ private: } mData; }; -#endif /* !____H_GUESTSESSIONIMPL */ +#endif /* !MAIN_INCLUDED_GuestSessionImpl_h */ diff --git a/src/VBox/Main/include/GuestSessionImplTasks.h b/src/VBox/Main/include/GuestSessionImplTasks.h index 7ce880056cc..2319b36da33 100644 --- a/src/VBox/Main/include/GuestSessionImplTasks.h +++ b/src/VBox/Main/include/GuestSessionImplTasks.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_GUESTSESSIONIMPLTASKS -#define ____H_GUESTSESSIONIMPLTASKS +#ifndef MAIN_INCLUDED_GuestSessionImplTasks_h +#define MAIN_INCLUDED_GuestSessionImplTasks_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -377,4 +377,4 @@ protected: /** Update flags. */ uint32_t mFlags; }; -#endif /* !____H_GUESTSESSIONIMPLTASKS */ +#endif /* !MAIN_INCLUDED_GuestSessionImplTasks_h */ diff --git a/src/VBox/Main/include/HGCM.h b/src/VBox/Main/include/HGCM.h index 532748f9641..2c9f4fa14e9 100644 --- a/src/VBox/Main/include/HGCM.h +++ b/src/VBox/Main/include/HGCM.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HGCM -#define ____H_HGCM +#ifndef MAIN_INCLUDED_HGCM_h +#define MAIN_INCLUDED_HGCM_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -61,5 +61,5 @@ int HGCMHostLoadState(PSSMHANDLE pSSM, uint32_t uVersion); RT_C_DECLS_END -#endif +#endif /* !MAIN_INCLUDED_HGCM_h */ diff --git a/src/VBox/Main/include/HGCMObjects.h b/src/VBox/Main/include/HGCMObjects.h index 28bb74c7cfe..c3c04fd0a79 100644 --- a/src/VBox/Main/include/HGCMObjects.h +++ b/src/VBox/Main/include/HGCMObjects.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HGCMOBJECTS -#define ____H_HGCMOBJECTS +#ifndef MAIN_INCLUDED_HGCMObjects_h +#define MAIN_INCLUDED_HGCMObjects_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -125,4 +125,4 @@ uint32_t hgcmObjQueryHandleCount(); void hgcmObjSetHandleCount(uint32_t u32HandleCount); -#endif +#endif /* !MAIN_INCLUDED_HGCMObjects_h */ diff --git a/src/VBox/Main/include/HGCMThread.h b/src/VBox/Main/include/HGCMThread.h index eeeb4ee2ca3..3832b6ead45 100644 --- a/src/VBox/Main/include/HGCMThread.h +++ b/src/VBox/Main/include/HGCMThread.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HGCMTHREAD -#define ____H_HGCMTHREAD +#ifndef MAIN_INCLUDED_HGCMThread_h +#define MAIN_INCLUDED_HGCMThread_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -222,5 +222,5 @@ int hgcmMsgGet(HGCMThread *pThread, HGCMMsgCore **ppMsg); int hgcmMsgComplete(HGCMMsgCore *pMsg, int32_t result); -#endif +#endif /* !MAIN_INCLUDED_HGCMThread_h */ diff --git a/src/VBox/Main/include/HashedPw.h b/src/VBox/Main/include/HashedPw.h index 82e04b924c3..21a766e9f32 100644 --- a/src/VBox/Main/include/HashedPw.h +++ b/src/VBox/Main/include/HashedPw.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HASHEDPW -#define ____H_HASHEDPW +#ifndef MAIN_INCLUDED_HashedPw_h +#define MAIN_INCLUDED_HashedPw_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -26,5 +26,5 @@ bool VBoxIsPasswordHashed(RTCString const *a_pstrPassword); void VBoxHashPassword(RTCString *a_pstrPassword); -#endif +#endif /* !MAIN_INCLUDED_HashedPw_h */ diff --git a/src/VBox/Main/include/HostHardwareLinux.h b/src/VBox/Main/include/HostHardwareLinux.h index b34fead3a1a..d1503020af6 100644 --- a/src/VBox/Main/include/HostHardwareLinux.h +++ b/src/VBox/Main/include/HostHardwareLinux.h @@ -18,8 +18,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HOSTHARDWARELINUX -#define ____H_HOSTHARDWARELINUX +#ifndef MAIN_INCLUDED_HostHardwareLinux_h +#define MAIN_INCLUDED_HostHardwareLinux_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -174,5 +174,5 @@ public: } }; -#endif /* ____H_HOSTHARDWARELINUX */ +#endif /* !MAIN_INCLUDED_HostHardwareLinux_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/HostImpl.h b/src/VBox/Main/include/HostImpl.h index 24e7c9fcef5..dc0d2770e27 100644 --- a/src/VBox/Main/include/HostImpl.h +++ b/src/VBox/Main/include/HostImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HOSTIMPL -#define ____H_HOSTIMPL +#ifndef MAIN_INCLUDED_HostImpl_h +#define MAIN_INCLUDED_HostImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -187,5 +187,5 @@ private: Data *m; }; -#endif // !____H_HOSTIMPL +#endif /* !MAIN_INCLUDED_HostImpl_h */ diff --git a/src/VBox/Main/include/HostNetworkInterfaceImpl.h b/src/VBox/Main/include/HostNetworkInterfaceImpl.h index 796a4b87329..80ad88688f0 100644 --- a/src/VBox/Main/include/HostNetworkInterfaceImpl.h +++ b/src/VBox/Main/include/HostNetworkInterfaceImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HOSTNETWORKINTERFACEIMPL -#define ____H_HOSTNETWORKINTERFACEIMPL +#ifndef MAIN_INCLUDED_HostNetworkInterfaceImpl_h +#define MAIN_INCLUDED_HostNetworkInterfaceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -118,5 +118,5 @@ private: typedef std::list<ComObjPtr<HostNetworkInterface> > HostNetworkInterfaceList; -#endif // ____H_H_HOSTNETWORKINTERFACEIMPL +#endif /* !MAIN_INCLUDED_HostNetworkInterfaceImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/HostPower.h b/src/VBox/Main/include/HostPower.h index 415756430b4..98d36912a57 100644 --- a/src/VBox/Main/include/HostPower.h +++ b/src/VBox/Main/include/HostPower.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HOSTPOWER -#define ____H_HOSTPOWER +#ifndef MAIN_INCLUDED_HostPower_h +#define MAIN_INCLUDED_HostPower_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -122,5 +122,5 @@ private: }; # endif -#endif /* !____H_HOSTPOWER */ +#endif /* !MAIN_INCLUDED_HostPower_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/HostUSBDeviceImpl.h b/src/VBox/Main/include/HostUSBDeviceImpl.h index d773f1dbdb6..34c87ea89c3 100644 --- a/src/VBox/Main/include/HostUSBDeviceImpl.h +++ b/src/VBox/Main/include/HostUSBDeviceImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HOSTUSBDEVICEIMPL -#define ____H_HOSTUSBDEVICEIMPL +#ifndef MAIN_INCLUDED_HostUSBDeviceImpl_h +#define MAIN_INCLUDED_HostUSBDeviceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -313,5 +313,5 @@ private: void *m_pvBackendUser; }; -#endif // ____H_HOSTUSBDEVICEIMPL +#endif /* !MAIN_INCLUDED_HostUSBDeviceImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/HostVideoInputDeviceImpl.h b/src/VBox/Main/include/HostVideoInputDeviceImpl.h index 8cdb5041901..c23eaf7bf95 100644 --- a/src/VBox/Main/include/HostVideoInputDeviceImpl.h +++ b/src/VBox/Main/include/HostVideoInputDeviceImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_HOSTVIDEOINPUTDEVICEIMPL -#define ____H_HOSTVIDEOINPUTDEVICEIMPL +#ifndef MAIN_INCLUDED_HostVideoInputDeviceImpl_h +#define MAIN_INCLUDED_HostVideoInputDeviceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -67,6 +67,6 @@ private: Data m; }; -#endif +#endif /* !MAIN_INCLUDED_HostVideoInputDeviceImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/KeyboardImpl.h b/src/VBox/Main/include/KeyboardImpl.h index 8c7d4f05a18..05f07fae24b 100644 --- a/src/VBox/Main/include/KeyboardImpl.h +++ b/src/VBox/Main/include/KeyboardImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_KEYBOARDIMPL -#define ____H_KEYBOARDIMPL +#ifndef MAIN_INCLUDED_KeyboardImpl_h +#define MAIN_INCLUDED_KeyboardImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -95,5 +95,5 @@ private: const ComObjPtr<EventSource> mEventSource; }; -#endif // !____H_KEYBOARDIMPL +#endif /* !MAIN_INCLUDED_KeyboardImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/Logging.h b/src/VBox/Main/include/Logging.h index 7920d1a38d6..0d4e04470a0 100644 --- a/src/VBox/Main/include/Logging.h +++ b/src/VBox/Main/include/Logging.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_LOGGING -#define ____H_LOGGING +#ifndef MAIN_INCLUDED_Logging_h +#define MAIN_INCLUDED_Logging_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -59,5 +59,5 @@ #include <VBox/log.h> -#endif // !____H_LOGGING +#endif /* !MAIN_INCLUDED_Logging_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/LoggingNew.h b/src/VBox/Main/include/LoggingNew.h index 9b070fce609..5bac699efbe 100644 --- a/src/VBox/Main/include/LoggingNew.h +++ b/src/VBox/Main/include/LoggingNew.h @@ -15,16 +15,16 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_LOGGINGNEW -#define ____H_LOGGINGNEW +#ifndef MAIN_INCLUDED_LoggingNew_h +#define MAIN_INCLUDED_LoggingNew_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif -#ifdef ____H_LOGGING +#ifdef MAIN_INCLUDED_Logging_h # error "You must include LoggingNew.h as the first include!" #endif -#define ____H_LOGGING /* Prevent Logging.h from being included. */ +#define MAIN_INCLUDED_Logging_h /* Prevent Logging.h from being included. */ #ifndef LOG_GROUP # error "You must define LOG_GROUP immediately before including LoggingNew.h!" @@ -36,6 +36,6 @@ #include <VBox/log.h> -#endif // !____H_LOGGINGNEW +#endif /* !MAIN_INCLUDED_LoggingNew_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MachineDebuggerImpl.h b/src/VBox/Main/include/MachineDebuggerImpl.h index b2c016d4c70..2068b9fe25b 100644 --- a/src/VBox/Main/include/MachineDebuggerImpl.h +++ b/src/VBox/Main/include/MachineDebuggerImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MACHINEDEBUGGER -#define ____H_MACHINEDEBUGGER +#ifndef MAIN_INCLUDED_MachineDebuggerImpl_h +#define MAIN_INCLUDED_MachineDebuggerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -160,5 +160,5 @@ private: /** @} */ }; -#endif /* !____H_MACHINEDEBUGGER */ +#endif /* !MAIN_INCLUDED_MachineDebuggerImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MachineImpl.h b/src/VBox/Main/include/MachineImpl.h index d0930792ebf..eec922cce69 100644 --- a/src/VBox/Main/include/MachineImpl.h +++ b/src/VBox/Main/include/MachineImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MACHINEIMPL -#define ____H_MACHINEIMPL +#ifndef MAIN_INCLUDED_MachineImpl_h +#define MAIN_INCLUDED_MachineImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -1589,5 +1589,5 @@ inline const Guid &Machine::i_getSnapshotId() const } -#endif // ____H_MACHINEIMPL +#endif /* !MAIN_INCLUDED_MachineImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MachineImplCloneVM.h b/src/VBox/Main/include/MachineImplCloneVM.h index 20c8d47b585..933876a0b57 100644 --- a/src/VBox/Main/include/MachineImplCloneVM.h +++ b/src/VBox/Main/include/MachineImplCloneVM.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MACHINEIMPLCLONEVM -#define ____H_MACHINEIMPLCLONEVM +#ifndef MAIN_INCLUDED_MachineImplCloneVM_h +#define MAIN_INCLUDED_MachineImplCloneVM_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -46,6 +46,6 @@ protected: friend struct MachineCloneVMPrivate; }; -#endif // ____H_MACHINEIMPLCLONEVM +#endif /* !MAIN_INCLUDED_MachineImplCloneVM_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MachineImplMoveVM.h b/src/VBox/Main/include/MachineImplMoveVM.h index 51d1c13d343..9fd6a786e26 100644 --- a/src/VBox/Main/include/MachineImplMoveVM.h +++ b/src/VBox/Main/include/MachineImplMoveVM.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MACHINEIMPLMOVEVM -#define ____H_MACHINEIMPLMOVEVM +#ifndef MAIN_INCLUDED_MachineImplMoveVM_h +#define MAIN_INCLUDED_MachineImplMoveVM_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -140,6 +140,6 @@ public: bool isMediumTypeSupportedForMoving(const ComPtr<IMedium> &pMedium); }; -#endif // ____H_MACHINEIMPLMOVEVM +#endif /* !MAIN_INCLUDED_MachineImplMoveVM_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/Matching.h b/src/VBox/Main/include/Matching.h index 0038cb5a7de..c36a3e9cfa5 100644 --- a/src/VBox/Main/include/Matching.h +++ b/src/VBox/Main/include/Matching.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MATCHING -#define ____H_MATCHING +#ifndef MAIN_INCLUDED_Matching_h +#define MAIN_INCLUDED_Matching_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -526,5 +526,5 @@ private: } /* namespace matching */ -#endif // !____H_MATCHING +#endif /* !MAIN_INCLUDED_Matching_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MediumAttachmentImpl.h b/src/VBox/Main/include/MediumAttachmentImpl.h index 46136226435..72c67827b20 100644 --- a/src/VBox/Main/include/MediumAttachmentImpl.h +++ b/src/VBox/Main/include/MediumAttachmentImpl.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MEDIUMATTACHMENTIMPL -#define ____H_MEDIUMATTACHMENTIMPL +#ifndef MAIN_INCLUDED_MediumAttachmentImpl_h +#define MAIN_INCLUDED_MediumAttachmentImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -131,5 +131,5 @@ private: Utf8Str mLogName; /**< For logging purposes */ }; -#endif // !____H_MEDIUMATTACHMENTIMPL +#endif /* !MAIN_INCLUDED_MediumAttachmentImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MediumFormatImpl.h b/src/VBox/Main/include/MediumFormatImpl.h index c781805b19f..f57befbf0b2 100644 --- a/src/VBox/Main/include/MediumFormatImpl.h +++ b/src/VBox/Main/include/MediumFormatImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MEDIUMFORMATIMPL -#define ____H_MEDIUMFORMATIMPL +#ifndef MAIN_INCLUDED_MediumFormatImpl_h +#define MAIN_INCLUDED_MediumFormatImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -110,6 +110,6 @@ private: Data m; }; -#endif +#endif /* !MAIN_INCLUDED_MediumFormatImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MediumIOImpl.h b/src/VBox/Main/include/MediumIOImpl.h index e4aa46c2a5c..93b1f6923b0 100644 --- a/src/VBox/Main/include/MediumIOImpl.h +++ b/src/VBox/Main/include/MediumIOImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MEDIUMIOIMPL -#define ____H_MEDIUMIOIMPL +#ifndef MAIN_INCLUDED_MediumIOImpl_h +#define MAIN_INCLUDED_MediumIOImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -77,6 +77,6 @@ private: friend class StreamTask; }; -#endif +#endif /* !MAIN_INCLUDED_MediumIOImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MediumImpl.h b/src/VBox/Main/include/MediumImpl.h index ca5c8d82ebc..384f55e15a1 100644 --- a/src/VBox/Main/include/MediumImpl.h +++ b/src/VBox/Main/include/MediumImpl.h @@ -15,9 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - -#ifndef ____H_MEDIUMIMPL -#define ____H_MEDIUMIMPL +#ifndef MAIN_INCLUDED_MediumImpl_h +#define MAIN_INCLUDED_MediumImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -465,5 +464,5 @@ struct MediumCryptoFilterSettings -#endif /* !____H_MEDIUMIMPL */ +#endif /* !MAIN_INCLUDED_MediumImpl_h */ diff --git a/src/VBox/Main/include/MediumLock.h b/src/VBox/Main/include/MediumLock.h index fe9836ef107..c24dc133e10 100644 --- a/src/VBox/Main/include/MediumLock.h +++ b/src/VBox/Main/include/MediumLock.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MEDIUMLOCK -#define ____H_MEDIUMLOCK +#ifndef MAIN_INCLUDED_MediumLock_h +#define MAIN_INCLUDED_MediumLock_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -337,5 +337,5 @@ private: bool mIsLocked; }; -#endif /* !____H_MEDIUMLOCK */ +#endif /* !MAIN_INCLUDED_MediumLock_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/MouseImpl.h b/src/VBox/Main/include/MouseImpl.h index f4e068910b2..7a27ec88f1c 100644 --- a/src/VBox/Main/include/MouseImpl.h +++ b/src/VBox/Main/include/MouseImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_MOUSEIMPL -#define ____H_MOUSEIMPL +#ifndef MAIN_INCLUDED_MouseImpl_h +#define MAIN_INCLUDED_MouseImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -155,5 +155,5 @@ private: uint32_t u32ScanTime); }; -#endif // !____H_MOUSEIMPL +#endif /* !MAIN_INCLUDED_MouseImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/NATEngineImpl.h b/src/VBox/Main/include/NATEngineImpl.h index fd08bbbfe02..3e9ca04cac0 100644 --- a/src/VBox/Main/include/NATEngineImpl.h +++ b/src/VBox/Main/include/NATEngineImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_NATENGINE -#define ____H_NATENGINE +#ifndef MAIN_INCLUDED_NATEngineImpl_h +#define MAIN_INCLUDED_NATEngineImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -109,4 +109,4 @@ private: Machine * const mParent; INetworkAdapter * const mAdapter; }; -#endif +#endif /* !MAIN_INCLUDED_NATEngineImpl_h */ diff --git a/src/VBox/Main/include/NATNetworkImpl.h b/src/VBox/Main/include/NATNetworkImpl.h index 3ed3d095598..3d40b23f0f1 100644 --- a/src/VBox/Main/include/NATNetworkImpl.h +++ b/src/VBox/Main/include/NATNetworkImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_NATNETWORKIMPL -#define ____H_NATNETWORKIMPL +#ifndef MAIN_INCLUDED_NATNetworkImpl_h +#define MAIN_INCLUDED_NATNetworkImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -128,4 +128,4 @@ private: Data *m; }; -#endif // !____H_H_NATNETWORKIMPL +#endif /* !MAIN_INCLUDED_NATNetworkImpl_h */ diff --git a/src/VBox/Main/include/NetworkAdapterImpl.h b/src/VBox/Main/include/NetworkAdapterImpl.h index 9077e0eb825..03e27e5a303 100644 --- a/src/VBox/Main/include/NetworkAdapterImpl.h +++ b/src/VBox/Main/include/NetworkAdapterImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_NETWORKADAPTER -#define ____H_NETWORKADAPTER +#ifndef MAIN_INCLUDED_NetworkAdapterImpl_h +#define MAIN_INCLUDED_NetworkAdapterImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -123,5 +123,5 @@ private: Backupable<settings::NetworkAdapter> mData; }; -#endif // ____H_NETWORKADAPTER +#endif /* !MAIN_INCLUDED_NetworkAdapterImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/NetworkServiceRunner.h b/src/VBox/Main/include/NetworkServiceRunner.h index 09959cdcb5f..e518371af04 100644 --- a/src/VBox/Main/include/NetworkServiceRunner.h +++ b/src/VBox/Main/include/NetworkServiceRunner.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_NETWORKSERVICERUNNER -#define ____H_NETWORKSERVICERUNNER +#ifndef MAIN_INCLUDED_NetworkServiceRunner_h +#define MAIN_INCLUDED_NetworkServiceRunner_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -62,5 +62,5 @@ private: Data *m; }; -#endif +#endif /* !MAIN_INCLUDED_NetworkServiceRunner_h */ diff --git a/src/VBox/Main/include/Nvram.h b/src/VBox/Main/include/Nvram.h index 496681817c4..1b69ccb96ae 100644 --- a/src/VBox/Main/include/Nvram.h +++ b/src/VBox/Main/include/Nvram.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_NVRAM -#define ____H_NVRAM +#ifndef MAIN_INCLUDED_Nvram_h +#define MAIN_INCLUDED_Nvram_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -50,5 +50,5 @@ private: struct NVRAM *mpDrv; }; -#endif /* !____H_NVRAM */ +#endif /* !MAIN_INCLUDED_Nvram_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ObjectState.h b/src/VBox/Main/include/ObjectState.h index 879c267abfe..32252cb4bd1 100644 --- a/src/VBox/Main/include/ObjectState.h +++ b/src/VBox/Main/include/ObjectState.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_OBJECTSTATE -#define ____H_OBJECTSTATE +#ifndef MAIN_INCLUDED_ObjectState_h +#define MAIN_INCLUDED_ObjectState_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -137,4 +137,4 @@ private: DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(ObjectState); /* Shuts up MSC warning C4625. */ }; -#endif // !____H_OBJECTSTATE +#endif /* !MAIN_INCLUDED_ObjectState_h */ diff --git a/src/VBox/Main/include/PCIDeviceAttachmentImpl.h b/src/VBox/Main/include/PCIDeviceAttachmentImpl.h index 40ab646a91d..2fd663a007e 100644 --- a/src/VBox/Main/include/PCIDeviceAttachmentImpl.h +++ b/src/VBox/Main/include/PCIDeviceAttachmentImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_PCIDEVICEATTACHMENTIMPL -#define ____H_PCIDEVICEATTACHMENTIMPL +#ifndef MAIN_INCLUDED_PCIDeviceAttachmentImpl_h +#define MAIN_INCLUDED_PCIDeviceAttachmentImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -66,4 +66,4 @@ private: Data* m; }; -#endif // ____H_PCIDEVICEATTACHMENTIMPL +#endif /* !MAIN_INCLUDED_PCIDeviceAttachmentImpl_h */ diff --git a/src/VBox/Main/include/PCIRawDevImpl.h b/src/VBox/Main/include/PCIRawDevImpl.h index a818eae241a..1e09dd0a4c3 100644 --- a/src/VBox/Main/include/PCIRawDevImpl.h +++ b/src/VBox/Main/include/PCIRawDevImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_PCIRAWDEV -#define ____H_PCIRAWDEV +#ifndef MAIN_INCLUDED_PCIRawDevImpl_h +#define MAIN_INCLUDED_PCIRawDevImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -53,4 +53,4 @@ class PCIRawDev Console * const mParent; }; -#endif // !____H_PCIRAWDEV +#endif /* !MAIN_INCLUDED_PCIRawDevImpl_h */ diff --git a/src/VBox/Main/include/ParallelPortImpl.h b/src/VBox/Main/include/ParallelPortImpl.h index 53f9a812d82..10bc35a8cdb 100644 --- a/src/VBox/Main/include/ParallelPortImpl.h +++ b/src/VBox/Main/include/ParallelPortImpl.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_PARALLELPORTIMPL -#define ____H_PARALLELPORTIMPL +#ifndef MAIN_INCLUDED_ParallelPortImpl_h +#define MAIN_INCLUDED_ParallelPortImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -73,5 +73,5 @@ private: Data *m; }; -#endif // ____H_PARALLELPORTIMPL +#endif /* !MAIN_INCLUDED_ParallelPortImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/Performance.h b/src/VBox/Main/include/Performance.h index 307fac7c985..52e7de31039 100644 --- a/src/VBox/Main/include/Performance.h +++ b/src/VBox/Main/include/Performance.h @@ -14,8 +14,9 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___performance_h -#define ___performance_h + +#ifndef MAIN_INCLUDED_Performance_h +#define MAIN_INCLUDED_Performance_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -900,5 +901,5 @@ namespace pm void processMetricList(const com::Utf8Str &name, const ComPtr<IUnknown> object); }; } -#endif /* ___performance_h */ +#endif /* !MAIN_INCLUDED_Performance_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/PerformanceImpl.h b/src/VBox/Main/include/PerformanceImpl.h index 60112045eed..b4a9e005544 100644 --- a/src/VBox/Main/include/PerformanceImpl.h +++ b/src/VBox/Main/include/PerformanceImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_PERFORMANCEIMPL -#define ____H_PERFORMANCEIMPL +#ifndef MAIN_INCLUDED_PerformanceImpl_h +#define MAIN_INCLUDED_PerformanceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -192,5 +192,5 @@ private: Data m; }; -#endif //!____H_PERFORMANCEIMPL +#endif /* !MAIN_INCLUDED_PerformanceImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/ProgressImpl.h b/src/VBox/Main/include/ProgressImpl.h index 416fc4b223e..03b87f4b27d 100644 --- a/src/VBox/Main/include/ProgressImpl.h +++ b/src/VBox/Main/include/ProgressImpl.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_PROGRESSIMPL -#define ____H_PROGRESSIMPL +#ifndef MAIN_INCLUDED_ProgressImpl_h +#define MAIN_INCLUDED_ProgressImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -232,5 +232,5 @@ private: DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(Progress); /* Shuts up MSC warning C4625. */ }; -#endif /* ____H_PROGRESSIMPL */ +#endif /* !MAIN_INCLUDED_ProgressImpl_h */ diff --git a/src/VBox/Main/include/ProgressProxyImpl.h b/src/VBox/Main/include/ProgressProxyImpl.h index 45eead3bf34..1129ddd0f2c 100644 --- a/src/VBox/Main/include/ProgressProxyImpl.h +++ b/src/VBox/Main/include/ProgressProxyImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_PROGRESSPROXYIMPL -#define ____H_PROGRESSPROXYIMPL +#ifndef MAIN_INCLUDED_ProgressProxyImpl_h +#define MAIN_INCLUDED_ProgressProxyImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -116,5 +116,5 @@ private: }; -#endif /* !____H_PROGRESSPROXYIMPL */ +#endif /* !MAIN_INCLUDED_ProgressProxyImpl_h */ diff --git a/src/VBox/Main/include/QMTranslator.h b/src/VBox/Main/include/QMTranslator.h index 3a452cc8f89..cf2a4e5f324 100644 --- a/src/VBox/Main/include/QMTranslator.h +++ b/src/VBox/Main/include/QMTranslator.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_QMTRANSLATOR -#define ____H_QMTRANSLATOR +#ifndef MAIN_INCLUDED_QMTranslator_h +#define MAIN_INCLUDED_QMTranslator_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -56,5 +56,5 @@ private: QMTranslator(const QMTranslator &); }; -#endif /* !____H_QMTRANSLATOR */ +#endif /* !MAIN_INCLUDED_QMTranslator_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/Recording.h b/src/VBox/Main/include/Recording.h index baf746a4041..756f2564b05 100644 --- a/src/VBox/Main/include/Recording.h +++ b/src/VBox/Main/include/Recording.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_RECORDING -#define ____H_RECORDING +#ifndef MAIN_INCLUDED_Recording_h +#define MAIN_INCLUDED_Recording_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -137,5 +137,5 @@ protected: * need to have the same audio data at a specific point in time. */ RecordingBlockMap mapBlocksCommon; }; -#endif /* !____H_RECORDING */ +#endif /* !MAIN_INCLUDED_Recording_h */ diff --git a/src/VBox/Main/include/RecordingInternals.h b/src/VBox/Main/include/RecordingInternals.h index 9fdc26e6916..52d3fe3e83c 100644 --- a/src/VBox/Main/include/RecordingInternals.h +++ b/src/VBox/Main/include/RecordingInternals.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_RECORDINGINTERNALS -#define ____H_RECORDINGINTERNALS +#ifndef MAIN_INCLUDED_RecordingInternals_h +#define MAIN_INCLUDED_RecordingInternals_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -184,5 +184,5 @@ struct RecordingBlock /** List for keeping video recording (data) blocks. */ typedef std::list<RecordingBlock *> RecordingBlockList; -#endif +#endif /* !MAIN_INCLUDED_RecordingInternals_h */ diff --git a/src/VBox/Main/include/RecordingScreenSettingsImpl.h b/src/VBox/Main/include/RecordingScreenSettingsImpl.h index 99229b42a74..d2565337654 100644 --- a/src/VBox/Main/include/RecordingScreenSettingsImpl.h +++ b/src/VBox/Main/include/RecordingScreenSettingsImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_RecordingScreenSettings -#define ____H_RecordingScreenSettings +#ifndef MAIN_INCLUDED_RecordingScreenSettingsImpl_h +#define MAIN_INCLUDED_RecordingScreenSettingsImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -119,5 +119,5 @@ private: Data *m; }; -#endif // ____H_RecordingScreenSettings +#endif /* !MAIN_INCLUDED_RecordingScreenSettingsImpl_h */ diff --git a/src/VBox/Main/include/RecordingSettingsImpl.h b/src/VBox/Main/include/RecordingSettingsImpl.h index b053ca17738..510d05a7aee 100644 --- a/src/VBox/Main/include/RecordingSettingsImpl.h +++ b/src/VBox/Main/include/RecordingSettingsImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_RecordSettings -#define ____H_RecordSettings +#ifndef MAIN_INCLUDED_RecordingSettingsImpl_h +#define MAIN_INCLUDED_RecordingSettingsImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -87,5 +87,5 @@ private: Data *m; }; -#endif // !____H_RecordSettings +#endif /* !MAIN_INCLUDED_RecordingSettingsImpl_h */ diff --git a/src/VBox/Main/include/RecordingStream.h b/src/VBox/Main/include/RecordingStream.h index 3438679b02b..d454fb76b62 100644 --- a/src/VBox/Main/include/RecordingStream.h +++ b/src/VBox/Main/include/RecordingStream.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_RECORDINGSTREAM -#define ____H_RECORDINGSTREAM +#ifndef MAIN_INCLUDED_RecordingStream_h +#define MAIN_INCLUDED_RecordingStream_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -218,5 +218,5 @@ protected: /** Vector of recording streams. */ typedef std::vector <RecordingStream *> RecordingStreams; -#endif +#endif /* !MAIN_INCLUDED_RecordingStream_h */ diff --git a/src/VBox/Main/include/RecordingUtils.h b/src/VBox/Main/include/RecordingUtils.h index 525615d11a6..1feaf1a6842 100644 --- a/src/VBox/Main/include/RecordingUtils.h +++ b/src/VBox/Main/include/RecordingUtils.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_RECORDINGUTILS -#define ____H_RECORDINGUTILS +#ifndef MAIN_INCLUDED_RecordingUtils_h +#define MAIN_INCLUDED_RecordingUtils_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -204,5 +204,5 @@ int RecordingUtilsRGBToYUV(uint32_t uPixelFormat, uint8_t *paDst, uint32_t uDstWidth, uint32_t uDstHeight, uint8_t *paSrc, uint32_t uSrcWidth, uint32_t uSrcHeight); -#endif +#endif /* !MAIN_INCLUDED_RecordingUtils_h */ diff --git a/src/VBox/Main/include/RemoteUSBBackend.h b/src/VBox/Main/include/RemoteUSBBackend.h index faaa38d9c77..2c5f0ab11f5 100644 --- a/src/VBox/Main/include/RemoteUSBBackend.h +++ b/src/VBox/Main/include/RemoteUSBBackend.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_REMOTEUSBBACKEND -#define ____H_REMOTEUSBBACKEND +#ifndef MAIN_INCLUDED_RemoteUSBBackend_h +#define MAIN_INCLUDED_RemoteUSBBackend_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -139,5 +139,5 @@ class RemoteUSBBackend: public RemoteUSBBackendListable bool mfDescExt; }; -#endif /* ____H_REMOTEUSBBACKEND */ +#endif /* !MAIN_INCLUDED_RemoteUSBBackend_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/RemoteUSBDeviceImpl.h b/src/VBox/Main/include/RemoteUSBDeviceImpl.h index f515966ade3..14867d8559b 100644 --- a/src/VBox/Main/include/RemoteUSBDeviceImpl.h +++ b/src/VBox/Main/include/RemoteUSBDeviceImpl.h @@ -18,8 +18,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_REMOTEUSBDEVICEIMPL -#define ____H_REMOTEUSBDEVICEIMPL +#ifndef MAIN_INCLUDED_RemoteUSBDeviceImpl_h +#define MAIN_INCLUDED_RemoteUSBDeviceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -122,5 +122,5 @@ private: Data mData; }; -#endif // ____H_REMOTEUSBDEVICEIMPL +#endif /* !MAIN_INCLUDED_RemoteUSBDeviceImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/SecretKeyStore.h b/src/VBox/Main/include/SecretKeyStore.h index 68fd626f849..c9833e6c50a 100644 --- a/src/VBox/Main/include/SecretKeyStore.h +++ b/src/VBox/Main/include/SecretKeyStore.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_SECRETKEYSTORE -#define ____H_SECRETKEYSTORE +#ifndef MAIN_INCLUDED_SecretKeyStore_h +#define MAIN_INCLUDED_SecretKeyStore_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -190,4 +190,4 @@ class SecretKeyStore bool m_fKeyBufNonPageable; }; -#endif /* !____H_SECRETKEYSTORE */ +#endif /* !MAIN_INCLUDED_SecretKeyStore_h */ diff --git a/src/VBox/Main/include/SerialPortImpl.h b/src/VBox/Main/include/SerialPortImpl.h index 5323ad79c29..b8631edc273 100644 --- a/src/VBox/Main/include/SerialPortImpl.h +++ b/src/VBox/Main/include/SerialPortImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_SERIALPORTIMPL -#define ____H_SERIALPORTIMPL +#ifndef MAIN_INCLUDED_SerialPortImpl_h +#define MAIN_INCLUDED_SerialPortImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -88,5 +88,5 @@ private: Data *m; }; -#endif // ____H_SERIALPORTIMPL +#endif /* !MAIN_INCLUDED_SerialPortImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/SessionImpl.h b/src/VBox/Main/include/SessionImpl.h index 737098294b7..273cd0c1ab1 100644 --- a/src/VBox/Main/include/SessionImpl.h +++ b/src/VBox/Main/include/SessionImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_SESSIONIMPL -#define ____H_SESSIONIMPL +#ifndef MAIN_INCLUDED_SessionImpl_h +#define MAIN_INCLUDED_SessionImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -168,5 +168,5 @@ private: ClientTokenHolder *mClientTokenHolder; }; -#endif // !____H_SESSIONIMPL +#endif /* !MAIN_INCLUDED_SessionImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/SharedFolderImpl.h b/src/VBox/Main/include/SharedFolderImpl.h index d4822e7f44f..55c23b71ee3 100644 --- a/src/VBox/Main/include/SharedFolderImpl.h +++ b/src/VBox/Main/include/SharedFolderImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_SHAREDFOLDERIMPL -#define ____H_SHAREDFOLDERIMPL +#ifndef MAIN_INCLUDED_SharedFolderImpl_h +#define MAIN_INCLUDED_SharedFolderImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -115,5 +115,5 @@ private: Data *m; }; -#endif // !____H_SHAREDFOLDERIMPL +#endif /* !MAIN_INCLUDED_SharedFolderImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/SnapshotImpl.h b/src/VBox/Main/include/SnapshotImpl.h index 109c96ae94c..382c8b1ce9b 100644 --- a/src/VBox/Main/include/SnapshotImpl.h +++ b/src/VBox/Main/include/SnapshotImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_SNAPSHOTIMPL -#define ____H_SNAPSHOTIMPL +#ifndef MAIN_INCLUDED_SnapshotImpl_h +#define MAIN_INCLUDED_SnapshotImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -128,6 +128,6 @@ private: Data *m; }; -#endif // ____H_SNAPSHOTIMPL +#endif /* !MAIN_INCLUDED_SnapshotImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/StorageControllerImpl.h b/src/VBox/Main/include/StorageControllerImpl.h index fbeb7786b82..e31f2e929bb 100644 --- a/src/VBox/Main/include/StorageControllerImpl.h +++ b/src/VBox/Main/include/StorageControllerImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_STORAGECONTROLLERIMPL -#define ____H_STORAGECONTROLLERIMPL +#ifndef MAIN_INCLUDED_StorageControllerImpl_h +#define MAIN_INCLUDED_StorageControllerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -93,5 +93,5 @@ private: Data *m; }; -#endif //!____H_STORAGECONTROLLERIMPL +#endif /* !MAIN_INCLUDED_StorageControllerImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/SystemPropertiesImpl.h b/src/VBox/Main/include/SystemPropertiesImpl.h index 7ca567b2264..9d88adde386 100644 --- a/src/VBox/Main/include/SystemPropertiesImpl.h +++ b/src/VBox/Main/include/SystemPropertiesImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_SYSTEMPROPERTIESIMPL -#define ____H_SYSTEMPROPERTIESIMPL +#ifndef MAIN_INCLUDED_SystemPropertiesImpl_h +#define MAIN_INCLUDED_SystemPropertiesImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -159,5 +159,5 @@ private: friend class VirtualBox; }; -#endif // ____H_SYSTEMPROPERTIESIMPL +#endif /* !MAIN_INCLUDED_SystemPropertiesImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/TextScript.h b/src/VBox/Main/include/TextScript.h index 77c234c7e1a..4951b7448e3 100644 --- a/src/VBox/Main/include/TextScript.h +++ b/src/VBox/Main/include/TextScript.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_TEXTSCRIPT -#define ____H_TEXTSCRIPT +#ifndef MAIN_INCLUDED_TextScript_h +#define MAIN_INCLUDED_TextScript_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -227,5 +227,5 @@ public: }; -#endif // !____H_TEXTSCRIPT +#endif /* !MAIN_INCLUDED_TextScript_h */ diff --git a/src/VBox/Main/include/ThreadTask.h b/src/VBox/Main/include/ThreadTask.h index 087fffc080d..9808095c97d 100644 --- a/src/VBox/Main/include/ThreadTask.h +++ b/src/VBox/Main/include/ThreadTask.h @@ -14,8 +14,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_THREADTASK -#define ____H_THREADTASK +#ifndef MAIN_INCLUDED_ThreadTask_h +#define MAIN_INCLUDED_ThreadTask_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -64,5 +64,5 @@ private: virtual void handler() = 0; }; -#endif +#endif /* !MAIN_INCLUDED_ThreadTask_h */ diff --git a/src/VBox/Main/include/TokenImpl.h b/src/VBox/Main/include/TokenImpl.h index a872f513559..6340e48e1b4 100644 --- a/src/VBox/Main/include/TokenImpl.h +++ b/src/VBox/Main/include/TokenImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_TOKENIMPL -#define ____H_TOKENIMPL +#ifndef MAIN_INCLUDED_TokenImpl_h +#define MAIN_INCLUDED_TokenImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -103,6 +103,6 @@ private: }; -#endif +#endif /* !MAIN_INCLUDED_TokenImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/USBControllerImpl.h b/src/VBox/Main/include/USBControllerImpl.h index be828c46133..cbe5b25beda 100644 --- a/src/VBox/Main/include/USBControllerImpl.h +++ b/src/VBox/Main/include/USBControllerImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_USBCONTROLLERIMPL -#define ____H_USBCONTROLLERIMPL +#ifndef MAIN_INCLUDED_USBControllerImpl_h +#define MAIN_INCLUDED_USBControllerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -74,5 +74,5 @@ private: Data *m; }; -#endif //!____H_USBCONTROLLERIMPL +#endif /* !MAIN_INCLUDED_USBControllerImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/USBDeviceFilterImpl.h b/src/VBox/Main/include/USBDeviceFilterImpl.h index c186aec4034..cd2259df2ff 100644 --- a/src/VBox/Main/include/USBDeviceFilterImpl.h +++ b/src/VBox/Main/include/USBDeviceFilterImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_USBDEVICEFILTERIMPL -#define ____H_USBDEVICEFILTERIMPL +#ifndef MAIN_INCLUDED_USBDeviceFilterImpl_h +#define MAIN_INCLUDED_USBDeviceFilterImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -226,5 +226,5 @@ private: friend class Host; }; -#endif // ____H_USBDEVICEFILTERIMPL +#endif /* !MAIN_INCLUDED_USBDeviceFilterImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/USBDeviceFiltersImpl.h b/src/VBox/Main/include/USBDeviceFiltersImpl.h index b0bccd66514..01241ed77d6 100644 --- a/src/VBox/Main/include/USBDeviceFiltersImpl.h +++ b/src/VBox/Main/include/USBDeviceFiltersImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_USBDEVICEFILTERSIMPL -#define ____H_USBDEVICEFILTERSIMPL +#ifndef MAIN_INCLUDED_USBDeviceFiltersImpl_h +#define MAIN_INCLUDED_USBDeviceFiltersImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -83,5 +83,5 @@ private: Data *m; }; -#endif //!____H_USBDEVICEFILTERSIMPL +#endif /* !MAIN_INCLUDED_USBDeviceFiltersImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/USBDeviceImpl.h b/src/VBox/Main/include/USBDeviceImpl.h index aa05ebddc72..22ac7853f82 100644 --- a/src/VBox/Main/include/USBDeviceImpl.h +++ b/src/VBox/Main/include/USBDeviceImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_USBDEVICEIMPL -#define ____H_USBDEVICEIMPL +#ifndef MAIN_INCLUDED_USBDeviceImpl_h +#define MAIN_INCLUDED_USBDeviceImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -104,5 +104,5 @@ private: Data mData; }; -#endif // ____H_USBDEVICEIMPL +#endif /* !MAIN_INCLUDED_USBDeviceImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/USBGetDevices.h b/src/VBox/Main/include/USBGetDevices.h index 0ee8e5665a6..531615836db 100644 --- a/src/VBox/Main/include/USBGetDevices.h +++ b/src/VBox/Main/include/USBGetDevices.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___USBGetDevices_h -#define ___USBGetDevices_h +#ifndef MAIN_INCLUDED_USBGetDevices_h +#define MAIN_INCLUDED_USBGetDevices_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -100,5 +100,5 @@ extern PUSBDEVICE USBProxyLinuxGetDevices(const char *pcszDevicesRoot, bool fUse RT_C_DECLS_END -#endif /* !___USBGetDevices_h */ +#endif /* !MAIN_INCLUDED_USBGetDevices_h */ diff --git a/src/VBox/Main/include/USBIdDatabase.h b/src/VBox/Main/include/USBIdDatabase.h index afe80fca356..bb404eb3157 100644 --- a/src/VBox/Main/include/USBIdDatabase.h +++ b/src/VBox/Main/include/USBIdDatabase.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___USBIdDatabase_h -#define ___USBIdDatabase_h +#ifndef MAIN_INCLUDED_USBIdDatabase_h +#define MAIN_INCLUDED_USBIdDatabase_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -212,5 +212,5 @@ public: }; -#endif +#endif /* !MAIN_INCLUDED_USBIdDatabase_h */ diff --git a/src/VBox/Main/include/USBProxyBackend.h b/src/VBox/Main/include/USBProxyBackend.h index d8a182952e5..a2e8f2baccb 100644 --- a/src/VBox/Main/include/USBProxyBackend.h +++ b/src/VBox/Main/include/USBProxyBackend.h @@ -15,9 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - -#ifndef ____H_USBPROXYBACKEND -#define ____H_USBPROXYBACKEND +#ifndef MAIN_INCLUDED_USBProxyBackend_h +#define MAIN_INCLUDED_USBProxyBackend_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -442,5 +441,5 @@ private: Data *m; }; -#endif /* !____H_USBPROXYBACKEND */ +#endif /* !MAIN_INCLUDED_USBProxyBackend_h */ diff --git a/src/VBox/Main/include/USBProxyService.h b/src/VBox/Main/include/USBProxyService.h index 969ad54efdf..7cabe8df578 100644 --- a/src/VBox/Main/include/USBProxyService.h +++ b/src/VBox/Main/include/USBProxyService.h @@ -15,9 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - -#ifndef ____H_USBPROXYSERVICE -#define ____H_USBPROXYSERVICE +#ifndef MAIN_INCLUDED_USBProxyService_h +#define MAIN_INCLUDED_USBProxyService_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -132,5 +131,5 @@ private: int mLastError; }; -#endif /* !____H_USBPROXYSERVICE */ +#endif /* !MAIN_INCLUDED_USBProxyService_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/UnattendedImpl.h b/src/VBox/Main/include/UnattendedImpl.h index 3c76470399a..c30d0805106 100644 --- a/src/VBox/Main/include/UnattendedImpl.h +++ b/src/VBox/Main/include/UnattendedImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_UNATTENDED -#define ____H_UNATTENDED +#ifndef MAIN_INCLUDED_UnattendedImpl_h +#define MAIN_INCLUDED_UnattendedImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -262,5 +262,5 @@ private: bool i_isGuestOSArchX64(Utf8Str const &rStrGuestOsTypeId); }; -#endif // !____H_UNATTENDED +#endif /* !MAIN_INCLUDED_UnattendedImpl_h */ diff --git a/src/VBox/Main/include/UnattendedInstaller.h b/src/VBox/Main/include/UnattendedInstaller.h index fa9b17ff9f0..b75fe8e66bb 100644 --- a/src/VBox/Main/include/UnattendedInstaller.h +++ b/src/VBox/Main/include/UnattendedInstaller.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_UNATTENDEDINSTALLER -#define ____H_UNATTENDEDINSTALLER +#ifndef MAIN_INCLUDED_UnattendedInstaller_h +#define MAIN_INCLUDED_UnattendedInstaller_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -595,5 +595,5 @@ public: }; #endif -#endif // !____H_UNATTENDEDINSTALLER +#endif /* !MAIN_INCLUDED_UnattendedInstaller_h */ diff --git a/src/VBox/Main/include/UnattendedScript.h b/src/VBox/Main/include/UnattendedScript.h index 6b8b7893756..2ffff509ba0 100644 --- a/src/VBox/Main/include/UnattendedScript.h +++ b/src/VBox/Main/include/UnattendedScript.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_UNATTENDEDSCRIPT -#define ____H_UNATTENDEDSCRIPT +#ifndef MAIN_INCLUDED_UnattendedScript_h +#define MAIN_INCLUDED_UnattendedScript_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -127,5 +127,5 @@ private: #endif -#endif // !____H_UNATTENDEDSCRIPT +#endif /* !MAIN_INCLUDED_UnattendedScript_h */ diff --git a/src/VBox/Main/include/UsbCardReader.h b/src/VBox/Main/include/UsbCardReader.h index 45fd2bd8752..766f17df579 100644 --- a/src/VBox/Main/include/UsbCardReader.h +++ b/src/VBox/Main/include/UsbCardReader.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_USBCARDREADER -#define ____H_USBCARDREADER +#ifndef MAIN_INCLUDED_UsbCardReader_h +#define MAIN_INCLUDED_UsbCardReader_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -71,5 +71,5 @@ class UsbCardReader UCRREMOTE *m_pRemote; }; -#endif /* !____H_USBCARDREADER */ +#endif /* !MAIN_INCLUDED_UsbCardReader_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/UsbWebcamInterface.h b/src/VBox/Main/include/UsbWebcamInterface.h index d1284cd7c8f..5e3dd6cd1cd 100644 --- a/src/VBox/Main/include/UsbWebcamInterface.h +++ b/src/VBox/Main/include/UsbWebcamInterface.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_USBWEBCAMINTERFACE -#define ____H_USBWEBCAMINTERFACE +#ifndef MAIN_INCLUDED_UsbWebcamInterface_h +#define MAIN_INCLUDED_UsbWebcamInterface_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -65,5 +65,5 @@ class EmWebcam uint64_t volatile mu64DeviceIdSrc; }; -#endif /* !____H_USBWEBCAMINTERFACE */ +#endif /* !MAIN_INCLUDED_UsbWebcamInterface_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/VFSExplorerImpl.h b/src/VBox/Main/include/VFSExplorerImpl.h index e7f896cb105..f48aa7d8bae 100644 --- a/src/VBox/Main/include/VFSExplorerImpl.h +++ b/src/VBox/Main/include/VFSExplorerImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VFSEXPLORERIMPL -#define ____H_VFSEXPLORERIMPL +#ifndef MAIN_INCLUDED_VFSExplorerImpl_h +#define MAIN_INCLUDED_VFSExplorerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -84,5 +84,5 @@ private: }; -#endif /* !____H_VFSEXPLORERIMPL */ +#endif /* !MAIN_INCLUDED_VFSExplorerImpl_h */ diff --git a/src/VBox/Main/include/VMMDev.h b/src/VBox/Main/include/VMMDev.h index 8a25128ebe7..7b6593f07de 100644 --- a/src/VBox/Main/include/VMMDev.h +++ b/src/VBox/Main/include/VMMDev.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VMMDEV -#define ____H_VMMDEV +#ifndef MAIN_INCLUDED_VMMDev_h +#define MAIN_INCLUDED_VMMDev_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -100,5 +100,5 @@ private: #endif /* VBOX_WITH_HGCM */ }; -#endif // !____H_VMMDEV +#endif /* !MAIN_INCLUDED_VMMDev_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/VRDEServerImpl.h b/src/VBox/Main/include/VRDEServerImpl.h index d06ac2a5865..ad06ec0f7d0 100644 --- a/src/VBox/Main/include/VRDEServerImpl.h +++ b/src/VBox/Main/include/VRDEServerImpl.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VRDPSERVER -#define ____H_VRDPSERVER +#ifndef MAIN_INCLUDED_VRDEServerImpl_h +#define MAIN_INCLUDED_VRDEServerImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -84,5 +84,5 @@ private: Backupable<settings::VRDESettings> mData; }; -#endif // ____H_VRDPSERVER +#endif /* !MAIN_INCLUDED_VRDEServerImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/VirtualBoxBase.h b/src/VBox/Main/include/VirtualBoxBase.h index 28e254abbe2..958169e3ebc 100644 --- a/src/VBox/Main/include/VirtualBoxBase.h +++ b/src/VBox/Main/include/VirtualBoxBase.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VIRTUALBOXBASEIMPL -#define ____H_VIRTUALBOXBASEIMPL +#ifndef MAIN_INCLUDED_VirtualBoxBase_h +#define MAIN_INCLUDED_VirtualBoxBase_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -1117,5 +1117,5 @@ protected: D *mBackupData; }; -#endif // !____H_VIRTUALBOXBASEIMPL +#endif /* !MAIN_INCLUDED_VirtualBoxBase_h */ diff --git a/src/VBox/Main/include/VirtualBoxClientImpl.h b/src/VBox/Main/include/VirtualBoxClientImpl.h index 10f17b3a647..784dd836ca4 100644 --- a/src/VBox/Main/include/VirtualBoxClientImpl.h +++ b/src/VBox/Main/include/VirtualBoxClientImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VIRTUALBOXCLIENTIMPL -#define ____H_VIRTUALBOXCLIENTIMPL +#ifndef MAIN_INCLUDED_VirtualBoxClientImpl_h +#define MAIN_INCLUDED_VirtualBoxClientImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -111,5 +111,5 @@ public: static LONG s_cUnnecessaryAtlModuleLocks; }; -#endif +#endif /* !MAIN_INCLUDED_VirtualBoxClientImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h b/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h index 4b0903315bb..14671b4d81a 100644 --- a/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h +++ b/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VIRTUALBOXERRORINFOIMPL -#define ____H_VIRTUALBOXERRORINFOIMPL +#ifndef MAIN_INCLUDED_VirtualBoxErrorInfoImpl_h +#define MAIN_INCLUDED_VirtualBoxErrorInfoImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -159,6 +159,6 @@ private: #endif }; -#endif // !____H_VIRTUALBOXERRORINFOIMPL +#endif /* !MAIN_INCLUDED_VirtualBoxErrorInfoImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/VirtualBoxImpl.h b/src/VBox/Main/include/VirtualBoxImpl.h index f7674d40ad5..caa291fd6c4 100644 --- a/src/VBox/Main/include/VirtualBoxImpl.h +++ b/src/VBox/Main/include/VirtualBoxImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VIRTUALBOXIMPL -#define ____H_VIRTUALBOXIMPL +#ifndef MAIN_INCLUDED_VirtualBoxImpl_h +#define MAIN_INCLUDED_VirtualBoxImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -427,5 +427,5 @@ private: //////////////////////////////////////////////////////////////////////////////// -#endif // !____H_VIRTUALBOXIMPL +#endif /* !MAIN_INCLUDED_VirtualBoxImpl_h */ diff --git a/src/VBox/Main/include/VirtualBoxSDSImpl.h b/src/VBox/Main/include/VirtualBoxSDSImpl.h index 5580fc3af4c..2d86badd9ca 100644 --- a/src/VBox/Main/include/VirtualBoxSDSImpl.h +++ b/src/VBox/Main/include/VirtualBoxSDSImpl.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VIRTUALBOXSDSIMPL -#define ____H_VIRTUALBOXSDSIMPL +#ifndef MAIN_INCLUDED_VirtualBoxSDSImpl_h +#define MAIN_INCLUDED_VirtualBoxSDSImpl_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -136,5 +136,5 @@ private: void VBoxSDSNotifyClientCount(uint32_t cClients); #endif -#endif // !____H_VIRTUALBOXSDSIMPL +#endif /* !MAIN_INCLUDED_VirtualBoxSDSImpl_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/WebMWriter.h b/src/VBox/Main/include/WebMWriter.h index a5786ab3395..4d8a67ed8a5 100644 --- a/src/VBox/Main/include/WebMWriter.h +++ b/src/VBox/Main/include/WebMWriter.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____WEBMWRITER -#define ____WEBMWRITER +#ifndef MAIN_INCLUDED_WebMWriter_h +#define MAIN_INCLUDED_WebMWriter_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -576,4 +576,4 @@ protected: typedef std::map <uint8_t, WebMTrack *> WebMTracks; }; -#endif /* !____WEBMWRITER */ +#endif /* !MAIN_INCLUDED_WebMWriter_h */ diff --git a/src/VBox/Main/include/Wrapper.h b/src/VBox/Main/include/Wrapper.h index dc5adb6df3e..b7b9f7650d9 100644 --- a/src/VBox/Main/include/Wrapper.h +++ b/src/VBox/Main/include/Wrapper.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_WRAPPER -#define ____H_WRAPPER +#ifndef MAIN_INCLUDED_Wrapper_h +#define MAIN_INCLUDED_Wrapper_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -490,5 +490,5 @@ private: std::vector<A> mArray; }; -#endif // !____H_WRAPPER +#endif /* !MAIN_INCLUDED_Wrapper_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/netif.h b/src/VBox/Main/include/netif.h index cf632372f57..4c4a1b264c7 100644 --- a/src/VBox/Main/include/netif.h +++ b/src/VBox/Main/include/netif.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___netif_h -#define ___netif_h +#ifndef MAIN_INCLUDED_netif_h +#define MAIN_INCLUDED_netif_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -125,5 +125,5 @@ DECLINLINE(Bstr) getDefaultIPv4Address(Bstr bstrIfName) return Bstr(addr); } -#endif /* !___netif_h */ +#endif /* !MAIN_INCLUDED_netif_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/objectslist.h b/src/VBox/Main/include/objectslist.h index e2cc0c260c8..60515533eca 100644 --- a/src/VBox/Main/include/objectslist.h +++ b/src/VBox/Main/include/objectslist.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_OBJECTSLIST -#define ____H_OBJECTSLIST +#ifndef MAIN_INCLUDED_objectslist_h +#define MAIN_INCLUDED_objectslist_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -211,4 +211,4 @@ private: RWLockHandle &m_lock; }; -#endif +#endif /* !MAIN_INCLUDED_objectslist_h */ diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h index 2e34f56d67e..e3d76a2bc1a 100644 --- a/src/VBox/Main/include/ovfreader.h +++ b/src/VBox/Main/include/ovfreader.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_OVFREADER -#define ____H_OVFREADER +#ifndef MAIN_INCLUDED_ovfreader_h +#define MAIN_INCLUDED_ovfreader_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -684,5 +684,5 @@ private: } // end namespace ovf -#endif // !____H_OVFREADER +#endif /* !MAIN_INCLUDED_ovfreader_h */ diff --git a/src/VBox/Main/include/vbox-libhal.h b/src/VBox/Main/include/vbox-libhal.h index fe2a7cec43c..184c44156f0 100644 --- a/src/VBox/Main/include/vbox-libhal.h +++ b/src/VBox/Main/include/vbox-libhal.h @@ -17,8 +17,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_VBOX_LIBHAL -#define ____H_VBOX_LIBHAL +#ifndef MAIN_INCLUDED_vbox_libhal_h +#define MAIN_INCLUDED_vbox_libhal_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -66,5 +66,5 @@ extern dbus_bool_t (*gLibHalCtxFree)(LibHalContext *); extern bool gLibHalCheckPresence(void); -#endif /* ____H_VBOX_LIBHAL not defined */ +#endif /* !MAIN_INCLUDED_vbox_libhal_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/vector.h b/src/VBox/Main/include/vector.h index dbed788765c..84158e3cbc0 100644 --- a/src/VBox/Main/include/vector.h +++ b/src/VBox/Main/include/vector.h @@ -24,8 +24,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef MAIN_VECTOR_H -#define MAIN_VECTOR_H +#ifndef MAIN_INCLUDED_vector_h +#define MAIN_INCLUDED_vector_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -351,4 +351,4 @@ DECLINLINE(int) vecPushBackPtr(VECTOR_PTR *pvec, unsigned uTypeHash, && pIterator < (type *) (pvec)->mpvaElements + (pvec)->mcElements; \ ++pIterator) -#endif /* !MAIN_VECTOR_H */ +#endif /* !MAIN_INCLUDED_vector_h */ diff --git a/src/VBox/Main/include/win/resource.h b/src/VBox/Main/include/win/resource.h index e444c2609f6..72f962e19b5 100644 --- a/src/VBox/Main/include/win/resource.h +++ b/src/VBox/Main/include/win/resource.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef __H_RESOURCEVBOXCOM -#define __H_RESOURCEVBOXCOM +#ifndef MAIN_INCLUDED_win_resource_h +#define MAIN_INCLUDED_win_resource_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -30,4 +30,4 @@ #define IDS_SERVICENAME 102 -#endif // __H_RESOURCEVBOXCOM +#endif /* !MAIN_INCLUDED_win_resource_h */ diff --git a/src/VBox/Main/src-all/win/VBoxAPIWrap-precomp_gcc.h b/src/VBox/Main/src-all/win/VBoxAPIWrap-precomp_gcc.h index c39b0e15a27..7ef54854a60 100644 --- a/src/VBox/Main/src-all/win/VBoxAPIWrap-precomp_gcc.h +++ b/src/VBox/Main/src-all/win/VBoxAPIWrap-precomp_gcc.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___VBoxAPIWrap_precomp_gcc_h___ -#define ___VBoxAPIWrap_precomp_gcc_h___ +#ifndef MAIN_INCLUDED_SRC_src_all_win_VBoxAPIWrap_precomp_gcc_h +#define MAIN_INCLUDED_SRC_src_all_win_VBoxAPIWrap_precomp_gcc_h #include <iprt/cdefs.h> #include <VBox/cdefs.h> @@ -43,5 +43,5 @@ # error "Log() from iprt/log.h cannot be defined in the precompiled header!" #endif -#endif +#endif /* !MAIN_INCLUDED_SRC_src_all_win_VBoxAPIWrap_precomp_gcc_h */ diff --git a/src/VBox/Main/src-server/HostDnsService.h b/src/VBox/Main/src-server/HostDnsService.h index 3c2f5eed1fb..50ae23f5e09 100644 --- a/src/VBox/Main/src-server/HostDnsService.h +++ b/src/VBox/Main/src-server/HostDnsService.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___H_DNSHOSTSERVICE -#define ___H_DNSHOSTSERVICE +#ifndef MAIN_INCLUDED_SRC_src_server_HostDnsService_h +#define MAIN_INCLUDED_SRC_src_server_HostDnsService_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -231,4 +231,4 @@ class HostDnsServiceOs2 : public HostDnsServiceResolvConf # endif # endif -#endif /* !___H_DNSHOSTSERVICE */ +#endif /* !MAIN_INCLUDED_SRC_src_server_HostDnsService_h */ diff --git a/src/VBox/Main/src-server/darwin/iokit.h b/src/VBox/Main/src-server/darwin/iokit.h index 94b5548954e..88595e29478 100644 --- a/src/VBox/Main/src-server/darwin/iokit.h +++ b/src/VBox/Main/src-server/darwin/iokit.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___darwin_iokit_h___ -#define ___darwin_iokit_h___ +#ifndef MAIN_INCLUDED_SRC_src_server_darwin_iokit_h +#define MAIN_INCLUDED_SRC_src_server_darwin_iokit_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -87,4 +87,4 @@ PDARWINDVD DarwinGetDVDDrives(void); PDARWINETHERNIC DarwinGetEthernetControllers(void); RT_C_DECLS_END -#endif +#endif /* !MAIN_INCLUDED_SRC_src_server_darwin_iokit_h */ diff --git a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h index 4bf8dec2ca6..6eddb86ca2f 100644 --- a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h +++ b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_DYN_LOAD_LIB_SOLARIS -#define ____H_DYN_LOAD_LIB_SOLARIS +#ifndef MAIN_INCLUDED_SRC_src_server_solaris_DynLoadLibSolaris_h +#define MAIN_INCLUDED_SRC_src_server_solaris_DynLoadLibSolaris_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -36,5 +36,5 @@ extern void (*g_pfnLibDlpiClose)(dlpi_handle_t); extern bool VBoxSolarisLibDlpiFound(void); -#endif /* ____H_DYN_LOAD_LIB_SOLARIS */ +#endif /* !MAIN_INCLUDED_SRC_src_server_solaris_DynLoadLibSolaris_h */ diff --git a/src/VBox/Main/src-server/win/svchlp.h b/src/VBox/Main/src-server/win/svchlp.h index 91e0d8aca10..3b78224cf58 100644 --- a/src/VBox/Main/src-server/win/svchlp.h +++ b/src/VBox/Main/src-server/win/svchlp.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ___VBox_svchlp_h___ -#define ___VBox_svchlp_h___ +#ifndef MAIN_INCLUDED_SRC_src_server_win_svchlp_h +#define MAIN_INCLUDED_SRC_src_server_win_svchlp_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -93,5 +93,5 @@ public: int run(); }; -#endif /* !___VBox_svchlp_h___ */ +#endif /* !MAIN_INCLUDED_SRC_src_server_win_svchlp_h */ diff --git a/src/VBox/Main/src-server/xpcom/server.h b/src/VBox/Main/src-server/xpcom/server.h index 96ae1c6c037..d81d0eea0d7 100644 --- a/src/VBox/Main/src-server/xpcom/server.h +++ b/src/VBox/Main/src-server/xpcom/server.h @@ -16,8 +16,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_LINUX_SERVER -#define ____H_LINUX_SERVER +#ifndef MAIN_INCLUDED_SRC_src_server_xpcom_server_h +#define MAIN_INCLUDED_SRC_src_server_xpcom_server_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -37,4 +37,4 @@ */ #define VBOXSVC_STARTUP_PIPE_NAME "vboxsvc:startup-pipe" -#endif /* ____H_LINUX_SERVER */ +#endif /* !MAIN_INCLUDED_SRC_src_server_xpcom_server_h */ diff --git a/src/VBox/Main/testcase/tstUSBLinux.h b/src/VBox/Main/testcase/tstUSBLinux.h index 9b471640703..f56c8996466 100644 --- a/src/VBox/Main/testcase/tstUSBLinux.h +++ b/src/VBox/Main/testcase/tstUSBLinux.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef ____H_TSTUSBLINUX -#define ____H_TSTUSBLINUX +#ifndef MAIN_INCLUDED_SRC_testcase_tstUSBLinux_h +#define MAIN_INCLUDED_SRC_testcase_tstUSBLinux_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -65,5 +65,5 @@ private: # endif }; -#endif /* !____H_TSTUSBLINUX */ +#endif /* !MAIN_INCLUDED_SRC_testcase_tstUSBLinux_h */ diff --git a/src/VBox/Main/webservice/vboxweb.h b/src/VBox/Main/webservice/vboxweb.h index 2dd71d43c4a..bf94e456377 100644 --- a/src/VBox/Main/webservice/vboxweb.h +++ b/src/VBox/Main/webservice/vboxweb.h @@ -15,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef VBOX_INCLUDED_webservice_vboxweb_h -#define VBOX_INCLUDED_webservice_vboxweb_h +#ifndef MAIN_INCLUDED_SRC_webservice_vboxweb_h +#define MAIN_INCLUDED_SRC_webservice_vboxweb_h #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once #endif @@ -362,5 +362,5 @@ const WSDLT_ID& createOrFindRefFromComPtr(const WSDLT_ID &idParent, return g_EmptyWSDLID; } -#endif +#endif /* !MAIN_INCLUDED_SRC_webservice_vboxweb_h */ |