From 7f1af73c3ce56a5834159e252a5da4270281396c Mon Sep 17 00:00:00 2001
From: Jason Watkins <jason-watkins@outlook.com>
Date: Tue, 5 May 2015 11:44:36 -0700
Subject: [PATCH] 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                     |  3 ++-
 xpcPlugin/DataManager.h                       |  3 +++
 xpcPlugin/DataMaps.cpp                        |  8 --------
 xpcPlugin/DataMaps.h                          | 13 -------------
 xpcPlugin/MessageHandlers.cpp                 |  1 -
 xpcPlugin/xpcPlugin/xpcPlugin.vcxproj         |  2 --
 xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters |  6 ------
 7 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 xpcPlugin/DataMaps.cpp
 delete mode 100644 xpcPlugin/DataMaps.h

diff --git a/xpcPlugin/DataManager.cpp b/xpcPlugin/DataManager.cpp
index 255312e..720f799 100644
--- a/xpcPlugin/DataManager.cpp
+++ b/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")));
diff --git a/xpcPlugin/DataManager.h b/xpcPlugin/DataManager.h
index 5fd86ac..9adb9ef 100644
--- a/xpcPlugin/DataManager.h
+++ b/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
diff --git a/xpcPlugin/DataMaps.cpp b/xpcPlugin/DataMaps.cpp
deleted file mode 100644
index e7404cd..0000000
--- a/xpcPlugin/DataMaps.cpp
+++ /dev/null
@@ -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 };
-}
diff --git a/xpcPlugin/DataMaps.h b/xpcPlugin/DataMaps.h
deleted file mode 100644
index ef600b7..0000000
--- a/xpcPlugin/DataMaps.h
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/xpcPlugin/MessageHandlers.cpp b/xpcPlugin/MessageHandlers.cpp
index 35e63ec..1522458 100644
--- a/xpcPlugin/MessageHandlers.cpp
+++ b/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"
 
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj b/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
index 73e1302..70c01f1 100644
--- a/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
+++ b/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" />
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters b/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters
index e921a5d..e62f3d6 100644
--- a/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters
+++ b/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">