Code Style: use "#pragma once" in intern/ghost

More information can be found in D8466.

intern/ghost/GHOST_C-api.h

@@ -21,8 +21,7 @@
  * \brief GHOST C-API function and type declarations.
  */
 
-#ifndef __GHOST_C_API_H__
+#pragma once
-#define __GHOST_C_API_H__
 
 #include "GHOST_Types.h"
 
@@ -1072,5 +1071,3 @@ GHOST_TSuccess GHOST_XrEventsHandle(GHOST_XrContextHandle xr_context);
 #ifdef __cplusplus
 }
 #endif
-
-#endif

intern/ghost/GHOST_IContext.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_IContext interface class.
  */
 
-#ifndef __GHOST_IContext_H__
+#pragma once
-#define __GHOST_IContext_H__
 
 #include "GHOST_Types.h"
 
@@ -63,5 +62,3 @@ class GHOST_IContext {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IContext")
 #endif
 };
-
-#endif  // __GHOST_IContext_H__

intern/ghost/GHOST_IEvent.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_IEvent interface class.
  */
 
-#ifndef __GHOST_IEVENT_H__
+#pragma once
-#define __GHOST_IEVENT_H__
 
 #include "GHOST_Types.h"
 #include <stddef.h>
@@ -78,5 +77,3 @@ class GHOST_IEvent {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEvent")
 #endif
 };
-
-#endif  // __GHOST_IEVENT_H__

intern/ghost/GHOST_IEventConsumer.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_IEventConsumer interface class.
  */
 
-#ifndef __GHOST_IEVENTCONSUMER_H__
+#pragma once
-#define __GHOST_IEVENTCONSUMER_H__
 
 #include "GHOST_IEvent.h"
 
@@ -56,5 +55,3 @@ class GHOST_IEventConsumer {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEventConsumer")
 #endif
 };
-
-#endif /* __GHOST_IEVENTCONSUMER_H__ */

intern/ghost/GHOST_ISystem.h

@@ -24,8 +24,7 @@
  * Contains the doxygen documentation main page.
  */
 
-#ifndef __GHOST_ISYSTEM_H__
+#pragma once
-#define __GHOST_ISYSTEM_H__
 
 #include <stdlib.h>
 
@@ -494,5 +493,3 @@ class GHOST_ISystem {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_ISystem")
 #endif
 };
-
-#endif  // __GHOST_ISYSTEM_H__

intern/ghost/GHOST_ISystemPaths.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_ISYSTEMPATHS_H__
+#pragma once
-#define __GHOST_ISYSTEMPATHS_H__
 
 #include "GHOST_Types.h"
 
@@ -97,5 +96,3 @@ class GHOST_ISystemPaths {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_ISystemPaths")
 #endif
 };
-
-#endif

intern/ghost/GHOST_ITimerTask.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_ITimerTask interface class.
  */
 
-#ifndef __GHOST_ITIMERTASK_H__
+#pragma once
-#define __GHOST_ITIMERTASK_H__
 
 #include "GHOST_Types.h"
 
@@ -76,5 +75,3 @@ class GHOST_ITimerTask {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_ITimerTask")
 #endif
 };
-
-#endif  // __GHOST_ITIMERTASK_H__

intern/ghost/GHOST_IWindow.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_IWindow interface class.
  */
 
-#ifndef __GHOST_IWINDOW_H__
+#pragma once
-#define __GHOST_IWINDOW_H__
 
 #include "GHOST_Rect.h"
 #include "GHOST_Types.h"
@@ -363,5 +362,3 @@ class GHOST_IWindow {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IWindow")
 #endif
 };
-
-#endif  // __GHOST_IWINDOW_H__

intern/ghost/GHOST_IXrContext.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_IXRCONTEXT_H__
+#pragma once
-#define __GHOST_IXRCONTEXT_H__
 
 #include "GHOST_Types.h"
 
@@ -40,5 +39,3 @@ class GHOST_IXrContext {
 
   virtual bool needsUpsideDownDrawing() const = 0;
 };
-
-#endif  // __GHOST_IXRCONTEXT_H__

intern/ghost/GHOST_Path-api.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_PATH_API_H__
+#pragma once
-#define __GHOST_PATH_API_H__
 
 #include "GHOST_Types.h"
 
@@ -71,5 +70,3 @@ extern void GHOST_addToSystemRecentFiles(const char *filename);
 #ifdef __cplusplus
 }
 #endif
-
-#endif

intern/ghost/GHOST_Rect.h

@@ -22,8 +22,7 @@
  * Macro's used in GHOST debug target.
  */
 
-#ifndef __GHOST_RECT_H__
+#pragma once
-#define __GHOST_RECT_H__
 
 #include "GHOST_Types.h"
 
@@ -263,5 +262,3 @@ inline bool GHOST_Rect::isInside(GHOST_TInt32 x, GHOST_TInt32 y) const
 {
   return (x >= m_l) && (x <= m_r) && (y >= m_t) && (y <= m_b);
 }
-
-#endif  // __GHOST_RECT_H__

