PAD: Clean up includes, remove old code

pcsx2/PAD/Windows/Global.cpp

@@ -1,17 +0,0 @@
-/*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2020  PCSX2 Dev Team
- *
- *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU Lesser General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with PCSX2.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "PrecompiledHeader.h"
-#include "Global.h"

pcsx2/PAD/Windows/Global.h

@@ -92,38 +92,11 @@ extern Window GSwin;
 
 #endif
 
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-#ifdef _MSC_VER
-#define _WIN32_WINNT 0x0600
-#define NOMINMAX
-#include <algorithm>
-#include <windows.h>
-
-#ifdef PCSX2_DEBUG
-#define _CRTDBG_MAPALLOC
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
-#else
-#include <stdlib.h>
-#endif
-
-#else
-
-#include <stdlib.h>
-#include <mutex>
-
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
 #ifdef _MSC_VER
 #include <commctrl.h>
+#include <commdlg.h>
+#include <Shlwapi.h>
+#include <timeapi.h>
 // Only needed for DBT_DEVNODES_CHANGED
 #include <Dbt.h>
 #endif

pcsx2/PAD/Windows/HidDevice.cpp

@@ -16,8 +16,6 @@
 #include "PrecompiledHeader.h"
 #include "Global.h"
 #include "HidDevice.h"
-#include <setupapi.h>
-#include <hidsdi.h>
 
 int FindHids(HidDeviceInfo** foundDevs, int vid, int pid)
 {

pcsx2/PAD/Windows/HidDevice.h

@@ -17,6 +17,7 @@
 #define HID_DEVICE_H
 
 #include <hidsdi.h>
+#include <setupapi.h>
 
 struct HidDeviceInfo
 {

pcsx2/PAD/Windows/PAD.cpp

@@ -16,30 +16,22 @@
 #include "PrecompiledHeader.h"
 #include "Global.h"
 
-// For escape timer, so as not to break GS.
-#include <time.h>
 #include <fstream>
 #include <iomanip>
 #include <sstream>
+
 #include "resource_pad.h"
 #include "InputManager.h"
 #include "PADConfig.h"
 #include "PAD.h"
 
-#define PADdefs
-
 #include "DeviceEnumerator.h"
 #ifdef _MSC_VER
 #include "WndProcEater.h"
 #include "HidDevice.h"
 #endif
 #include "KeyboardQueue.h"
-#include "svnrev.h"
 #include "DualShock3.h"
-#include "AppConfig.h"
-#include <timeapi.h>
-#include "Utilities/pxStreams.h"
-#include "AppCoreThread.h"
 
 #define WMA_FORCE_UPDATE (WM_APP + 0x537)
 #define FORCE_UPDATE_WPARAM ((WPARAM)0x74328943)
@@ -849,11 +841,6 @@ s32 PADinit()
 	}
 	int port = (flags & 3);
 
-#if defined(PCSX2_DEBUG) && defined(_MSC_VER)
-	int tmpFlag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-	tmpFlag |= _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF;
-	_CrtSetDbgFlag(tmpFlag);
-#endif
 	for (int i = 2; i > 0; i--)
 	{
 		port = i;

pcsx2/PAD/Windows/PADConfig.cpp

@@ -28,12 +28,8 @@
 #include "DualShock3.h"
 #include "PAD.h"
 
-#include <Shlwapi.h>
-
 // Needed to know if raw input is available.  It requires XP or higher.
 #include "PADRawInput.h"
-#include <commdlg.h>
-#include <timeapi.h>
 #include "AppConfig.h"
 
 //max len 24 wchar_t

pcsx2/PAD/Windows/WindowsMouse.cpp

@@ -15,8 +15,8 @@
 
 #include "PrecompiledHeader.h"
 #include "Global.h"
+
 #include "InputManager.h"
-#include "VKey.h"
 #include "WindowsMouse.h"
 
 POINT WindowsMouse::origCursorPos;

pcsx2/pcsx2.vcxproj

@@ -321,7 +321,6 @@
     <ClCompile Include="PAD\Windows\Diagnostics.cpp" />
     <ClCompile Include="PAD\Windows\DirectInput.cpp" />
     <ClCompile Include="PAD\Windows\DualShock3.cpp" />
-    <ClCompile Include="PAD\Windows\Global.cpp" />
     <ClCompile Include="PAD\Windows\HidDevice.cpp" />
     <ClCompile Include="PAD\Windows\InputManager.cpp" />
     <ClCompile Include="PAD\Windows\KeyboardQueue.cpp" />

pcsx2/pcsx2.vcxproj.filters

@@ -1376,9 +1376,6 @@
     <ClCompile Include="PAD\Windows\DualShock3.cpp">
       <Filter>System\Ps2\PAD</Filter>
     </ClCompile>
-    <ClCompile Include="PAD\Windows\Global.cpp">
-      <Filter>System\Ps2\PAD</Filter>
-    </ClCompile>
     <ClCompile Include="PAD\Windows\HidDevice.cpp">
       <Filter>System\Ps2\PAD</Filter>
     </ClCompile>