Code clean up

Removed unused variables Removed VC_EXTRALEAN Set _WIN32_WINNT and WIN32_LEAN_AND_MEAN
ogruetzmann · May 22, 2016 · 468c2c6 · 468c2c6
1 parent fa8531b
commit 468c2c6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/ModeS/ModeS2.cpp b/ModeS/ModeS2.cpp
@@ -5,8 +5,6 @@
 vector<string>	EQUIPEMENT_CODES = { "H", "L", "E", "G", "W", "Q", "S" };
 vector<string>	ICAO_MODES = { "EB", "EL", "ET", "ED", "LF", "EH", "LK", "LO", "LIM", "LIR" };
 
-bool initialLoad { false };
-
 void doInitialLoad(string message)
 {
 	if (regex_match(message, regex("^([A-z,]+)[|]([A-z,]+)[|]([0-9]{1,3})$")))
@@ -175,9 +173,8 @@ void CModeS::OnRadarTargetPositionUpdate(CRadarTarget RadarTarget)
 
 void CModeS::OnTimer(int Counter)
 {
-	if (!initialLoad && fUpdateString.valid()) {
+	if (fUpdateString.valid()) {
 		if (fUpdateString.wait_for(chrono::milliseconds(0)) == future_status::ready) {
-			initialLoad = true;
 			try {
 				string UpdateString = fUpdateString.get();
 				doInitialLoad(UpdateString);
@@ -188,6 +185,7 @@ void CModeS::OnTimer(int Counter)
 			catch (...) {
 				MessageBox(NULL, "Unhandled Exception while loading data from server", "Mode S", MB_OK | MB_ICONWARNING);
 			}
+			fUpdateString = future<string>();
 		}
 	}
 }

diff --git a/ModeS/ModeS2.h b/ModeS/ModeS2.h
@@ -29,8 +29,6 @@ class CModeS :
 
 	const char* mode_s_code = "1000";
 
-	clock_t delayedStart;
-
 	future<string> fUpdateString;
 
 	void OnGetTagItem(CFlightPlan FlightPlan, EuroScopePlugIn::CRadarTarget RadarTarget,
@@ -47,8 +45,10 @@ class CModeS :
 		RECT Area);
 
 	void OnRadarTargetPositionUpdate(CRadarTarget RadarTarget);
-
 	void OnTimer(int Counter);
-
-	CRadarScreen * OnRadarScreenCreated(const char * sDisplayName, bool NeedRadarContent, bool GeoReferenced, bool CanBeSaved, bool CanBeCreated);
+	CRadarScreen * OnRadarScreenCreated(const char * sDisplayName, 
+										bool NeedRadarContent, 
+										bool GeoReferenced, 
+										bool CanBeSaved, 
+										bool CanBeCreated);
 };
diff --git a/ModeS/stdafx.h b/ModeS/stdafx.h
@@ -3,10 +3,5 @@
 // are changed infrequently
 
 #pragma once
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN            // Exclude rarely-used stuff from Windows headers
-#endif
-
 #include "targetver.h"
 #include <Windows.h>
diff --git a/ModeS/targetver.h b/ModeS/targetver.h
@@ -5,4 +5,6 @@
 // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
 // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
 
+#define WIN32_LEAN_AND_MEAN
+#define _WIN32_WINNT 0x0600
 #include <SDKDDKVer.h>