intern/ghost/GHOST_Types.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_TYPES_H__
+#pragma once
-#define __GHOST_TYPES_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
@@ -677,5 +676,3 @@ typedef struct GHOST_XrError {
 } GHOST_XrError;
 
 #endif
-
-#endif  // __GHOST_TYPES_H__

intern/ghost/intern/GHOST_Buttons.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_Buttons struct.
  */
 
-#ifndef __GHOST_BUTTONS_H__
+#pragma once
-#define __GHOST_BUTTONS_H__
 
 #include "GHOST_Types.h"
 
@@ -62,5 +61,3 @@ struct GHOST_Buttons {
   GHOST_TUns8 m_ButtonMiddle : 1;
   GHOST_TUns8 m_ButtonRight : 1;
 };
-
-#endif  // __GHOST_BUTTONS_H__

intern/ghost/intern/GHOST_CallbackEventConsumer.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_CallbackEventConsumer class.
  */
 
-#ifndef __GHOST_CALLBACKEVENTCONSUMER_H__
+#pragma once
-#define __GHOST_CALLBACKEVENTCONSUMER_H__
 
 #include "GHOST_C-api.h"
 #include "GHOST_IEventConsumer.h"
@@ -66,5 +65,3 @@ class GHOST_CallbackEventConsumer : public GHOST_IEventConsumer {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_CallbackEventConsumer")
 #endif
 };
-
-#endif  // __GHOST_CALLBACKEVENTCONSUMER_H__

intern/ghost/intern/GHOST_Context.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_Context class.
  */
 
-#ifndef __GHOST_CONTEXT_H__
+#pragma once
-#define __GHOST_CONTEXT_H__
 
 #include "GHOST_IContext.h"
 #include "GHOST_Types.h"
@@ -160,5 +159,3 @@ bool win32_silent_chk(bool result);
 
 #  define WIN32_CHK_SILENT(x, silent) ((silent) ? win32_silent_chk(x) : WIN32_CHK(x))
 #endif /* _WIN32 */
-
-#endif  // __GHOST_CONTEXT_H__

intern/ghost/intern/GHOST_ContextCGL.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_CONTEXTCGL_H__
+#pragma once
-#define __GHOST_CONTEXTCGL_H__
 
 #include "GHOST_Context.h"
 
@@ -137,5 +136,3 @@ class GHOST_ContextCGL : public GHOST_Context {
   void metalUpdateFramebuffer();
   void metalSwapBuffers();
 };
-
-#endif  // __GHOST_CONTEXTCGL_H__

intern/ghost/intern/GHOST_ContextD3D.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_CONTEXTD3D_H__
+#pragma once
-#define __GHOST_CONTEXTD3D_H__
 
 #ifndef WIN32
 #  error WIN32 only!
@@ -132,5 +131,3 @@ class GHOST_ContextD3D : public GHOST_Context {
   ID3D11Device *m_device;
   ID3D11DeviceContext *m_device_ctx;
 };
-
-#endif /* __GHOST_CONTEXTD3D_H__ */

intern/ghost/intern/GHOST_ContextEGL.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_CONTEXTEGL_H__
+#pragma once
-#define __GHOST_CONTEXTEGL_H__
 
 #include "GHOST_Context.h"
 
@@ -137,5 +136,3 @@ class GHOST_ContextEGL : public GHOST_Context {
   static HMODULE s_d3dcompiler;
 #endif
 };
-
-#endif  // __GHOST_CONTEXTEGL_H__

intern/ghost/intern/GHOST_ContextGLX.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_CONTEXTGLX_H__
+#pragma once
-#define __GHOST_CONTEXTGLX_H__
 
 #include "GHOST_Context.h"
 
