From 6a89cf020136a335a0395f95e2de2056e3d016ad Mon Sep 17 00:00:00 2001
From: Vlad Firoiu <vladfi2@gmail.com>
Date: Thu, 5 May 2016 19:43:38 -0400
Subject: [PATCH] Moved X11Utils into UICommon.

---
 Source/Core/DolphinWX/CMakeLists.txt                 | 5 -----
 Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp | 2 +-
 Source/Core/DolphinWX/ControllerConfigDiag.cpp       | 2 +-
 Source/Core/DolphinWX/Frame.h                        | 2 +-
 Source/Core/DolphinWX/MainNoGUI.cpp                  | 2 +-
 Source/Core/UICommon/CMakeLists.txt                  | 4 ++++
 Source/Core/{DolphinWX => UICommon}/X11Utils.cpp     | 2 +-
 Source/Core/{DolphinWX => UICommon}/X11Utils.h       | 0
 8 files changed, 9 insertions(+), 10 deletions(-)
 rename Source/Core/{DolphinWX => UICommon}/X11Utils.cpp (99%)
 rename Source/Core/{DolphinWX => UICommon}/X11Utils.h (100%)

diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index bfdc71ef92..5b02ad2ce4 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -81,11 +81,6 @@ set(GUI_SRCS
 
 set(NOGUI_SRCS MainNoGUI.cpp)
 
-if(USE_X11)
-  set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp)
-  set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp)
-endif()
-
 set(WXLIBS ${wxWidgets_LIBRARIES})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
index d2080743da..2b78a52a93 100644
--- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
+++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
@@ -30,7 +30,7 @@
 #include "DolphinWX/WxUtils.h"
 
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 #endif
 
 static const std::array<std::string, 29> language_ids{{
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
index 6e784e874d..a659412fe3 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -41,7 +41,7 @@
 #include "InputCommon/GCAdapter.h"
 
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 #endif
 
 ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
index bd8f92f04a..1555a1fe0a 100644
--- a/Source/Core/DolphinWX/Frame.h
+++ b/Source/Core/DolphinWX/Frame.h
@@ -21,7 +21,7 @@
 #include "InputCommon/GCPadStatus.h"
 
 #if defined(HAVE_X11) && HAVE_X11
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 #endif
 
 // Class declarations
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
index 83dcae0e1a..d9293a0faa 100644
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -168,7 +168,7 @@ void Host_YieldToUI()
 
 #if HAVE_X11
 #include <X11/keysym.h>
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 
 class PlatformX11 : public Platform
 {
diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt
index e25ad9abf9..36648bbe7c 100644
--- a/Source/Core/UICommon/CMakeLists.txt
+++ b/Source/Core/UICommon/CMakeLists.txt
@@ -5,6 +5,10 @@ set(SRCS
   USBUtils.cpp
 )
 
+if(USE_X11)
+  set(SRCS ${SRCS} X11Utils.cpp)
+endif()
+
 set(LIBS common cpp-optparse)
 if(LIBUSB_FOUND)
   set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
diff --git a/Source/Core/DolphinWX/X11Utils.cpp b/Source/Core/UICommon/X11Utils.cpp
similarity index 99%
rename from Source/Core/DolphinWX/X11Utils.cpp
rename to Source/Core/UICommon/X11Utils.cpp
index 76a78df48c..84273488a5 100644
--- a/Source/Core/DolphinWX/X11Utils.cpp
+++ b/Source/Core/UICommon/X11Utils.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinWX/X11Utils.h"
+#include "UICommon/X11Utils.h"
 
 #include <algorithm>
 #include <cstdio>
diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/UICommon/X11Utils.h
similarity index 100%
rename from Source/Core/DolphinWX/X11Utils.h
rename to Source/Core/UICommon/X11Utils.h