Refine variable names - WIP

src/ITA/simulation_scheduler/audibility_filter/audibility_filter_interface.cpp

@@ -64,21 +64,21 @@ namespace ITA
 			VistaPropertyList IAudibilityFilter::AudibilityFilterConfig::store ( ) const
 			{
 				VistaPropertyList properties;
-				properties.SetValue ( audibilityFilterName, sFilterName );
-				properties.SetValue ( audibilityFilterNextFilter, sNextFilter );
-				properties.SetValue ( audibilityFilterType, m_sFilterType );
-				properties.SetValue ( audibilityFilterUsageMode, as_integer ( eUsageMode ) );
-				properties.SetValue ( audibilityFilterInvertCondition, bInvertCondition );
+				properties.SetValue ( audibilityFilterNameKey, sFilterName );
+				properties.SetValue ( audibilityFilterNextFilterKey, sNextFilter );
+				properties.SetValue ( audibilityFilterTypeKey, m_sFilterType );
+				properties.SetValue ( audibilityFilterUsageModeKey, as_integer ( eUsageMode ) );
+				properties.SetValue ( audibilityFilterInvertConditionKey, bInvertCondition );
 				return properties;
 			}
 
 			void IAudibilityFilter::AudibilityFilterConfig::load ( const VistaPropertyList& oProperties )
 			{
-				oProperties.GetValue ( audibilityFilterName, sFilterName );
-				oProperties.GetValue ( audibilityFilterNextFilter, sNextFilter );
-				oProperties.GetValue <std::string> ( audibilityFilterType, m_sFilterType );
-				eUsageMode = static_cast< UsageMode >( oProperties.GetValue <int> ( audibilityFilterUsageMode ) );
-				oProperties.GetValue ( audibilityFilterInvertCondition, bInvertCondition );
+				oProperties.GetValue ( audibilityFilterNameKey, sFilterName );
+				oProperties.GetValue ( audibilityFilterNextFilterKey, sNextFilter );
+				oProperties.GetValue <std::string> ( audibilityFilterTypeKey, m_sFilterType );
+				eUsageMode = static_cast< UsageMode >( oProperties.GetValue <int> ( audibilityFilterUsageModeKey ) );
+				oProperties.GetValue ( audibilityFilterInvertConditionKey, bInvertCondition );
 			}
 
 			void IAudibilityFilter::checkUpdateTimestamp ( const CUpdateScene& previousState, const CUpdateScene& newUpdate )

src/ITA/simulation_scheduler/configuration_keys.h

@@ -48,11 +48,11 @@ namespace ITA
 
 			const std::string rateFilterRateKey = "@Rate";
 
-			const std::string audibilityFilterName = "@Name";
-			const std::string audibilityFilterType = "@Type";
-			const std::string audibilityFilterNextFilter = "@NextFilter";
-			const std::string audibilityFilterUsageMode = "@UsageMode";
-			const std::string audibilityFilterInvertCondition = "@InvertCondition";
+			const std::string audibilityFilterNameKey = "@Name";
+			const std::string audibilityFilterTypeKey = "@Type";
+			const std::string audibilityFilterNextFilterKey = "@NextFilter";
+			const std::string audibilityFilterUsageModeKey = "@UsageMode";
+			const std::string audibilityFilterInvertConditionKey = "@InvertCondition";
 			
 			
 		}