@@ -128,5 +127,3 @@ class GHOST_ContextGLX : public GHOST_Context {
 /* used to get GLX info */
 int GHOST_X11_GL_GetAttributes(
     int *attribs, int attribs_max, bool is_stereo_visual, bool need_alpha, bool for_fb_config);
-
-#endif  // __GHOST_CONTEXTGLX_H__

intern/ghost/intern/GHOST_ContextNone.h

@@ -23,8 +23,7 @@
  * Declaration of GHOST_Context class.
  */
 
-#ifndef __GHOST_CONTEXTNONE_H__
+#pragma once
-#define __GHOST_CONTEXTNONE_H__
 
 #include "GHOST_Context.h"
 
@@ -86,5 +85,3 @@ class GHOST_ContextNone : public GHOST_Context {
  private:
   int m_swapInterval;
 };
-
-#endif  // __GHOST_CONTEXTNONE_H__

intern/ghost/intern/GHOST_ContextSDL.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_CONTEXTSDL_H__
+#pragma once
-#define __GHOST_CONTEXTSDL_H__
 
 #include "GHOST_Context.h"
 
@@ -121,5 +120,3 @@ class GHOST_ContextSDL : public GHOST_Context {
   static SDL_GLContext s_sharedContext;
   static int s_sharedCount;
 };
-
-#endif  // __GHOST_CONTEXTSDL_H__

intern/ghost/intern/GHOST_ContextWGL.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_CONTEXTWGL_H__
+#pragma once
-#define __GHOST_CONTEXTWGL_H__
 
 //#define WIN32_COMPOSITING
 
@@ -130,5 +129,3 @@ class GHOST_ContextWGL : public GHOST_Context {
   static HGLRC s_sharedHGLRC;
   static int s_sharedCount;
 };
-
-#endif  // __GHOST_CONTEXTWGL_H__

intern/ghost/intern/GHOST_Debug.h

@@ -22,8 +22,7 @@
  * Macro's used in GHOST debug target.
  */
 
-#ifndef __GHOST_DEBUG_H__
+#pragma once
-#define __GHOST_DEBUG_H__
 
 #ifdef _MSC_VER
 #  ifdef DEBUG
@@ -79,5 +78,3 @@
 #else  // WITH_GHOST_DEBUG
 #  define GHOST_ASSERT(x, info) ((void)0)
 #endif  // WITH_GHOST_DEBUG
-
-#endif  // __GHOST_DEBUG_H__

intern/ghost/intern/GHOST_DisplayManager.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_DisplayManager class.
  */
 
-#ifndef __GHOST_DISPLAYMANAGER_H__
+#pragma once
-#define __GHOST_DISPLAYMANAGER_H__
 
 #include "GHOST_Types.h"
 
@@ -127,5 +126,3 @@ class GHOST_DisplayManager {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DisplayManager")
 #endif
 };
-
-#endif  // __GHOST_DISPLAYMANAGER_H__

intern/ghost/intern/GHOST_DisplayManagerCocoa.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_DisplayManagerCocoa class.
  */
 
-#ifndef __GHOST_DISPLAYMANAGERCOCOA_H__
+#pragma once
-#define __GHOST_DISPLAYMANAGERCOCOA_H__
 
 #ifndef __APPLE__
 #  error Apple only!
@@ -93,5 +92,3 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
   /** Cached display id's for each display. */
   // CGDirectDisplayID* m_displayIDs;
 };
-
-#endif  // __GHOST_DISPLAYMANAGERCOCOA_H__

intern/ghost/intern/GHOST_DisplayManagerNULL.h

@@ -19,8 +19,7 @@
  * Declaration of GHOST_DisplayManagerNULL class.
  */
 
-#ifndef __GHOST_DISPLAYMANAGERNULL_H__
+#pragma once
-#define __GHOST_DISPLAYMANAGERNULL_H__
 
 #include "GHOST_DisplayManager.h"
 #include "GHOST_SystemNULL.h"
@@ -58,5 +57,3 @@ class GHOST_DisplayManagerNULL : public GHOST_DisplayManager {
  private:
   GHOST_SystemNULL *m_system;
 };
-
-#endif /* __GHOST_DISPLAYMANAGERNULL_H__ */

intern/ghost/intern/GHOST_DisplayManagerSDL.h

@@ -19,8 +19,7 @@
  * Declaration of GHOST_DisplayManagerSDL class.
  */
 
-#ifndef __GHOST_DISPLAYMANAGERSDL_H__
+#pragma once
-#define __GHOST_DISPLAYMANAGERSDL_H__
 
 #include "GHOST_DisplayManager.h"
 
@@ -58,5 +57,3 @@ class GHOST_DisplayManagerSDL : public GHOST_DisplayManager {
   GHOST_SystemSDL *m_system;
   SDL_DisplayMode m_mode;
 };
-
-#endif /* __GHOST_DISPLAYMANAGERSDL_H__ */

intern/ghost/intern/GHOST_DisplayManagerWin32.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_DisplayManagerWin32 class.
  */
 
-#ifndef __GHOST_DISPLAYMANAGERWIN32_H__
+#pragma once
-#define __GHOST_DISPLAYMANAGERWIN32_H__
 
 #ifndef WIN32
 #  error WIN32 only!
@@ -87,5 +86,3 @@ class GHOST_DisplayManagerWin32 : public GHOST_DisplayManager {
 
  protected:
 };
-
-#endif  // __GHOST_DISPLAYMANAGERWIN32_H__

intern/ghost/intern/GHOST_DisplayManagerX11.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_DisplayManagerX11 class.
  */
 
-#ifndef __GHOST_DISPLAYMANAGERX11_H__
+#pragma once
-#define __GHOST_DISPLAYMANAGERX11_H__
 
 #include "GHOST_DisplayManager.h"
 
@@ -86,5 +85,3 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
  private:
   GHOST_SystemX11 *m_system;
 };
-
-#endif  //

intern/ghost/intern/GHOST_DropTargetWin32.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_DROPTARGETWIN32_H__
+#pragma once
-#define __GHOST_DROPTARGETWIN32_H__
 
 #include "GHOST_SystemWin32.h"
 #include "GHOST_WindowWin32.h"
@@ -150,5 +149,3 @@ class GHOST_DropTargetWin32 : public IDropTarget {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DropTargetWin32")
 #endif
 };
-
-#endif  // __GHOST_DROPTARGETWIN32_H__

intern/ghost/intern/GHOST_DropTargetX11.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_DROPTARGETX11_H__
+#pragma once
-#define __GHOST_DROPTARGETX11_H__
 
 #include "GHOST_SystemX11.h"
 #include "GHOST_WindowX11.h"
