From 6cc7a85cde0414e67b955f06f7908f49061a63b8 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sat, 19 Sep 2015 13:14:05 +0200
Subject: [PATCH] Rename WndMainWindow to MainWindow

---
 UI/GameSettingsScreen.cpp                     |  2 +-
 UI/MainScreen.cpp                             |  2 +-
 UI/NativeApp.cpp                              |  2 +-
 Windows/Debugger/CtrlDisAsmView.cpp           |  2 +-
 Windows/Debugger/Debugger_Disasm.cpp          |  2 +-
 Windows/EmuThread.cpp                         |  2 +-
 Windows/GEDebugger/GEDebugger.cpp             |  2 +-
 Windows/GEDebugger/TabDisplayLists.cpp        |  2 +-
 Windows/{WndMainWindow.cpp => MainWindow.cpp} |  2 +-
 Windows/{WndMainWindow.h => MainWindow.h}     |  0
 Windows/MainWindowMenu.cpp                    |  2 +-
 Windows/PPSSPP.vcxproj                        |  4 ++--
 Windows/PPSSPP.vcxproj.filters                | 12 ++++++------
 Windows/RawInput.cpp                          |  2 +-
 Windows/TouchInputHandler.cpp                 |  2 +-
 Windows/W32Util/TabControl.cpp                |  2 +-
 Windows/WindowsHost.cpp                       | 14 +++++++-------
 Windows/main.cpp                              |  2 +-
 18 files changed, 29 insertions(+), 29 deletions(-)
 rename Windows/{WndMainWindow.cpp => MainWindow.cpp} (99%)
 rename Windows/{WndMainWindow.h => MainWindow.h} (100%)

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 260754455d..6f439c4aa2 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -51,7 +51,7 @@
 
 #if defined(_WIN32)
 #pragma warning(disable:4091)  // workaround bug in VS2015 headers
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include <shlobj.h>
 #include "util/text/utf8.h"
 #include "Windows/W32Util/ShellUtil.h"
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index b7ad681bc2..2d9c2129da 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -54,7 +54,7 @@
 
 #ifdef _WIN32
 #include "Windows/W32Util/ShellUtil.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #endif
 
 #ifdef ANDROID_NDK_PROFILER
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index ca98f7a7a7..5ca1397d98 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -36,7 +36,7 @@
 
 #if defined(_WIN32)
 #include "Windows/DSoundStream.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/D3D9Base.h"
 #endif
 
diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp
index 358e2183a1..00c227fcce 100644
--- a/Windows/Debugger/CtrlDisAsmView.cpp
+++ b/Windows/Debugger/CtrlDisAsmView.cpp
@@ -4,7 +4,7 @@
 #include "Core/MemMap.h"
 #include "Core/MIPS/JitCommon/JitCommon.h"
 #include "Windows/W32Util/Misc.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/InputBox.h"
 
 #include "Core/MIPS/MIPSAsm.h"
diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index 77e8a3f54c..ae634997fb 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -17,7 +17,7 @@
 #include "Windows/Debugger/CtrlRegisterList.h"
 #include "Windows/Debugger/CtrlMemView.h"
 #include "Windows/Debugger/Debugger_Lists.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 
 #include "Core/Core.h"
 #include "Core/HLE/HLE.h"
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 985dba1a76..2ad173e793 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -10,7 +10,7 @@
 #include "../Globals.h"
 #include "Windows/EmuThread.h"
 #include "Windows/W32Util/Misc.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/resource.h"
 #include "Core/Reporting.h"
 #include "Core/MemMap.h"
diff --git a/Windows/GEDebugger/GEDebugger.cpp b/Windows/GEDebugger/GEDebugger.cpp
index 3bd8f1cba1..b2982bae78 100644
--- a/Windows/GEDebugger/GEDebugger.cpp
+++ b/Windows/GEDebugger/GEDebugger.cpp
@@ -29,7 +29,7 @@
 #include "Windows/GEDebugger/TabVertices.h"
 #include "Windows/InputBox.h"
 #include "Windows/WindowsHost.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/main.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/GPUDebugInterface.h"
diff --git a/Windows/GEDebugger/TabDisplayLists.cpp b/Windows/GEDebugger/TabDisplayLists.cpp
index 46fd211f3c..fd4e615ad2 100644
--- a/Windows/GEDebugger/TabDisplayLists.cpp
+++ b/Windows/GEDebugger/TabDisplayLists.cpp
@@ -2,7 +2,7 @@
 #include "Windows/GEDebugger/GEDebugger.h"
 #include "Windows/GEDebugger/CtrlDisplayListView.h"
 #include "Windows/WindowsHost.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/main.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/GPUDebugInterface.h"
diff --git a/Windows/WndMainWindow.cpp b/Windows/MainWindow.cpp
similarity index 99%
rename from Windows/WndMainWindow.cpp
rename to Windows/MainWindow.cpp
index 480acb55ca..37ae07c368 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -57,7 +57,7 @@
 
 #include "resource.h"
 
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/WindowsHost.h"
 #include "Common/LogManager.h"
 #include "Common/ConsoleListener.h"
