From f3bf7879c62ceb46dd2b243693c9a2b87b53dff8 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Tue, 17 Mar 2020 22:13:30 +0100 Subject: [PATCH] Finish renaming win32-editor.h --- src/wine-host/editor.cpp | 8 ++++---- src/wine-host/editor.h | 4 ++-- src/wine-host/plugin-bridge.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wine-host/editor.cpp b/src/wine-host/editor.cpp index df2f5cdc..87269757 100644 --- a/src/wine-host/editor.cpp +++ b/src/wine-host/editor.cpp @@ -2,11 +2,11 @@ ATOM register_window_class(std::string window_class_name); -Win32Editor::Win32Editor(std::string window_class_name) +Editor::Editor(std::string window_class_name) : window_class(register_window_class(window_class_name)), x11_connection(xcb_connect(nullptr, nullptr), &xcb_disconnect) {} -HWND Win32Editor::open() { +HWND Editor::open() { window_handle = std::unique_ptr, decltype(&DestroyWindow)>( CreateWindowEx(WS_EX_TOOLWINDOW, @@ -18,7 +18,7 @@ HWND Win32Editor::open() { return window_handle->get(); } -void Win32Editor::close() { +void Editor::close() { // RAII does the rest for us window_handle = std::nullopt; @@ -26,7 +26,7 @@ void Win32Editor::close() { // everything for us? } -std::optional Win32Editor::get_x11_handle() { +std::optional Editor::get_x11_handle() { if (!window_handle.has_value()) { return std::nullopt; } diff --git a/src/wine-host/editor.h b/src/wine-host/editor.h index 50574137..9d22361a 100644 --- a/src/wine-host/editor.h +++ b/src/wine-host/editor.h @@ -20,13 +20,13 @@ * windows. A VST plugin can embed itself in that window, and we can then later * embed the window in a VST host provided X11 window. */ -class Win32Editor { +class Editor { public: /** * @param window_class_name The name for the window class for editor * windows. */ - Win32Editor(std::string window_class_name); + Editor(std::string window_class_name); /** * Open a window and return a handle to the new Win32 window that can be diff --git a/src/wine-host/plugin-bridge.h b/src/wine-host/plugin-bridge.h index 0c9ba56a..f88a3ebb 100644 --- a/src/wine-host/plugin-bridge.h +++ b/src/wine-host/plugin-bridge.h @@ -130,5 +130,5 @@ class PluginBridge { */ std::vector process_buffer; - Win32Editor editor; + Editor editor; };