@@ -126,5 +125,3 @@ class GHOST_DropTargetX11 {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DropTargetX11")
 #endif
 };
-
-#endif  // __GHOST_DROPTARGETX11_H__

intern/ghost/intern/GHOST_Event.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_Event class.
  */
 
-#ifndef __GHOST_EVENT_H__
+#pragma once
-#define __GHOST_EVENT_H__
 
 #include "GHOST_IEvent.h"
 
@@ -90,5 +89,3 @@ class GHOST_Event : public GHOST_IEvent {
   /** Pointer to the event data. */
   GHOST_TEventDataPtr m_data;
 };
-
-#endif  // __GHOST_EVENT_H__

intern/ghost/intern/GHOST_EventButton.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventButton class.
  */
 
-#ifndef __GHOST_EVENTBUTTON_H__
+#pragma once
-#define __GHOST_EVENTBUTTON_H__
 
 #include "GHOST_Event.h"
 #include "GHOST_Window.h"
@@ -57,5 +56,3 @@ class GHOST_EventButton : public GHOST_Event {
   /** The button event data. */
   GHOST_TEventButtonData m_buttonEventData;
 };
-
-#endif  // __GHOST_EVENTBUTTON_H__

intern/ghost/intern/GHOST_EventCursor.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventCursor class.
  */
 
-#ifndef __GHOST_EVENTCURSOR_H__
+#pragma once
-#define __GHOST_EVENTCURSOR_H__
 
 #include "GHOST_Event.h"
 
@@ -58,5 +57,3 @@ class GHOST_EventCursor : public GHOST_Event {
   /** The x,y-coordinates of the cursor position. */
   GHOST_TEventCursorData m_cursorEventData;
 };
-
-#endif  // __GHOST_EVENTCURSOR_H__

intern/ghost/intern/GHOST_EventDragnDrop.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_EVENTDRAGNDROP_H__
+#pragma once
-#define __GHOST_EVENTDRAGNDROP_H__
 
 #include "GHOST_Event.h"
 extern "C" {
@@ -122,5 +121,3 @@ class GHOST_EventDragnDrop : public GHOST_Event {
   /** The x,y-coordinates of the cursor position. */
   GHOST_TEventDragnDropData m_dragnDropEventData;
 };
-
-#endif  // __GHOST_EVENTDRAGNDROP_H__

intern/ghost/intern/GHOST_EventKey.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventKey class.
  */
 
-#ifndef __GHOST_EVENTKEY_H__
+#pragma once
-#define __GHOST_EVENTKEY_H__
 
 #include <string.h>
 
@@ -84,5 +83,3 @@ class GHOST_EventKey : public GHOST_Event {
   /** The key event data. */
   GHOST_TEventKeyData m_keyEventData;
 };
-
-#endif  // __GHOST_EVENTKEY_H__

intern/ghost/intern/GHOST_EventManager.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventManager class.
  */
 
-#ifndef __GHOST_EVENTMANAGER_H__
+#pragma once
-#define __GHOST_EVENTMANAGER_H__
 
 #include <deque>
 #include <vector>
@@ -140,5 +139,3 @@ class GHOST_EventManager {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_EventManager")
 #endif
 };
-
-#endif  // __GHOST_EVENTMANAGER_H__

intern/ghost/intern/GHOST_EventNDOF.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_EVENTNDOF_H__
+#pragma once
-#define __GHOST_EVENTNDOF_H__
 
 #ifndef WITH_INPUT_NDOF
 #  error NDOF code included in non-NDOF-enabled build
@@ -50,5 +49,3 @@ class GHOST_EventNDOFButton : public GHOST_Event {
     m_data = &m_buttonData;
   }
 };
-
-#endif  // __GHOST_EVENTNDOF_H__

intern/ghost/intern/GHOST_EventPrinter.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventPrinter class.
  */
 
-#ifndef __GHOST_EVENTPRINTER_H__
+#pragma once
-#define __GHOST_EVENTPRINTER_H__
 
 #include "GHOST_IEventConsumer.h"
 
@@ -48,5 +47,3 @@ class GHOST_EventPrinter : public GHOST_IEventConsumer {
    */
   void getKeyString(GHOST_TKey key, char str[32]) const;
 };
-
-#endif  // __GHOST_EVENTPRINTER_H__

intern/ghost/intern/GHOST_EventString.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventString class.
  */
 
-#ifndef __GHOST_EVENTSTRING_H__
+#pragma once
-#define __GHOST_EVENTSTRING_H__
 
 #include "GHOST_Event.h"
 
@@ -54,5 +53,3 @@ class GHOST_EventString : public GHOST_Event {
       free(m_data);
   }
 };
-
-#endif  // __GHOST_EVENTSTRING_H__

intern/ghost/intern/GHOST_EventTrackpad.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventTrackpad class.
  */
 
-#ifndef __GHOST_EVENTTRACKPAD_H__
+#pragma once
-#define __GHOST_EVENTTRACKPAD_H__
 
 #include "GHOST_Event.h"
 
@@ -61,5 +60,3 @@ class GHOST_EventTrackpad : public GHOST_Event {
   /** The mouse pan data */
   GHOST_TEventTrackpadData m_trackpadEventData;
 };
