Moved XPData array to DataManager and removed DataMaps.

After removing C++11 features, only the declaration of XPData remained in DataMaps, making it somewhat pointless to separate XPData from DataManager.

xpcPlugin/DataManager.cpp

@@ -15,7 +15,6 @@
 //    without specific prior written permission from the authors or
 //    Laminar Research, respectively.
 #include "DataManager.h"
-#include "DataMaps.h"
 #include "Log.h"
 
 #include "XPLMDataAccess.h"
@@ -33,6 +32,8 @@ namespace XPC
 	static map<DREF, XPLMDataRef> mdrefs[20];
 	static map<string, XPLMDataRef> sdrefs;
 
+	DREF XPData[134][8] = { DREF_None };
+
 	void DataManager::Initialize()
 	{
 		drefs.insert(make_pair(DREF_None, XPLMFindDataRef("sim/test/test_float")));

xpcPlugin/DataManager.h

@@ -135,6 +135,9 @@ namespace XPC
 		DREF_MP7Alt,
 	};
 
+	/// Maps X-Plane dataref lines to XPC DREF values.
+	extern DREF XPData[134][8];
+
 	/// Marshals data between the plugin and X-Plane.
 	///
 	/// \author Jason Watkins

xpcPlugin/DataMaps.cpp

@@ -1,8 +0,0 @@
-//Copyright (c) 2013-2015 United States Government as represented by the Administrator of the
-//National Aeronautics and Space Administration. All Rights Reserved.
-#include "DataManager.h"
-
-namespace XPC
-{
-	DREF XPData[134][8] = { DREF_None };
-}

xpcPlugin/DataMaps.h

@@ -1,13 +0,0 @@
-//Copyright (c) 2013-2015 United States Government as represented by the Administrator of the
-//National Aeronautics and Space Administration. All Rights Reserved.
-#ifndef XPC_DATAMAPS_H
-#define XPC_DATAMAPS_H
-#include "DataManager.h"
-
-namespace XPC
-{
-	/// Maps X-Plane dataref lines to XPC DREF values.
-	extern DREF XPData[134][8];
-}
-
-#endif

xpcPlugin/MessageHandlers.cpp

@@ -2,7 +2,6 @@
 //National Aeronautics and Space Administration. All Rights Reserved.
 #include "MessageHandlers.h"
 #include "DataManager.h"
-#include "DataMaps.h"
 #include "Drawing.h"
 #include "Log.h"
 

xpcPlugin/xpcPlugin/xpcPlugin.vcxproj

@@ -201,7 +201,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\DataManager.h" />
-    <ClInclude Include="..\DataMaps.h" />
     <ClInclude Include="..\Drawing.h" />
     <ClInclude Include="..\Log.h" />
     <ClInclude Include="..\Message.h" />
@@ -210,7 +209,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\DataManager.cpp" />
-    <ClCompile Include="..\DataMaps.cpp" />
     <ClCompile Include="..\Drawing.cpp" />
     <ClCompile Include="..\Log.cpp" />
     <ClCompile Include="..\Message.cpp" />

xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters

@@ -30,9 +30,6 @@
     <ClInclude Include="..\DataManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\DataMaps.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\MessageHandlers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -59,9 +56,6 @@
     <ClCompile Include="..\MessageHandlers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\DataMaps.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\SDK\Libraries\Win\XPLM.lib">