diff --git a/AppCore/App.h b/AppCore/App.h index e8a986b..1791bb0 100644 --- a/AppCore/App.h +++ b/AppCore/App.h @@ -13,9 +13,9 @@ /// #pragma once #include "Defines.h" -#include -#include -#include +#include "../Ultralight/RefPtr.h" +#include "../Ultralight/Renderer.h" +#include "../Ultralight/platform/Config.h" namespace ultralight { diff --git a/AppCore/AppCore.h b/AppCore/AppCore.h index e518565..6fa6638 100644 --- a/AppCore/AppCore.h +++ b/AppCore/AppCore.h @@ -1,6 +1,6 @@ -#include -#include -#include -#include -#include -#include \ No newline at end of file +#include "App.h" +#include "Monitor.h" +#include "Window.h" +#include "Overlay.h" +#include "JSHelpers.h" +#include "Platform.h" \ No newline at end of file diff --git a/AppCore/CAPI.h b/AppCore/CAPI.h index 5be6242..5779380 100644 --- a/AppCore/CAPI.h +++ b/AppCore/CAPI.h @@ -14,7 +14,7 @@ #ifndef APPCORE_CAPI_H #define APPCORE_CAPI_H -#include +#include "../Ultralight/CAPI.h" #if defined(__WIN32__) || defined(_WIN32) # if defined(APPCORE_IMPLEMENTATION) diff --git a/AppCore/JSHelpers.h b/AppCore/JSHelpers.h index 3e6eec1..41dd0f3 100644 --- a/AppCore/JSHelpers.h +++ b/AppCore/JSHelpers.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include -#include +#include "Defines.h" +#include "../JavaScriptCore/JavaScript.h" +#include "../JavaScriptCore/JSStringRef.h" +#include "../Ultralight/String.h" #include #include diff --git a/AppCore/Overlay.h b/AppCore/Overlay.h index 43b2db1..bfe9456 100644 --- a/AppCore/Overlay.h +++ b/AppCore/Overlay.h @@ -13,7 +13,7 @@ /// #pragma once #include "Window.h" -#include +#include "../Ultralight/View.h" namespace ultralight { diff --git a/AppCore/Platform.h b/AppCore/Platform.h index 4dcda9f..78e4924 100644 --- a/AppCore/Platform.h +++ b/AppCore/Platform.h @@ -13,10 +13,10 @@ /// #pragma once #include "Defines.h" -#include -#include -#include -#include +#include "../Ultralight/String.h" +#include "../Ultralight/platform/FontLoader.h" +#include "../Ultralight/platform/FileSystem.h" +#include "../Ultralight/platform/Logger.h" namespace ultralight { diff --git a/AppCore/Window.h b/AppCore/Window.h index b200457..97907f5 100644 --- a/AppCore/Window.h +++ b/AppCore/Window.h @@ -13,9 +13,9 @@ /// #pragma once #include "Defines.h" -#include -#include -#include +#include "../Ultralight/RefPtr.h" +#include "../Ultralight/Listener.h" +#include "../Ultralight/Bitmap.h" namespace ultralight { diff --git a/JavaScriptCore/JSContextRef.h b/JavaScriptCore/JSContextRef.h index 1ce7435..a8c8514 100644 --- a/JavaScriptCore/JSContextRef.h +++ b/JavaScriptCore/JSContextRef.h @@ -26,9 +26,9 @@ #ifndef JSContextRef_h #define JSContextRef_h -#include -#include -#include +#include "JSObjectRef.h" +#include "JSValueRef.h" +#include "WebKitAvailability.h" #ifndef __cplusplus #include diff --git a/JavaScriptCore/JSObjectRef.h b/JavaScriptCore/JSObjectRef.h index e2caaea..4fce690 100644 --- a/JavaScriptCore/JSObjectRef.h +++ b/JavaScriptCore/JSObjectRef.h @@ -27,9 +27,9 @@ #ifndef JSObjectRef_h #define JSObjectRef_h -#include -#include -#include +#include "JSBase.h" +#include "JSValueRef.h" +#include "WebKitAvailability.h" #ifndef __cplusplus #include diff --git a/JavaScriptCore/JSObjectRefPrivate.h b/JavaScriptCore/JSObjectRefPrivate.h index 6e32612..d12077c 100644 --- a/JavaScriptCore/JSObjectRefPrivate.h +++ b/JavaScriptCore/JSObjectRefPrivate.h @@ -26,7 +26,7 @@ #ifndef JSObjectRefPrivate_h #define JSObjectRefPrivate_h -#include +#include "JSObjectRef.h" #ifdef __cplusplus extern "C" { diff --git a/JavaScriptCore/JSRetainPtr.h b/JavaScriptCore/JSRetainPtr.h index f061948..603f5c6 100644 --- a/JavaScriptCore/JSRetainPtr.h +++ b/JavaScriptCore/JSRetainPtr.h @@ -28,8 +28,8 @@ #pragma once -#include -#include +#include "JSContextRef.h" +#include "JSStringRef.h" #include #if !defined(WARN_UNUSED_RETURN) diff --git a/JavaScriptCore/JSStringRef.h b/JavaScriptCore/JSStringRef.h index bc03ed7..f789e60 100644 --- a/JavaScriptCore/JSStringRef.h +++ b/JavaScriptCore/JSStringRef.h @@ -26,7 +26,7 @@ #ifndef JSStringRef_h #define JSStringRef_h -#include +#include "JSValueRef.h" #ifndef __cplusplus #include diff --git a/JavaScriptCore/JSTypedArray.h b/JavaScriptCore/JSTypedArray.h index 7eaf76c..e28c2cf 100644 --- a/JavaScriptCore/JSTypedArray.h +++ b/JavaScriptCore/JSTypedArray.h @@ -27,8 +27,8 @@ #ifndef JSTypedArray_h #define JSTypedArray_h -#include -#include +#include "JSBase.h" +#include "JSValueRef.h" #ifdef __cplusplus extern "C" { diff --git a/JavaScriptCore/JSValueRef.h b/JavaScriptCore/JSValueRef.h index 911b4bf..07d8db5 100644 --- a/JavaScriptCore/JSValueRef.h +++ b/JavaScriptCore/JSValueRef.h @@ -26,8 +26,8 @@ #ifndef JSValueRef_h #define JSValueRef_h -#include -#include +#include "JSBase.h" +#include "WebKitAvailability.h" #ifndef __cplusplus #include diff --git a/JavaScriptCore/JavaScript.h b/JavaScriptCore/JavaScript.h index 251e393..5eb6248 100644 --- a/JavaScriptCore/JavaScript.h +++ b/JavaScriptCore/JavaScript.h @@ -27,11 +27,11 @@ #ifndef JavaScript_h #define JavaScript_h -#include -#include -#include -#include -#include -#include +#include "JSBase.h" +#include "JSContextRef.h" +#include "JSStringRef.h" +#include "JSObjectRef.h" +#include "JSTypedArray.h" +#include "JSValueRef.h" #endif /* JavaScript_h */ diff --git a/Ultralight/Bitmap.h b/Ultralight/Bitmap.h index 603deb9..025928a 100644 --- a/Ultralight/Bitmap.h +++ b/Ultralight/Bitmap.h @@ -12,9 +12,9 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include +#include "Defines.h" +#include "RefPtr.h" +#include "Geometry.h" namespace ultralight { diff --git a/Ultralight/Buffer.h b/Ultralight/Buffer.h index 63da8f0..14737a6 100644 --- a/Ultralight/Buffer.h +++ b/Ultralight/Buffer.h @@ -12,8 +12,8 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include +#include "Defines.h" +#include "RefPtr.h" namespace ultralight { diff --git a/Ultralight/CAPI.h b/Ultralight/CAPI.h index 5b04064..358721e 100644 --- a/Ultralight/CAPI.h +++ b/Ultralight/CAPI.h @@ -19,7 +19,7 @@ #endif #include -#include +#include "../JavaScriptCore/JavaScript.h" #ifdef __OBJC__ #import #endif diff --git a/Ultralight/Geometry.h b/Ultralight/Geometry.h index 6f3f2bd..7fbb7e0 100644 --- a/Ultralight/Geometry.h +++ b/Ultralight/Geometry.h @@ -12,7 +12,7 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include +#include "Defines.h" #include #include #include diff --git a/Ultralight/JavaScript.h b/Ultralight/JavaScript.h index 2f422d2..2c05efe 100644 --- a/Ultralight/JavaScript.h +++ b/Ultralight/JavaScript.h @@ -12,10 +12,10 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include -#include +#include "../JavaScriptCore/JavaScript.h" +#include "Defines.h" +#include "RefPtr.h" +#include "String.h" namespace ultralight { diff --git a/Ultralight/KeyEvent.h b/Ultralight/KeyEvent.h index 202c78f..d2c70e6 100644 --- a/Ultralight/KeyEvent.h +++ b/Ultralight/KeyEvent.h @@ -12,9 +12,9 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include +#include "Defines.h" +#include "KeyCodes.h" +#include "String.h" #ifdef __OBJC__ #import #endif diff --git a/Ultralight/Listener.h b/Ultralight/Listener.h index f6b0300..3f034ad 100644 --- a/Ultralight/Listener.h +++ b/Ultralight/Listener.h @@ -12,10 +12,10 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include -#include +#include "Defines.h" +#include "String.h" +#include "RefPtr.h" +#include "Geometry.h" namespace ultralight { diff --git a/Ultralight/Matrix.h b/Ultralight/Matrix.h index 15763a5..53db64b 100644 --- a/Ultralight/Matrix.h +++ b/Ultralight/Matrix.h @@ -12,9 +12,9 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include +#include "Defines.h" +#include "RefPtr.h" +#include "Geometry.h" namespace ultralight { diff --git a/Ultralight/MouseEvent.h b/Ultralight/MouseEvent.h index 8c2e727..d44e109 100644 --- a/Ultralight/MouseEvent.h +++ b/Ultralight/MouseEvent.h @@ -12,7 +12,7 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include +#include "Defines.h" namespace ultralight { diff --git a/Ultralight/RefPtr.h b/Ultralight/RefPtr.h index 12d89b5..73b4444 100644 --- a/Ultralight/RefPtr.h +++ b/Ultralight/RefPtr.h @@ -40,7 +40,7 @@ */ #pragma once -#include +#include "Defines.h" #include #include diff --git a/Ultralight/RenderTarget.h b/Ultralight/RenderTarget.h index 0f98cae..544e728 100644 --- a/Ultralight/RenderTarget.h +++ b/Ultralight/RenderTarget.h @@ -12,9 +12,9 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include +#include "Defines.h" +#include "Bitmap.h" +#include "Geometry.h" namespace ultralight { diff --git a/Ultralight/Renderer.h b/Ultralight/Renderer.h index 9b42d53..9d7e299 100644 --- a/Ultralight/Renderer.h +++ b/Ultralight/Renderer.h @@ -12,10 +12,10 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include -#include +#include "Defines.h" +#include "RefPtr.h" +#include "Session.h" +#include "View.h" namespace ultralight { diff --git a/Ultralight/ScrollEvent.h b/Ultralight/ScrollEvent.h index 1dee4a2..7814b6a 100644 --- a/Ultralight/ScrollEvent.h +++ b/Ultralight/ScrollEvent.h @@ -12,7 +12,7 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include +#include "Defines.h" namespace ultralight { diff --git a/Ultralight/Session.h b/Ultralight/Session.h index de97298..1045465 100644 --- a/Ultralight/Session.h +++ b/Ultralight/Session.h @@ -12,9 +12,9 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include +#include "Defines.h" +#include "RefPtr.h" +#include "String.h" namespace ultralight { diff --git a/Ultralight/String.h b/Ultralight/String.h index 98e51b5..debcdcc 100644 --- a/Ultralight/String.h +++ b/Ultralight/String.h @@ -12,10 +12,10 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include -#include +#include "Defines.h" +#include "String8.h" +#include "String16.h" +#include "String32.h" namespace ultralight { diff --git a/Ultralight/String16.h b/Ultralight/String16.h index 84ecafd..de5aa82 100644 --- a/Ultralight/String16.h +++ b/Ultralight/String16.h @@ -12,8 +12,8 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include +#include "Defines.h" +#include "RefPtr.h" #include namespace ultralight { diff --git a/Ultralight/String32.h b/Ultralight/String32.h index b5910f6..75720ad 100644 --- a/Ultralight/String32.h +++ b/Ultralight/String32.h @@ -12,7 +12,7 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include +#include "Defines.h" #include namespace ultralight { diff --git a/Ultralight/String8.h b/Ultralight/String8.h index 7ab86c1..6419425 100644 --- a/Ultralight/String8.h +++ b/Ultralight/String8.h @@ -12,7 +12,7 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include +#include "Defines.h" #include namespace ultralight { diff --git a/Ultralight/Ultralight.h b/Ultralight/Ultralight.h index 5b87585..0644da1 100644 --- a/Ultralight/Ultralight.h +++ b/Ultralight/Ultralight.h @@ -1,29 +1,29 @@ // Copyright 2020 Ultralight, Inc. All rights reserved. #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Defines.h" +#include "RefPtr.h" +#include "String8.h" +#include "String16.h" +#include "String32.h" +#include "String.h" +#include "Bitmap.h" +#include "Buffer.h" +#include "View.h" +#include "Session.h" +#include "KeyCodes.h" +#include "KeyEvent.h" +#include "Listener.h" +#include "Matrix.h" +#include "MouseEvent.h" +#include "Renderer.h" +#include "Geometry.h" +#include "RenderTarget.h" +#include "ScrollEvent.h" +#include "platform/Platform.h" +#include "platform/Config.h" +#include "platform/GPUDriver.h" +#include "platform/FileSystem.h" +#include "platform/FontLoader.h" +#include "platform/Surface.h" +#include "platform/Clipboard.h" +#include "platform/Logger.h" diff --git a/Ultralight/View.h b/Ultralight/View.h index 105ba1d..5005f7d 100644 --- a/Ultralight/View.h +++ b/Ultralight/View.h @@ -12,16 +12,16 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Defines.h" +#include "RefPtr.h" +#include "KeyEvent.h" +#include "JavaScript.h" +#include "MouseEvent.h" +#include "ScrollEvent.h" +#include "RenderTarget.h" +#include "Bitmap.h" +#include "Listener.h" +#include "platform/Surface.h" namespace ultralight { diff --git a/Ultralight/platform/Clipboard.h b/Ultralight/platform/Clipboard.h index 0413bb4..dabf400 100644 --- a/Ultralight/platform/Clipboard.h +++ b/Ultralight/platform/Clipboard.h @@ -12,8 +12,8 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include +#include "../Defines.h" +#include "../String16.h" namespace ultralight { diff --git a/Ultralight/platform/Config.h b/Ultralight/platform/Config.h index 8b3817e..cb4a6f8 100644 --- a/Ultralight/platform/Config.h +++ b/Ultralight/platform/Config.h @@ -12,8 +12,8 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include +#include "../Defines.h" +#include "../String16.h" namespace ultralight { diff --git a/Ultralight/platform/FileSystem.h b/Ultralight/platform/FileSystem.h index 9c6a08f..8a23d52 100644 --- a/Ultralight/platform/FileSystem.h +++ b/Ultralight/platform/FileSystem.h @@ -12,8 +12,8 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include +#include "../Defines.h" +#include "../String16.h" namespace ultralight { diff --git a/Ultralight/platform/FontLoader.h b/Ultralight/platform/FontLoader.h index 1a548c6..1f73b24 100644 --- a/Ultralight/platform/FontLoader.h +++ b/Ultralight/platform/FontLoader.h @@ -12,9 +12,9 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include +#include "../Defines.h" +#include "../String16.h" +#include "../Buffer.h" namespace ultralight { diff --git a/Ultralight/platform/GPUDriver.h b/Ultralight/platform/GPUDriver.h index 4bc8180..db9cd3d 100644 --- a/Ultralight/platform/GPUDriver.h +++ b/Ultralight/platform/GPUDriver.h @@ -13,10 +13,10 @@ /// #pragma once #pragma warning(disable: 4251) -#include -#include -#include -#include +#include "../Defines.h" +#include "../Geometry.h" +#include "../Matrix.h" +#include "../Bitmap.h" namespace ultralight { diff --git a/Ultralight/platform/Logger.h b/Ultralight/platform/Logger.h index db36d36..65d975b 100644 --- a/Ultralight/platform/Logger.h +++ b/Ultralight/platform/Logger.h @@ -12,8 +12,8 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include +#include "../Defines.h" +#include "../String16.h" namespace ultralight { diff --git a/Ultralight/platform/Platform.h b/Ultralight/platform/Platform.h index 4688497..df8df7c 100644 --- a/Ultralight/platform/Platform.h +++ b/Ultralight/platform/Platform.h @@ -12,7 +12,7 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include +#include "../Defines.h" namespace ultralight { diff --git a/Ultralight/platform/Surface.h b/Ultralight/platform/Surface.h index d6112be..c79e987 100644 --- a/Ultralight/platform/Surface.h +++ b/Ultralight/platform/Surface.h @@ -12,10 +12,10 @@ /// Copyright (C) 2020 Ultralight, Inc. All rights reserved. /// #pragma once -#include -#include -#include -#include +#include "../Defines.h" +#include "../RefPtr.h" +#include "../Bitmap.h" +#include "../Geometry.h" namespace ultralight {