-
-#endif  // _GHOST_EVENT_PAN_H_

intern/ghost/intern/GHOST_EventWheel.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_EventWheel class.
  */
 
-#ifndef __GHOST_EVENTWHEEL_H__
+#pragma once
-#define __GHOST_EVENTWHEEL_H__
 
 #include "GHOST_Event.h"
 
@@ -51,5 +50,3 @@ class GHOST_EventWheel : public GHOST_Event {
   /** The z-displacement of the mouse wheel. */
   GHOST_TEventWheelData m_wheelEventData;
 };
-
-#endif  // __GHOST_EVENTWHEEL_H__

intern/ghost/intern/GHOST_IXrGraphicsBinding.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_IXRGRAPHICSBINDING_H__
+#pragma once
-#define __GHOST_IXRGRAPHICSBINDING_H__
 
 #include <memory>
 #include <string>
@@ -71,5 +70,3 @@ class GHOST_IXrGraphicsBinding {
 
 std::unique_ptr<GHOST_IXrGraphicsBinding> GHOST_XrGraphicsBindingCreateFromType(
     GHOST_TXrGraphicsBinding type, GHOST_Context *ghost_ctx);
-
-#endif /* __GHOST_IXRGRAPHICSBINDING_H__ */

intern/ghost/intern/GHOST_IconX11.h

@@ -22,8 +22,7 @@
  * Icon image data for X11.
  */
 
-#ifndef __GHOST_ICONX11_H__
+#pragma once
-#define __GHOST_ICONX11_H__
 
 /*
  * import bpy
@@ -1013,5 +1012,3 @@ static const unsigned long BLENDER_ICONS_WM_X11[] = {
     0x0,        0x0,        0x0,        0x0,        0x0,        0x0,        0x0,        0x0,
     0x0,        0x0,        0x0,        0x0,        0x0,        0x0,        0x0,        0x0,
 };
-
-#endif  // __GHOST_ICONX11_H__

intern/ghost/intern/GHOST_ImeWin32.h

@@ -23,8 +23,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_IME_H__
+#pragma once
-#define __GHOST_IME_H__
 
 #ifdef WITH_INPUT_IME
 
@@ -388,4 +387,3 @@ class GHOST_ImeWin32 {
 };
 
 #endif  // WITH_INPUT_IME
-#endif  // __GHOST_IME_H__

intern/ghost/intern/GHOST_ModifierKeys.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_ModifierKeys struct.
  */
 
-#ifndef __GHOST_MODIFIERKEYS_H__
+#pragma once
-#define __GHOST_MODIFIERKEYS_H__
 
 #include "GHOST_Types.h"
 
@@ -87,5 +86,3 @@ struct GHOST_ModifierKeys {
   /** Bitfield that stores the appropriate key state. */
   GHOST_TUns8 m_OS : 1;
 };
-
-#endif  // __GHOST_MODIFIERKEYS_H__

intern/ghost/intern/GHOST_NDOFManager.h

@@ -14,8 +14,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GHOST_NDOFMANAGER_H__
+#pragma once
-#define __GHOST_NDOFMANAGER_H__
 
 #ifndef WITH_INPUT_NDOF
 #  error NDOF code included in non-NDOF-enabled build
@@ -167,5 +166,3 @@ class GHOST_NDOFManager {
   bool m_motionEventPending;
   float m_deadZone;  // discard motion with each component < this
 };
-
-#endif

intern/ghost/intern/GHOST_NDOFManagerCocoa.h

@@ -14,8 +14,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GHOST_NDOFMANAGERCOCOA_H__
+#pragma once
-#define __GHOST_NDOFMANAGERCOCOA_H__
 
 #include "GHOST_NDOFManager.h"
 
@@ -29,5 +28,3 @@ class GHOST_NDOFManagerCocoa : public GHOST_NDOFManager {
 
   bool available();
 };
-
-#endif  // #include guard

intern/ghost/intern/GHOST_NDOFManagerUnix.h

@@ -14,8 +14,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GHOST_NDOFMANAGERUNIX_H__
+#pragma once
-#define __GHOST_NDOFMANAGERUNIX_H__
 
 #include "GHOST_NDOFManager.h"
 
@@ -32,5 +31,3 @@ class GHOST_NDOFManagerUnix : public GHOST_NDOFManager {
  private:
   bool m_available;
 };
-
-#endif /* __GHOST_NDOFMANAGERUNIX_H__ */

intern/ghost/intern/GHOST_NDOFManagerWin32.h

@@ -14,8 +14,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GHOST_NDOFMANAGERWIN32_H__
+#pragma once
-#define __GHOST_NDOFMANAGERWIN32_H__
 
 #include "GHOST_NDOFManager.h"
 
@@ -24,5 +23,3 @@ class GHOST_NDOFManagerWin32 : public GHOST_NDOFManager {
   GHOST_NDOFManagerWin32(GHOST_System &);
   bool available();
 };
-
-#endif  // #include guard

intern/ghost/intern/GHOST_System.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_System class.
  */
 
-#ifndef __GHOST_SYSTEM_H__
+#pragma once
-#define __GHOST_SYSTEM_H__
 
 #include "GHOST_ISystem.h"
 
@@ -424,5 +423,3 @@ inline GHOST_NDOFManager *GHOST_System::getNDOFManager() const
   return m_ndofManager;
 }
 #endif