diff --git a/Windows/WndMainWindow.h b/Windows/MainWindow.h
similarity index 100%
rename from Windows/WndMainWindow.h
rename to Windows/MainWindow.h
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 416376c46f..d3c02dc540 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -20,7 +20,7 @@
 #include "Core/FileSystems/MetaFileSystem.h"
 #include "UI/OnScreenDisplay.h"
 #include "Windows/MainWindowMenu.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/W32Util/DialogManager.h"
 #include "Windows/W32Util/ShellUtil.h"
 #include "Windows/W32Util/Misc.h"
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 30e451dc90..a946264e0e 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -330,7 +330,7 @@
     <ClCompile Include="W32Util\ShellUtil.cpp" />
     <ClCompile Include="InputBox.cpp" />
     <ClCompile Include="W32Util\TabControl.cpp" />
-    <ClCompile Include="WndMainWindow.cpp" />
+    <ClCompile Include="MainWindow.cpp" />
     <ClCompile Include="DSoundStream.cpp" />
     <ClCompile Include="OpenGLBase.cpp" />
     <ClCompile Include="WindowsHost.cpp" />
@@ -380,7 +380,7 @@
     <ClInclude Include="W32Util\TabControl.h" />
     <ClInclude Include="W32Util\XPTheme.h" />
     <ClInclude Include="InputBox.h" />
-    <ClInclude Include="WndMainWindow.h" />
+    <ClInclude Include="MainWindow.h" />
     <ClInclude Include="DSoundStream.h" />
     <ClInclude Include="OpenGLBase.h" />
     <ClInclude Include="WindowsHost.h" />
diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters
index 1e9437e67d..4e69e50ffc 100644
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@@ -61,9 +61,6 @@
     <ClCompile Include="InputBox.cpp">
       <Filter>Windows\UI</Filter>
     </ClCompile>
-    <ClCompile Include="WndMainWindow.cpp">
-      <Filter>Windows\UI</Filter>
-    </ClCompile>
     <ClCompile Include="DSoundStream.cpp">
       <Filter>Windows\System</Filter>
     </ClCompile>
@@ -152,6 +149,9 @@
     <ClCompile Include="MainWindowMenu.cpp">
       <Filter>Windows\UI</Filter>
     </ClCompile>
+    <ClCompile Include="MainWindow.cpp">
+      <Filter>Windows\UI</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Debugger\CtrlDisAsmView.h">
@@ -187,9 +187,6 @@
     <ClInclude Include="InputBox.h">
       <Filter>Windows\UI</Filter>
     </ClInclude>
-    <ClInclude Include="WndMainWindow.h">
-      <Filter>Windows\UI</Filter>
-    </ClInclude>
     <ClInclude Include="DSoundStream.h">
       <Filter>Windows\System</Filter>
     </ClInclude>
@@ -278,6 +275,9 @@
     <ClInclude Include="MainWindowMenu.h">
       <Filter>Windows\UI</Filter>
     </ClInclude>
+    <ClInclude Include="MainWindow.h">
+      <Filter>Windows\UI</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="icon1.ico">
diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp
index c9ce68bc6c..20a9c5a163 100644
--- a/Windows/RawInput.cpp
+++ b/Windows/RawInput.cpp
@@ -21,7 +21,7 @@
 #include "input/input_state.h"
 #include "Windows/RawInput.h"
 #include "Windows/KeyboardDevice.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/WindowsHost.h"
 #include "Common/CommonFuncs.h"
 #include "Core/Config.h"
diff --git a/Windows/TouchInputHandler.cpp b/Windows/TouchInputHandler.cpp
index 4cf28085fc..69f190317e 100644
--- a/Windows/TouchInputHandler.cpp
+++ b/Windows/TouchInputHandler.cpp
@@ -5,7 +5,7 @@
 #include "Common/CommonWindows.h"
 #include "input/input_state.h"
 #include "base/NativeApp.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 
 extern InputState input_state;
 
diff --git a/Windows/W32Util/TabControl.cpp b/Windows/W32Util/TabControl.cpp
index e537a6a28b..b2a9545a66 100644
--- a/Windows/W32Util/TabControl.cpp
+++ b/Windows/W32Util/TabControl.cpp
@@ -1,6 +1,6 @@
 #include "TabControl.h"
 #include "DialogManager.h"
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include <windowsx.h>
 #include <commctrl.h>
 
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index e911e43edd..207363f6fc 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -38,12 +38,12 @@
 #include "Core/Config.h"
 #include "Core/CoreParameter.h"
 #include "Core/System.h"
-#include "EmuThread.h"
-#include "DSoundStream.h"
-#include "WindowsHost.h"
-#include "WndMainWindow.h"
-#include "OpenGLBase.h"
-#include "D3D9Base.h"
+#include "Windows/EmuThread.h"
+#include "Windows/DSoundStream.h"
+#include "Windows/WindowsHost.h"
+#include "Windows/MainWindow.h"
+#include "Windows/OpenGLBase.h"
+#include "Windows/D3D9Base.h"
 
 #include "Windows/Debugger/DebuggerShared.h"
 #include "Windows/Debugger/Debugger_Disasm.h"
@@ -56,7 +56,7 @@
 #include "Core/Debugger/SymbolMap.h"
 
 #include "Common/StringUtils.h"
-#include "main.h"
+#include "Windows/main.h"
 
 static const int numCPUs = 1;
 
diff --git a/Windows/main.cpp b/Windows/main.cpp
index c2e5544547..77abf43ecb 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -41,7 +41,7 @@
 
 #include "Windows/resource.h"
 
-#include "Windows/WndMainWindow.h"
+#include "Windows/MainWindow.h"
 #include "Windows/Debugger/Debugger_Disasm.h"
 #include "Windows/Debugger/Debugger_MemoryDlg.h"
 #include "Windows/Debugger/Debugger_VFPUDlg.h"