From 14c63ec014c7a984a3d8a57290144d4db754f819 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 22 Oct 2019 13:18:56 +0200 Subject: [PATCH] Fix misleading indent. --- rpcs3/Emu/RSX/GSRender.h | 52 ++++++++++++++++---------------- rpcs3/evdev_joystick_handler.cpp | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/rpcs3/Emu/RSX/GSRender.h b/rpcs3/Emu/RSX/GSRender.h index 126b661749..c01bafcbec 100644 --- a/rpcs3/Emu/RSX/GSRender.h +++ b/rpcs3/Emu/RSX/GSRender.h @@ -52,42 +52,42 @@ using RSXDebuggerPrograms = std::vector; using draw_context_t = void*; #ifdef _WIN32 - using display_handle_t = HWND; +using display_handle_t = HWND; #elif defined(__APPLE__) - using display_handle_t = void*; // NSView +using display_handle_t = void*; // NSView #else - using display_handle_t = std::variant< - std::pair +using display_handle_t = std::variant< + std::pair #ifdef VK_USE_PLATFORM_WAYLAND_KHR - , std::pair + , std::pair #endif - >; +>; #endif - class GSFrameBase - { - public: - GSFrameBase() = default; - GSFrameBase(const GSFrameBase&) = delete; - virtual ~GSFrameBase() = default; +class GSFrameBase +{ +public: + GSFrameBase() = default; + GSFrameBase(const GSFrameBase&) = delete; + virtual ~GSFrameBase() = default; - virtual void close() = 0; - virtual bool shown() = 0; - virtual void hide() = 0; - virtual void show() = 0; - virtual void toggle_fullscreen() = 0; + virtual void close() = 0; + virtual bool shown() = 0; + virtual void hide() = 0; + virtual void show() = 0; + virtual void toggle_fullscreen() = 0; - virtual void delete_context(draw_context_t ctx) = 0; - virtual draw_context_t make_context() = 0; - virtual void set_current(draw_context_t ctx) = 0; - virtual void flip(draw_context_t ctx, bool skip_frame = false) = 0; - virtual int client_width() = 0; - virtual int client_height() = 0; + virtual void delete_context(draw_context_t ctx) = 0; + virtual draw_context_t make_context() = 0; + virtual void set_current(draw_context_t ctx) = 0; + virtual void flip(draw_context_t ctx, bool skip_frame = false) = 0; + virtual int client_width() = 0; + virtual int client_height() = 0; - virtual display_handle_t handle() const = 0; + virtual display_handle_t handle() const = 0; - std::atomic screenshot_toggle = false; - virtual void take_screenshot(const std::vector sshot_data, const u32 sshot_width, const u32 sshot_height) = 0; + std::atomic screenshot_toggle = false; + virtual void take_screenshot(const std::vector sshot_data, const u32 sshot_width, const u32 sshot_height) = 0; }; class GSRender : public rsx::thread diff --git a/rpcs3/evdev_joystick_handler.cpp b/rpcs3/evdev_joystick_handler.cpp index a37862e6d8..78663f006e 100644 --- a/rpcs3/evdev_joystick_handler.cpp +++ b/rpcs3/evdev_joystick_handler.cpp @@ -682,7 +682,7 @@ PadHandlerBase::connection evdev_joystick_handler::update_connection(const std:: if (!update_device(device)) return connection::disconnected; - auto evdev_device = std::static_pointer_cast(device); + auto evdev_device = std::static_pointer_cast(device); if (!evdev_device || !evdev_device->device) return connection::disconnected;