-
-#endif  // __GHOST_SYSTEM_H__

intern/ghost/intern/GHOST_SystemCocoa.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_SystemCocoa class.
  */
 
-#ifndef __GHOST_SYSTEMCOCOA_H__
+#pragma once
-#define __GHOST_SYSTEMCOCOA_H__
 
 #ifndef __APPLE__
 #  error Apple OSX only!
@@ -313,5 +312,3 @@ class GHOST_SystemCocoa : public GHOST_System {
   /** Is the scroll wheel event generated by a multitouch trackpad or mouse? */
   bool m_multiTouchScroll;
 };
-
-#endif  // __GHOST_SYSTEMCOCOA_H__

intern/ghost/intern/GHOST_SystemNULL.h

@@ -19,8 +19,7 @@
  * Declaration of GHOST_SystemNULL class.
  */
 
-#ifndef __GHOST_SYSTEMNULL_H__
+#pragma once
-#define __GHOST_SYSTEMNULL_H__
 
 #include "../GHOST_Types.h"
 #include "GHOST_DisplayManagerNULL.h"
@@ -130,5 +129,3 @@ class GHOST_SystemNULL : public GHOST_System {
                                 ((glSettings.flags & GHOST_glStereoVisual) != 0));
   }
 };
-
-#endif /* __GHOST_SYSTEMNULL_H__ */

intern/ghost/intern/GHOST_SystemPaths.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_SYSTEMPATHS_H__
+#pragma once
-#define __GHOST_SYSTEMPATHS_H__
 
 #include "GHOST_ISystemPaths.h"
 
@@ -70,5 +69,3 @@ class GHOST_SystemPaths : public GHOST_ISystemPaths {
    */
   virtual void addToSystemRecentFiles(const char *filename) const = 0;
 };
-
-#endif

intern/ghost/intern/GHOST_SystemPathsCocoa.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_SYSTEMPATHSCOCOA_H__
+#pragma once
-#define __GHOST_SYSTEMPATHSCOCOA_H__
 
 #ifndef __APPLE__
 #  error Apple OSX only!
@@ -67,5 +66,3 @@ class GHOST_SystemPathsCocoa : public GHOST_SystemPaths {
    */
   void addToSystemRecentFiles(const char *filename) const;
 };
-
-#endif  // __GHOST_SYSTEMPATHSCOCOA_H__

intern/ghost/intern/GHOST_SystemPathsUnix.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_SYSTEMPATHSUNIX_H__
+#pragma once
-#define __GHOST_SYSTEMPATHSUNIX_H__
 
 #include "../GHOST_Types.h"
 #include "GHOST_SystemPaths.h"
@@ -65,5 +64,3 @@ class GHOST_SystemPathsUnix : public GHOST_SystemPaths {
    */
   void addToSystemRecentFiles(const char *filename) const;
 };
-
-#endif /* __GHOST_SYSTEMPATHSUNIX_H__ */

intern/ghost/intern/GHOST_SystemPathsWin32.h

@@ -21,8 +21,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_SYSTEMPATHSWIN32_H__
+#pragma once
-#define __GHOST_SYSTEMPATHSWIN32_H__
 
 #ifndef WIN32
 #  error WIN32 only!
@@ -74,5 +73,3 @@ class GHOST_SystemPathsWin32 : public GHOST_SystemPaths {
    */
   void addToSystemRecentFiles(const char *filename) const;
 };
-
-#endif  // __GHOST_SYSTEMPATHSWIN32_H__

intern/ghost/intern/GHOST_SystemSDL.h

@@ -19,8 +19,7 @@
  * Declaration of GHOST_SystemSDL class.
  */
 
-#ifndef __GHOST_SYSTEMSDL_H__
+#pragma once
-#define __GHOST_SYSTEMSDL_H__
 
 #include "../GHOST_Types.h"
 #include "GHOST_DisplayManagerSDL.h"
@@ -102,5 +101,3 @@ class GHOST_SystemSDL : public GHOST_System {
   /// The vector of windows that need to be updated.
   std::vector<GHOST_WindowSDL *> m_dirty_windows;
 };
-
-#endif

intern/ghost/intern/GHOST_SystemWayland.h

@@ -19,8 +19,7 @@
  * Declaration of GHOST_SystemWayland class.
  */
 
-#ifndef __GHOST_SYSTEMWAYLAND_H__
+#pragma once
-#define __GHOST_SYSTEMWAYLAND_H__
 
 #include "../GHOST_Types.h"
 #include "GHOST_System.h"
@@ -107,5 +106,3 @@ class GHOST_SystemWayland : public GHOST_System {
   struct display_t *d;
   std::string selection;
 };
-
-#endif /* __GHOST_SYSTEMWAYLAND_H__ */

intern/ghost/intern/GHOST_SystemWin32.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_SystemWin32 class.
  */
 
