Merge pull request #12220 from ccawley2011/NKCodeFromPlatform

Move NKCodeFrom*.h into the relevant platform folders
hrydgard · Aug 6, 2019 · 6e78ec9 · 6e78ec9
2 parents 626194c + ba7ea39
commit 6e78ec9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/ext/native/base/NKCodeFromQt.h → Qt/NKCodeFromQt.h b/ext/native/base/NKCodeFromQt.h → Qt/NKCodeFromQt.h
@@ -1,7 +1,9 @@
+#pragma once
+
 #include "util/const_map.h"
 #include <map>
 
-// TODO: Add any missing keys 
+// TODO: Add any missing keys
 static const std::map<int, int> KeyMapRawQttoNative = InitConstMap<int, int>
 	(Qt::Key_P, NKCODE_P)
 	(Qt::Key_O, NKCODE_O)

diff --git a/Qt/QtMain.h b/Qt/QtMain.h
@@ -33,7 +33,7 @@ QTM_USE_NAMESPACE
 #include "thin3d/thin3d.h"
 #include "base/NativeApp.h"
 #include "net/resolve.h"
-#include "base/NKCodeFromQt.h"
+#include "NKCodeFromQt.h"
 
 #include "Common/GraphicsContext.h"
 #include "Core/Core.h"

diff --git a/ext/native/base/NKCodeFromSDL.h → SDL/NKCodeFromSDL.h b/ext/native/base/NKCodeFromSDL.h → SDL/NKCodeFromSDL.h
@@ -3,7 +3,7 @@
 #include "util/const_map.h"
 #include <map>
 
-// TODO: Add any missing keys 
+// TODO: Add any missing keys
 static const std::map<int, int> KeyMapRawSDLtoNative = InitConstMap<int, int>
 	(SDLK_UNKNOWN, NKCODE_UNKNOWN)
 	(SDLK_p, NKCODE_P)

diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
@@ -27,7 +27,7 @@ SDLJoystick *joystick = NULL;
 #include "input/input_state.h"
 #include "input/keycodes.h"
 #include "net/resolve.h"
-#include "base/NKCodeFromSDL.h"
+#include "NKCodeFromSDL.h"
 #include "util/const_map.h"
 #include "util/text/utf8.h"
 #include "math/math_util.h"

diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters
@@ -505,12 +505,6 @@
     <ClInclude Include="..\..\ext\native\base\NativeApp.h">
       <Filter>base</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\native\base\NKCodeFromQt.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\base\NKCodeFromSDL.h">
-      <Filter>base</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\native\base\stringutil.h">
       <Filter>base</Filter>
     </ClInclude>