diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-13 08:49:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 08:49:39 +0100 |
| commit | 55ca2a7c88503d0f07785ab9215809b02027f858 (patch) | |
| tree | dff95ace09acaa882c74f77f1036b05c7e4a360b /platform/uwp/os_uwp.h | |
| parent | a18ceb6a302b23094136adfc9591121f8b49a8cf (diff) | |
| parent | fe7e11e008598e4bbbe46cf817af2fac999a5326 (diff) | |
Merge pull request #25821 from akien-mga/sync-class-and-filenames
Ensure classes match their header filename
Diffstat (limited to 'platform/uwp/os_uwp.h')
| -rw-r--r-- | platform/uwp/os_uwp.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index 5475c4e60a..fd78b3cdf7 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -28,15 +28,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OSUWP_H -#define OSUWP_H +#ifndef OS_UWP_H +#define OS_UWP_H +#include "context_egl_uwp.h" #include "core/math/transform_2d.h" #include "core/os/input.h" #include "core/os/os.h" #include "core/ustring.h" #include "drivers/xaudio2/audio_driver_xaudio2.h" -#include "gl_context_egl.h" #include "joypad_uwp.h" #include "main/input_default.h" #include "power_uwp.h" @@ -52,7 +52,7 @@ /** @author Juan Linietsky <reduzio@gmail.com> */ -class OSUWP : public OS { +class OS_UWP : public OS { public: struct KeyEvent { @@ -95,7 +95,7 @@ private: VisualServer *visual_server; int pressrc; - ContextEGL *gl_context; + ContextEGL_UWP *gl_context; Windows::UI::Core::CoreWindow ^ window; VideoMode video_mode; @@ -144,7 +144,7 @@ private: /* clang-format off */ internal: ManagedType() { alert_close_handle = false; } - property OSUWP* os; + property OS_UWP* os; /* clang-format on */ }; ManagedType ^ managed_object; @@ -262,8 +262,8 @@ public: void queue_key_event(KeyEvent &p_event); - OSUWP(); - ~OSUWP(); + OS_UWP(); + ~OS_UWP(); }; #endif |