-#ifndef __GHOST_SYSTEMWIN32_H__
+#pragma once
-#define __GHOST_SYSTEMWIN32_H__
 
 #ifndef WIN32
 #  error WIN32 only!
@@ -488,4 +487,3 @@ inline void GHOST_SystemWin32::handleKeyboardChange(void)
     }
   }
 }
-#endif  // __GHOST_SYSTEMWIN32_H__

intern/ghost/intern/GHOST_SystemX11.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_SystemX11 class.
  */
 
-#ifndef __GHOST_SYSTEMX11_H__
+#pragma once
-#define __GHOST_SYSTEMX11_H__
 
 #include <X11/XKBlib.h> /* allow detectable autorepeate */
 #include <X11/Xlib.h>
@@ -392,5 +391,3 @@ class GHOST_SystemX11 : public GHOST_System {
 
   bool generateWindowExposeEvents();
 };
-
-#endif

intern/ghost/intern/GHOST_TaskbarWin32.h

@@ -17,8 +17,7 @@
 /** \file
  * \ingroup GHOST
  */
-#ifndef __GHOST_TASKBARWIN32_H__
+#pragma once
-#define __GHOST_TASKBARWIN32_H__
 
 #ifndef WIN32
 #  error WIN32 only!
@@ -128,5 +127,3 @@ class ITaskbarList3 : public ITaskbarList2 {
   virtual HRESULT STDMETHODCALLTYPE SetThumbnailClip(HWND hwnd, RECT *prcClip) = 0;
 };
 #endif /* ITaskbarList3 */
-
-#endif /*__GHOST_TASKBARWIN32_H__*/

intern/ghost/intern/GHOST_TaskbarX11.h

@@ -17,8 +17,7 @@
 /** \file
  * \ingroup GHOST
  */
-#ifndef __GHOST_TASKBARX11_H__
+#pragma once
-#define __GHOST_TASKBARX11_H__
 
 class GHOST_TaskBarX11 {
  public:
@@ -34,5 +33,3 @@ class GHOST_TaskBarX11 {
  private:
   void *handle;
 };
-
-#endif /*__GHOST_TASKBARX11_H__*/

intern/ghost/intern/GHOST_TimerManager.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_TimerManager class.
  */
 
-#ifndef __GHOST_TIMERMANAGER_H__
+#pragma once
-#define __GHOST_TIMERMANAGER_H__
 
 #include <vector>
 
@@ -112,5 +111,3 @@ class GHOST_TimerManager {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_TimerManager")
 #endif
 };
-
-#endif  // __GHOST_TIMERMANAGER_H__

intern/ghost/intern/GHOST_TimerTask.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_TimerTask class.
  */
 
-#ifndef __GHOST_TIMERTASK_H__
+#pragma once
-#define __GHOST_TIMERTASK_H__
 
 #include "GHOST_ITimerTask.h"
 
@@ -179,5 +178,3 @@ class GHOST_TimerTask : public GHOST_ITimerTask {
   /** Auxiliary storage room. */
   GHOST_TUns32 m_auxData;
 };
-
-#endif  // __GHOST_TIMERTASK_H__

intern/ghost/intern/GHOST_Window.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_Window class.
  */
 
-#ifndef __GHOST_WINDOW_H__
+#pragma once
-#define __GHOST_WINDOW_H__
 
 #include "GHOST_IWindow.h"
 
@@ -456,5 +455,3 @@ inline GHOST_TStandardCursor GHOST_Window::getCursorShape() const
 {
   return m_cursorShape;
 }
-
-#endif  // _GHOST_WINDOW_H

intern/ghost/intern/GHOST_WindowCocoa.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_WindowCocoa class.
  */
 
-#ifndef __GHOST_WINDOWCOCOA_H__
+#pragma once
-#define __GHOST_WINDOWCOCOA_H__
 
 #ifndef __APPLE__
 #  error Apple OSX only!
@@ -327,5 +326,3 @@ class GHOST_WindowCocoa : public GHOST_Window {
   bool m_debug_context;  // for debug messages during context setup
   bool m_is_dialog;
 };
-
-#endif  // __GHOST_WINDOWCOCOA_H__

intern/ghost/intern/GHOST_WindowManager.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_WindowManager class.
  */
 
-#ifndef __GHOST_WINDOWMANAGER_H__
+#pragma once
-#define __GHOST_WINDOWMANAGER_H__
 
 #include <vector>
 
@@ -149,5 +148,3 @@ class GHOST_WindowManager {
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_WindowManager")
 #endif
 };
-
-#endif  // __GHOST_WINDOWMANAGER_H__

intern/ghost/intern/GHOST_WindowNULL.h

@@ -19,8 +19,7 @@
  * Declaration of GHOST_WindowNULL class.
  */
 
-#ifndef __GHOST_WINDOWNULL_H__
+#pragma once
-#define __GHOST_WINDOWNULL_H__
 
 #include "GHOST_Window.h"
 
@@ -177,5 +176,3 @@ class GHOST_WindowNULL : public GHOST_Window {
     return NULL;
   }
 };
-
-#endif  // __GHOST_WINDOWNULL_H__

intern/ghost/intern/GHOST_WindowSDL.h

