diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
tree | ec50d7bdca3901a6afcc986943011f08f9516307 /intern/ghost | |
parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/ghost')
55 files changed, 113 insertions, 113 deletions
diff --git a/intern/ghost/GHOST_IContext.h b/intern/ghost/GHOST_IContext.h index 33422b8e351..d404287fe56 100644 --- a/intern/ghost/GHOST_IContext.h +++ b/intern/ghost/GHOST_IContext.h @@ -25,8 +25,8 @@ #ifndef __GHOST_IContext_H__ #define __GHOST_IContext_H__ -#include "STR_String.h" #include "GHOST_Types.h" +#include "STR_String.h" /** * Interface for GHOST context. diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index fc7e563e1d8..0d9bfb2c4de 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -25,8 +25,8 @@ #ifndef __GHOST_IEVENT_H__ #define __GHOST_IEVENT_H__ -#include <stddef.h> #include "GHOST_Types.h" +#include <stddef.h> class GHOST_IWindow; diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 5d529141ca7..8adf49fe1f9 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -27,10 +27,10 @@ #ifndef __GHOST_ISYSTEM_H__ #define __GHOST_ISYSTEM_H__ -#include "GHOST_Types.h" #include "GHOST_IContext.h" #include "GHOST_ITimerTask.h" #include "GHOST_IWindow.h" +#include "GHOST_Types.h" class GHOST_IEventConsumer; diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 07133d86ce4..c456f2b1dba 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -25,9 +25,9 @@ #ifndef __GHOST_IWINDOW_H__ #define __GHOST_IWINDOW_H__ -#include "STR_String.h" #include "GHOST_Rect.h" #include "GHOST_Types.h" +#include "STR_String.h" /** * Interface for GHOST windows. diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index d43a2637ad3..af2a13945d1 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -25,11 +25,11 @@ #include <stdlib.h> -#include "intern/GHOST_Debug.h" #include "GHOST_C-api.h" -#include "GHOST_ISystem.h" #include "GHOST_IEvent.h" #include "GHOST_IEventConsumer.h" +#include "GHOST_ISystem.h" +#include "intern/GHOST_Debug.h" #ifdef WITH_XR_OPENXR # include "GHOST_IXrContext.h" #endif diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp index 843c8adc6cb..db6ead6d96a 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp @@ -25,9 +25,9 @@ * Copyright (C) 2001 NaN Technologies B.V. */ -#include "GHOST_Debug.h" -#include "GHOST_C-api.h" #include "GHOST_CallbackEventConsumer.h" +#include "GHOST_C-api.h" +#include "GHOST_Debug.h" GHOST_CallbackEventConsumer::GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userData) diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index 7abe0253f75..9c3fc642209 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -25,8 +25,8 @@ #ifndef __GHOST_CALLBACKEVENTCONSUMER_H__ #define __GHOST_CALLBACKEVENTCONSUMER_H__ -#include "GHOST_IEventConsumer.h" #include "GHOST_C-api.h" +#include "GHOST_IEventConsumer.h" /** * Event consumer that will forward events to a call-back routine. diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index e2e74a3113b..c5303aa54da 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -26,11 +26,11 @@ #include "GHOST_ContextCGL.h" #include <Cocoa/Cocoa.h> -#include <QuartzCore/QuartzCore.h> #include <Metal/Metal.h> +#include <QuartzCore/QuartzCore.h> -#include <vector> #include <cassert> +#include <vector> static void ghost_fatal_error_dialog(const char *msg) { diff --git a/intern/ghost/intern/GHOST_ContextD3D.cpp b/intern/ghost/intern/GHOST_ContextD3D.cpp index ed65d499073..ad948578d53 100644 --- a/intern/ghost/intern/GHOST_ContextD3D.cpp +++ b/intern/ghost/intern/GHOST_ContextD3D.cpp @@ -27,8 +27,8 @@ #include <GL/glew.h> #include <GL/wglew.h> -#include "GHOST_ContextWGL.h" /* For shared drawing */ #include "GHOST_ContextD3D.h" +#include "GHOST_ContextWGL.h" /* For shared drawing */ HMODULE GHOST_ContextD3D::s_d3d_lib = NULL; PFN_D3D11_CREATE_DEVICE GHOST_ContextD3D::s_D3D11CreateDeviceFn = NULL; diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp index 6d5d4f75351..ddb34a8afd9 100644 --- a/intern/ghost/intern/GHOST_ContextWGL.cpp +++ b/intern/ghost/intern/GHOST_ContextWGL.cpp @@ -27,8 +27,8 @@ #include <tchar.h> -#include <cstdio> #include <cassert> +#include <cstdio> #include <vector> HGLRC GHOST_ContextWGL::s_sharedHGLRC = NULL; diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index f060d45c911..954c3efb22c 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -20,8 +20,8 @@ #include <Cocoa/Cocoa.h> -#include "GHOST_DisplayManagerCocoa.h" #include "GHOST_Debug.h" +#include "GHOST_DisplayManagerCocoa.h" // We do not support multiple monitors at the moment diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp index 059f04992fb..b836f256b27 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp @@ -22,8 +22,8 @@ * \ingroup GHOST */ -#include "GHOST_SystemSDL.h" #include "GHOST_DisplayManagerSDL.h" +#include "GHOST_SystemSDL.h" #include "GHOST_WindowManager.h" diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cpp index 931aca81fb8..9f8ce3b5095 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp +++ b/intern/ghost/intern/GHOST_DropTargetWin32.cpp @@ -21,8 +21,8 @@ * \ingroup GHOST */ -#include "GHOST_Debug.h" #include "GHOST_DropTargetWin32.h" +#include "GHOST_Debug.h" #include <shellapi.h> #include "utf_winfunc.h" diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.h index ee124f3ba0e..ee75c017981 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.h +++ b/intern/ghost/intern/GHOST_DropTargetWin32.h @@ -24,10 +24,10 @@ #ifndef __GHOST_DROPTARGETWIN32_H__ #define __GHOST_DROPTARGETWIN32_H__ -#include <string.h> -#include <GHOST_Types.h> -#include "GHOST_WindowWin32.h" #include "GHOST_SystemWin32.h" +#include "GHOST_WindowWin32.h" +#include <GHOST_Types.h> +#include <string.h> class GHOST_DropTargetWin32 : public IDropTarget { public: diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.h index d3f98ff11cf..9ca12442085 100644 --- a/intern/ghost/intern/GHOST_DropTargetX11.h +++ b/intern/ghost/intern/GHOST_DropTargetX11.h @@ -24,9 +24,9 @@ #ifndef __GHOST_DROPTARGETX11_H__ #define __GHOST_DROPTARGETX11_H__ -#include <GHOST_Types.h> -#include "GHOST_WindowX11.h" #include "GHOST_SystemX11.h" +#include "GHOST_WindowX11.h" +#include <GHOST_Types.h> #include "xdnd.h" diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index 3c27e2c826a..f16d90899b9 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -26,8 +26,8 @@ */ #include "GHOST_EventManager.h" -#include <algorithm> #include "GHOST_Debug.h" +#include <algorithm> #include <stdio.h> // [mce] temp debug GHOST_EventManager::GHOST_EventManager() diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp index e459da39d14..fb34b1d3b1a 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.cpp +++ b/intern/ghost/intern/GHOST_EventPrinter.cpp @@ -23,10 +23,10 @@ */ #include "GHOST_EventPrinter.h" -#include <iostream> -#include "GHOST_EventKey.h" -#include "GHOST_EventDragnDrop.h" #include "GHOST_Debug.h" +#include "GHOST_EventDragnDrop.h" +#include "GHOST_EventKey.h" +#include <iostream> #include <stdio.h> diff --git a/intern/ghost/intern/GHOST_ImeWin32.cpp b/intern/ghost/intern/GHOST_ImeWin32.cpp index 104b0f67c77..112a266ae28 100644 --- a/intern/ghost/intern/GHOST_ImeWin32.cpp +++ b/intern/ghost/intern/GHOST_ImeWin32.cpp @@ -25,8 +25,8 @@ #ifdef WITH_INPUT_IME -# include "GHOST_C-api.h" # include "GHOST_ImeWin32.h" +# include "GHOST_C-api.h" # include "GHOST_WindowWin32.h" # include "utfconv.h" diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index 3fe61ee0aa9..a9fbadab37a 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -14,14 +14,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "GHOST_Debug.h" #include "GHOST_NDOFManager.h" -#include "GHOST_EventNDOF.h" +#include "GHOST_Debug.h" #include "GHOST_EventKey.h" +#include "GHOST_EventNDOF.h" #include "GHOST_WindowManager.h" -#include <string.h> // for memory functions -#include <stdio.h> // for error/info reporting #include <math.h> +#include <stdio.h> // for error/info reporting +#include <string.h> // for memory functions #ifdef DEBUG_NDOF_MOTION // printable version of each GHOST_TProgress value diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm index 4c9c58c36be..5274b2d1ba9 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm @@ -19,8 +19,8 @@ #include "GHOST_NDOFManagerCocoa.h" #include "GHOST_SystemCocoa.h" -#include <stdint.h> #include <dlfcn.h> +#include <stdint.h> #if DEBUG_NDOF_DRIVER # include <cstdio> diff --git a/intern/ghost/intern/GHOST_Path-api.cpp b/intern/ghost/intern/GHOST_Path-api.cpp index 9e4ed1e0eea..df3592fb5e5 100644 --- a/intern/ghost/intern/GHOST_Path-api.cpp +++ b/intern/ghost/intern/GHOST_Path-api.cpp @@ -23,10 +23,10 @@ #include <cstdio> -#include "intern/GHOST_Debug.h" -#include "GHOST_Types.h" -#include "GHOST_Path-api.h" #include "GHOST_ISystemPaths.h" +#include "GHOST_Path-api.h" +#include "GHOST_Types.h" +#include "intern/GHOST_Debug.h" GHOST_TSuccess GHOST_CreateSystemPaths(void) { diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 12096d65240..97704435f04 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -23,13 +23,13 @@ #include "GHOST_System.h" -#include <time.h> #include <stdio.h> /* just for printf */ +#include <time.h> #include "GHOST_DisplayManager.h" #include "GHOST_EventManager.h" -#include "GHOST_TimerTask.h" #include "GHOST_TimerManager.h" +#include "GHOST_TimerTask.h" #include "GHOST_WindowManager.h" #ifdef WITH_INPUT_NDOF diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index dff27b0903d..2eec6ca43b3 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -27,10 +27,10 @@ #include "GHOST_ISystem.h" -#include "GHOST_Debug.h" #include "GHOST_Buttons.h" -#include "GHOST_ModifierKeys.h" +#include "GHOST_Debug.h" #include "GHOST_EventManager.h" +#include "GHOST_ModifierKeys.h" #ifdef GHOST_DEBUG # include "GHOST_EventPrinter.h" #endif // GHOST_DEBUG diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 9d899a4fc2f..9becff40995 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -20,17 +20,17 @@ #include "GHOST_SystemCocoa.h" #include "GHOST_DisplayManagerCocoa.h" -#include "GHOST_EventKey.h" #include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" -#include "GHOST_EventWheel.h" -#include "GHOST_EventTrackpad.h" #include "GHOST_EventDragnDrop.h" +#include "GHOST_EventKey.h" #include "GHOST_EventString.h" +#include "GHOST_EventTrackpad.h" +#include "GHOST_EventWheel.h" #include "GHOST_TimerManager.h" #include "GHOST_TimerTask.h" -#include "GHOST_WindowManager.h" #include "GHOST_WindowCocoa.h" +#include "GHOST_WindowManager.h" #if defined(WITH_GL_EGL) # include "GHOST_ContextEGL.h" @@ -49,9 +49,9 @@ /* For the currently not ported to Cocoa keyboard layout functions (64bit & 10.6 compatible) */ #include <Carbon/Carbon.h> +#include <sys/sysctl.h> #include <sys/time.h> #include <sys/types.h> -#include <sys/sysctl.h> #pragma mark KeyMap, mouse converters diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h index 10138bfc6eb..68a726f2be8 100644 --- a/intern/ghost/intern/GHOST_SystemNULL.h +++ b/intern/ghost/intern/GHOST_SystemNULL.h @@ -22,9 +22,9 @@ #ifndef __GHOST_SYSTEMNULL_H__ #define __GHOST_SYSTEMNULL_H__ -#include "GHOST_System.h" #include "../GHOST_Types.h" #include "GHOST_DisplayManagerNULL.h" +#include "GHOST_System.h" #include "GHOST_WindowNULL.h" class GHOST_WindowNULL; diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp index 9514edb7404..ad3d490eb91 100644 --- a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp @@ -30,8 +30,8 @@ #include <sys/time.h> #include <unistd.h> -#include <stdio.h> /* for fprintf only */ #include <cstdlib> /* for exit */ +#include <stdio.h> /* for fprintf only */ #include <pwd.h> /* for get home without use getenv() */ #include <string> diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.h b/intern/ghost/intern/GHOST_SystemPathsUnix.h index dcd3ab34704..f9f89f6e79b 100644 --- a/intern/ghost/intern/GHOST_SystemPathsUnix.h +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.h @@ -24,8 +24,8 @@ #ifndef __GHOST_SYSTEMPATHSUNIX_H__ #define __GHOST_SYSTEMPATHSUNIX_H__ -#include "GHOST_SystemPaths.h" #include "../GHOST_Types.h" +#include "GHOST_SystemPaths.h" class GHOST_SystemPathsUnix : public GHOST_SystemPaths { public: diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp index 63a6b7224b5..673cbcad97e 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp @@ -26,8 +26,8 @@ #ifndef _WIN32_IE # define _WIN32_IE 0x0501 #endif -#include <shlobj.h> #include "utfconv.h" +#include <shlobj.h> GHOST_SystemPathsWin32::GHOST_SystemPathsWin32() { diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index 656afb9d050..5dae0ce504b 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -26,9 +26,9 @@ #include "GHOST_WindowManager.h" +#include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" #include "GHOST_EventKey.h" -#include "GHOST_EventButton.h" #include "GHOST_EventWheel.h" GHOST_SystemSDL::GHOST_SystemSDL() : GHOST_System() diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h index c69a7c740bc..1994781530b 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.h +++ b/intern/ghost/intern/GHOST_SystemSDL.h @@ -22,12 +22,12 @@ #ifndef __GHOST_SYSTEMSDL_H__ #define __GHOST_SYSTEMSDL_H__ -#include "GHOST_System.h" #include "../GHOST_Types.h" #include "GHOST_DisplayManagerSDL.h" +#include "GHOST_Event.h" +#include "GHOST_System.h" #include "GHOST_TimerManager.h" #include "GHOST_WindowSDL.h" -#include "GHOST_Event.h" extern "C" { #include "SDL.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index d03b9343eab..26d3aea403c 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -21,8 +21,8 @@ * \ingroup GHOST */ -#include "GHOST_ContextD3D.h" #include "GHOST_SystemWin32.h" +#include "GHOST_ContextD3D.h" #include "GHOST_EventDragnDrop.h" #ifndef _WIN32_IE @@ -30,22 +30,22 @@ #endif #include <commctrl.h> -#include <shlobj.h> -#include <tlhelp32.h> #include <psapi.h> #include <shellapi.h> +#include <shlobj.h> +#include <tlhelp32.h> #include <windowsx.h> -#include "utfconv.h" #include "utf_winfunc.h" +#include "utfconv.h" #include "GHOST_DisplayManagerWin32.h" #include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" #include "GHOST_EventKey.h" #include "GHOST_EventWheel.h" -#include "GHOST_TimerTask.h" #include "GHOST_TimerManager.h" +#include "GHOST_TimerTask.h" #include "GHOST_WindowManager.h" #include "GHOST_WindowWin32.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index bf9d18ca380..e624cc83427 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -30,8 +30,8 @@ #endif // WIN32 #define WIN32_LEAN_AND_MEAN -#include <windows.h> #include <ole2.h> // for drag-n-drop +#include <windows.h> #include "GHOST_System.h" diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index b0c35ce6546..a9d656a1c36 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -23,21 +23,21 @@ * \ingroup GHOST */ -#include <X11/Xatom.h> -#include <X11/keysym.h> #include <X11/XKBlib.h> /* allow detectable autorepeate */ +#include <X11/Xatom.h> #include <X11/Xutil.h> +#include <X11/keysym.h> -#include "GHOST_SystemX11.h" -#include "GHOST_WindowX11.h" -#include "GHOST_WindowManager.h" -#include "GHOST_TimerManager.h" +#include "GHOST_DisplayManagerX11.h" +#include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" +#include "GHOST_EventDragnDrop.h" #include "GHOST_EventKey.h" -#include "GHOST_EventButton.h" #include "GHOST_EventWheel.h" -#include "GHOST_DisplayManagerX11.h" -#include "GHOST_EventDragnDrop.h" +#include "GHOST_SystemX11.h" +#include "GHOST_TimerManager.h" +#include "GHOST_WindowManager.h" +#include "GHOST_WindowX11.h" #ifdef WITH_INPUT_NDOF # include "GHOST_NDOFManagerUnix.h" #endif @@ -74,10 +74,10 @@ #include <sys/time.h> #include <unistd.h> +#include <cstdlib> /* for exit */ #include <iostream> -#include <vector> #include <stdio.h> /* for fprintf only */ -#include <cstdlib> /* for exit */ +#include <vector> /* for debugging - so we can breakpoint X11 errors */ // #define USE_X11_ERROR_HANDLERS diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 8736e20c57f..d0e0506e77b 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -25,11 +25,11 @@ #ifndef __GHOST_SYSTEMX11_H__ #define __GHOST_SYSTEMX11_H__ -#include <X11/Xlib.h> #include <X11/XKBlib.h> /* allow detectable autorepeate */ +#include <X11/Xlib.h> -#include "GHOST_System.h" #include "../GHOST_Types.h" +#include "GHOST_System.h" // For tablets #ifdef WITH_X11_XINPUT diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h index abf1172cea8..58641123c24 100644 --- a/intern/ghost/intern/GHOST_TaskbarWin32.h +++ b/intern/ghost/intern/GHOST_TaskbarWin32.h @@ -25,8 +25,8 @@ #endif // WIN32 #define WIN32_LEAN_AND_MEAN -#include <windows.h> #include <shlobj.h> +#include <windows.h> // ITaskbarList, ITaskbarList2 and ITaskbarList3 might be missing, present here in that case. // Note, ITaskbarList3 is supported only since Windows 7, though. Check for that is done in diff --git a/intern/ghost/intern/GHOST_TaskbarX11.cpp b/intern/ghost/intern/GHOST_TaskbarX11.cpp index e33c84fe4d8..2fa8137e1be 100644 --- a/intern/ghost/intern/GHOST_TaskbarX11.cpp +++ b/intern/ghost/intern/GHOST_TaskbarX11.cpp @@ -20,10 +20,10 @@ #include "GHOST_TaskbarX11.h" -#include <dlfcn.h> -#include <cstdio> #include <cassert> +#include <cstdio> #include <cstdlib> +#include <dlfcn.h> typedef void *(*unity_get_entry_t)(const char *); typedef void (*unity_set_progress_t)(void *, double); diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 81eb27a129a..c90b49c27a5 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -18,9 +18,9 @@ */ #include "GHOST_WindowCocoa.h" -#include "GHOST_SystemCocoa.h" #include "GHOST_ContextNone.h" #include "GHOST_Debug.h" +#include "GHOST_SystemCocoa.h" #if defined(WITH_GL_EGL) # include "GHOST_ContextEGL.h" @@ -29,8 +29,8 @@ #endif #include <Cocoa/Cocoa.h> -#include <QuartzCore/QuartzCore.h> #include <Metal/Metal.h> +#include <QuartzCore/QuartzCore.h> #include <sys/sysctl.h> diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp index d1d66c35de5..eec4bc5f7d0 100644 --- a/intern/ghost/intern/GHOST_WindowManager.cpp +++ b/intern/ghost/intern/GHOST_WindowManager.cpp @@ -26,9 +26,9 @@ */ #include "GHOST_WindowManager.h" -#include <algorithm> #include "GHOST_Debug.h" #include "GHOST_Window.h" +#include <algorithm> GHOST_WindowManager::GHOST_WindowManager() : m_fullScreenWindow(0), m_activeWindow(0), m_activeWindowBeforeFullScreen(0) diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index a682eccf7e2..661439191c5 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -27,8 +27,8 @@ #include <vector> -#include "GHOST_Rect.h" #include "GHOST_IWindow.h" +#include "GHOST_Rect.h" /** * Manages system windows (platform independent implementation). diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h index 6332ce584d2..eadd1b7df9d 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.h +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -22,8 +22,8 @@ #ifndef __GHOST_WINDOWSDL_H__ #define __GHOST_WINDOWSDL_H__ -#include "GHOST_Window.h" #include "GHOST_SystemSDL.h" +#include "GHOST_Window.h" #include <map> diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 1d2630bc66d..6570f27ac5a 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -23,14 +23,14 @@ #define _USE_MATH_DEFINES -#include "GHOST_ContextD3D.h" -#include "GHOST_WindowManager.h" #include "GHOST_WindowWin32.h" -#include "GHOST_SystemWin32.h" -#include "GHOST_DropTargetWin32.h" +#include "GHOST_ContextD3D.h" #include "GHOST_ContextNone.h" -#include "utfconv.h" +#include "GHOST_DropTargetWin32.h" +#include "GHOST_SystemWin32.h" +#include "GHOST_WindowManager.h" #include "utf_winfunc.h" +#include "utfconv.h" #if defined(WITH_GL_EGL) # include "GHOST_ContextEGL.h" @@ -41,10 +41,10 @@ # include <Dwmapi.h> #endif -#include <windowsx.h> +#include <assert.h> #include <math.h> #include <string.h> -#include <assert.h> +#include <windowsx.h> #ifndef GET_POINTERID_WPARAM # define GET_POINTERID_WPARAM(wParam) (LOWORD(wParam)) diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index 4795539e0f9..ac1ec0ee852 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -29,8 +29,8 @@ # error WIN32 only! #endif // WIN32 -#include "GHOST_Window.h" #include "GHOST_TaskbarWin32.h" +#include "GHOST_Window.h" #ifdef WITH_INPUT_IME # include "GHOST_ImeWin32.h" #endif diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 349b11728bd..3bece605d45 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -22,18 +22,18 @@ */ /* For standard X11 cursors */ -#include <X11/cursorfont.h> #include <X11/Xatom.h> -#include <X11/Xutil.h> #include <X11/Xmd.h> +#include <X11/Xutil.h> +#include <X11/cursorfont.h> #ifdef WITH_X11_ALPHA # include <X11/extensions/Xrender.h> #endif -#include "GHOST_WindowX11.h" -#include "GHOST_SystemX11.h" +#include "GHOST_Debug.h" #include "GHOST_IconX11.h" +#include "GHOST_SystemX11.h" +#include "GHOST_WindowX11.h" #include "STR_String.h" -#include "GHOST_Debug.h" #ifdef WITH_XDND # include "GHOST_DropTargetX11.h" @@ -54,15 +54,15 @@ // For DPI value #include <X11/Xresource.h> -#include <cstring> #include <cstdio> +#include <cstring> /* gethostname */ #include <unistd.h> #include <algorithm> -#include <string> #include <math.h> +#include <string> /* For obscure full screen mode stuff * lifted verbatim from blut. */ diff --git a/intern/ghost/intern/GHOST_Xr.cpp b/intern/ghost/intern/GHOST_Xr.cpp index 2f122ca8e13..dc63aac217c 100644 --- a/intern/ghost/intern/GHOST_Xr.cpp +++ b/intern/ghost/intern/GHOST_Xr.cpp @@ -25,9 +25,9 @@ #include "GHOST_C-api.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" #include "GHOST_XrException.h" +#include "GHOST_Xr_intern.h" GHOST_XrContextHandle GHOST_XrContextCreate(const GHOST_XrContextCreateInfo *create_info) { diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp index d7b83114c85..a757aa9a555 100644 --- a/intern/ghost/intern/GHOST_XrContext.cpp +++ b/intern/ghost/intern/GHOST_XrContext.cpp @@ -25,9 +25,9 @@ #include <string> #include "GHOST_Types.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrException.h" #include "GHOST_XrSession.h" +#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" diff --git a/intern/ghost/intern/GHOST_XrEvent.cpp b/intern/ghost/intern/GHOST_XrEvent.cpp index dfee2e95f10..30005055f9b 100644 --- a/intern/ghost/intern/GHOST_XrEvent.cpp +++ b/intern/ghost/intern/GHOST_XrEvent.cpp @@ -21,8 +21,8 @@ #include <iostream> #include "GHOST_C-api.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" +#include "GHOST_Xr_intern.h" static bool GHOST_XrEventPollNext(XrInstance instance, XrEventDataBuffer &r_event_data) { diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp index f094b0744a2..ea97b3a50cf 100644 --- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp +++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp @@ -25,8 +25,8 @@ #if defined(WITH_X11) # include "GHOST_ContextGLX.h" #elif defined(WIN32) -# include "GHOST_ContextWGL.h" # include "GHOST_ContextD3D.h" +# include "GHOST_ContextWGL.h" #endif #include "GHOST_C-api.h" #include "GHOST_Xr_intern.h" diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp index a85bde3cab6..53d22cbd679 100644 --- a/intern/ghost/intern/GHOST_XrSession.cpp +++ b/intern/ghost/intern/GHOST_XrSession.cpp @@ -28,10 +28,10 @@ #include "GHOST_C-api.h" #include "GHOST_IXrGraphicsBinding.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" #include "GHOST_XrException.h" #include "GHOST_XrSwapchain.h" +#include "GHOST_Xr_intern.h" #include "GHOST_XrSession.h" diff --git a/intern/ghost/intern/GHOST_XrSwapchain.cpp b/intern/ghost/intern/GHOST_XrSwapchain.cpp index f0b2fb80bf1..4c91bcc2dc3 100644 --- a/intern/ghost/intern/GHOST_XrSwapchain.cpp +++ b/intern/ghost/intern/GHOST_XrSwapchain.cpp @@ -23,9 +23,9 @@ #include "GHOST_C-api.h" #include "GHOST_IXrGraphicsBinding.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrException.h" #include "GHOST_XrSession.h" +#include "GHOST_Xr_intern.h" #include "GHOST_XrSwapchain.h" diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index 80675ac5e3d..3419f70dfcf 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -25,10 +25,10 @@ * in turn, is probably taken from somewhere as well. */ -#include <stdlib.h> +#include <math.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <math.h> #define FALSE 0 @@ -36,8 +36,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include <windows.h> # include <GL/gl.h> +# include <windows.h> # else /* WIN32 */ /* __APPLE__ is defined */ # include <AGL/gl.h> diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index 47eddbcfb83..a554bfeebef 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -30,8 +30,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include <windows.h> # include <atlbase.h> +# include <windows.h> # include <GL/gl.h> # else // WIN32 \ @@ -42,12 +42,12 @@ # include <GL/gl.h> #endif // defined(WIN32) || defined(__APPLE__) -#include "STR_String.h" #include "GHOST_Rect.h" +#include "STR_String.h" -#include "GHOST_ISystem.h" #include "GHOST_IEvent.h" #include "GHOST_IEventConsumer.h" +#include "GHOST_ISystem.h" #define LEFT_EYE 0 #define RIGHT_EYE 1 diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c index 57fb950fa8b..788c0221753 100644 --- a/intern/ghost/test/multitest/EventToBuf.c +++ b/intern/ghost/test/multitest/EventToBuf.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "GHOST_C-api.h" #include "EventToBuf.h" +#include "GHOST_C-api.h" char *eventtype_to_string(GHOST_TEventType type) { diff --git a/intern/ghost/test/multitest/GL.h b/intern/ghost/test/multitest/GL.h index 2a7d95212e1..34ac1a40d9e 100644 --- a/intern/ghost/test/multitest/GL.h +++ b/intern/ghost/test/multitest/GL.h @@ -20,8 +20,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include <windows.h> # include <GL/gl.h> +# include <windows.h> # else // WIN32 // __APPLE__ is defined # include <AGL/gl.h> diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 374c7170dc6..75aa0119a7f 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -33,13 +33,13 @@ # pragma warning(disable : 4244 4305) #endif +#include <math.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> -#include <math.h> -#include <GL/glew.h> #include "GL.h" +#include <GL/glew.h> #include "MEM_guardedalloc.h" @@ -47,16 +47,16 @@ #include "BLF_api.h" -#include "Util.h" #include "Basic.h" -#include "ScrollBar.h" #include "EventToBuf.h" +#include "ScrollBar.h" +#include "Util.h" #include "WindowData.h" /* GPU API. */ -#include "GPU_immediate.h" #include "GPU_context.h" +#include "GPU_immediate.h" #include "GPU_init_exit.h" extern int datatoc_bfont_ttf_size; diff --git a/intern/ghost/test/multitest/Util.c b/intern/ghost/test/multitest/Util.c index c6cdebd39ce..962dd88c47b 100644 --- a/intern/ghost/test/multitest/Util.c +++ b/intern/ghost/test/multitest/Util.c @@ -19,9 +19,9 @@ #include <stdlib.h> -#include <string.h> #include <stdarg.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" |