@@ -19,8 +19,7 @@
  * Declaration of GHOST_WindowSDL class.
  */
 
-#ifndef __GHOST_WINDOWSDL_H__
+#pragma once
-#define __GHOST_WINDOWSDL_H__
 
 #include "GHOST_SystemSDL.h"
 #include "GHOST_Window.h"
@@ -149,5 +148,3 @@ class GHOST_WindowSDL : public GHOST_Window {
 
   GHOST_TUns16 getDPIHint();
 };
-
-#endif  // __GHOST_WINDOWSDL_H__

intern/ghost/intern/GHOST_WindowWayland.h

@@ -20,8 +20,7 @@
  * Declaration of GHOST_WindowWayland class.
  */
 
-#ifndef __GHOST_WINDOWWAYLAND_H__
+#pragma once
-#define __GHOST_WINDOWWAYLAND_H__
 
 #include "GHOST_Window.h"
 
@@ -124,5 +123,3 @@ class GHOST_WindowWayland : public GHOST_Window {
    */
   GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type) override;
 };
-
-#endif  // __GHOST_WINDOWWAYLAND_H__

intern/ghost/intern/GHOST_WindowWin32.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_WindowWin32 class.
  */
 
-#ifndef __GHOST_WINDOWWIN32_H__
+#pragma once
-#define __GHOST_WINDOWWIN32_H__
 
 #ifndef WIN32
 #  error WIN32 only!
@@ -586,5 +585,3 @@ class GHOST_WindowWin32 : public GHOST_Window {
 #endif
   bool m_debug_context;
 };
-
-#endif  // __GHOST_WINDOWWIN32_H__

intern/ghost/intern/GHOST_WindowX11.h

@@ -22,8 +22,7 @@
  * Declaration of GHOST_WindowX11 class.
  */
 
-#ifndef __GHOST_WINDOWX11_H__
+#pragma once
-#define __GHOST_WINDOWX11_H__
 
 #include "GHOST_Window.h"
 #include <X11/Xlib.h>
@@ -288,5 +287,3 @@ class GHOST_WindowX11 : public GHOST_Window {
   void motifFullScreen(bool set);
   bool motifIsFullScreen() const;
 };
-
-#endif  // __GHOST_WINDOWX11_H__

intern/ghost/intern/GHOST_XrContext.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_XRCONTEXT_H__
+#pragma once
-#define __GHOST_XRCONTEXT_H__
 
 #include <memory>
 #include <vector>
@@ -131,5 +130,3 @@ class GHOST_XrContext : public GHOST_IXrContext {
   GHOST_TXrGraphicsBinding determineGraphicsBindingTypeToEnable(
       const GHOST_XrContextCreateInfo *create_info);
 };
-
-#endif  // __GHOST_XRCONTEXT_H__

intern/ghost/intern/GHOST_XrException.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_XREXCEPTION_H__
+#pragma once
-#define __GHOST_XREXCEPTION_H__
 
 #include <exception>
 
@@ -41,5 +40,3 @@ class GHOST_XrException : public std::exception {
   const char *m_msg;
   int m_result;
 };
-
-#endif  // __GHOST_XREXCEPTION_H__

intern/ghost/intern/GHOST_XrSession.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_XRSESSION_H__
+#pragma once
-#define __GHOST_XRSESSION_H__
 
 #include <map>
 #include <memory>
@@ -84,5 +83,3 @@ class GHOST_XrSession {
   void beginFrameDrawing();
   void endFrameDrawing(std::vector<XrCompositionLayerBaseHeader *> *layers);
 };
-
-#endif /* GHOST_XRSESSION_H__ */

intern/ghost/intern/GHOST_XrSwapchain.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_XRSWAPCHAIN_H__
+#pragma once
-#define __GHOST_XRSWAPCHAIN_H__
 
 #include <memory>
 
@@ -45,5 +44,3 @@ class GHOST_XrSwapchain {
   int32_t m_image_width, m_image_height;
   bool m_is_srgb_buffer = false;
 };
-
-#endif  // GHOST_XRSWAPCHAIN_H

intern/ghost/intern/GHOST_Xr_intern.h

@@ -18,8 +18,7 @@
  * \ingroup GHOST
  */
 
-#ifndef __GHOST_XR_INTERN_H__
+#pragma once
-#define __GHOST_XR_INTERN_H__
 
 #include <memory>
 #include <vector>
@@ -46,5 +45,3 @@
     (void)_res; \
   } \
   (void)0
-
-#endif /* __GHOST_XR_INTERN_H__ */

intern/ghost/intern/GHOST_Xr_openxr_includes.h

@@ -22,8 +22,7 @@
  * installed.
  */
 
-#ifndef __GHOST_XR_SYSTEM_INCLUDES_H__
+#pragma once
-#define __GHOST_XR_SYSTEM_INCLUDES_H__
 
 /* Platform headers */
 #ifdef XR_USE_PLATFORM_WIN32
@@ -48,5 +47,3 @@
 
 #include <openxr/openxr.h>
 #include <openxr/openxr_platform.h>
-
-#endif /* __GHOST_XR_SYSTEM_INCLUDES_H__ */