[bcl] Rename variables to avoid conflict with later renames

9 files changed, 71 insertions, 71 deletions

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
index 1123e9ad156..624a32558b9 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
@@ -579,17 +579,17 @@ namespace System.Configuration
 					continue;
 				}
 
-				var sourceElement = (ConfigurationElement) sourceValue;
-				if (isMinimalOrModified && !sourceElement.IsModified ())
+				var sourceElementValue = (ConfigurationElement) sourceValue;
+				if (isMinimalOrModified && !sourceElementValue.IsModified ())
 					continue;
 				if (parentValue == null) {
 					unmergedProp.Value = sourceValue;
 					continue;
 				}
 
-				var parentElement = (ConfigurationElement) parentValue;
+				var parentElementValue = (ConfigurationElement) parentValue;
 				ConfigurationElement copy = (ConfigurationElement) unmergedProp.Value;
-				copy.Unmerge (sourceElement, parentElement, updateMode);
+				copy.Unmerge (sourceElementValue, parentElementValue, updateMode);
 			}
 		}
 		
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs
index 15089be8d54..b43bd209896 100644
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs
@@ -87,14 +87,14 @@ namespace System.DirectoryServices
 
 		public void AddRange(object[] values)
 		{
-			foreach (object value in values)
-				Add (value);
+			foreach (object val in values)
+				Add (val);
 		}
 
 		public void AddRange (PropertyValueCollection coll)
 		{
-			foreach (object value in coll)
-				Add (value);
+			foreach (object val in coll)
+				Add (val);
 		}
 
 		public int IndexOf( object value )  
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs
index 94d3813459d..bcfbcba8f0b 100644
--- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs
+++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs
@@ -39,7 +39,7 @@ namespace System.IdentityModel.Tokens
 	public class SamlAuthorizationDecisionClaimResource
 	{
 		public SamlAuthorizationDecisionClaimResource (
-			string resource, SamlAccessDecision decision, string actionName, string actionNamespace)
+			string resource, SamlAccessDecision decision, string actionNamespace, string actionName)
 		{
 			this.resource = resource;
 			this.decision = decision;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
index 4e866c0b4ac..7087d1ed6a2 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
@@ -62,9 +62,9 @@ namespace System.Web.UI.WebControls
 				ht = ChooseAd ();
 			}
 
-		 	AdCreatedEventArgs e = new AdCreatedEventArgs (ht);
-			OnAdCreated (e);
-			createdargs = e;
+		 	AdCreatedEventArgs ev = new AdCreatedEventArgs (ht);
+			OnAdCreated (ev);
+			createdargs = ev;
 			
 		}
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
index b007474c550..7f57b0167e5 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
@@ -1111,22 +1111,22 @@ namespace System.Web.UI.WebControls
 		
 		protected override int CreateChildControls (IEnumerable data, bool dataBinding)
 		{
-			PagedDataSource dataSource = new PagedDataSource ();
-			dataSource.DataSource = CurrentMode != DetailsViewMode.Insert ? data : null;
-			dataSource.AllowPaging = AllowPaging;
-			dataSource.PageSize = 1;
-			dataSource.CurrentPageIndex = PageIndex;
+			PagedDataSource pagedDataSource = new PagedDataSource ();
+			pagedDataSource.DataSource = CurrentMode != DetailsViewMode.Insert ? data : null;
+			pagedDataSource.AllowPaging = AllowPaging;
+			pagedDataSource.PageSize = 1;
+			pagedDataSource.CurrentPageIndex = PageIndex;
 
 			if (dataBinding && CurrentMode != DetailsViewMode.Insert) {
 				DataSourceView view = GetData ();
 				if (view != null && view.CanPage) {
-					dataSource.AllowServerPaging = true;
+					pagedDataSource.AllowServerPaging = true;
 					if (SelectArguments.RetrieveTotalRowCount)
-						dataSource.VirtualCount = SelectArguments.TotalRowCount;
+						pagedDataSource.VirtualCount = SelectArguments.TotalRowCount;
 				}
 			}
 
-			bool showPager = AllowPaging && (dataSource.PageCount > 1);
+			bool showPager = AllowPaging && (pagedDataSource.PageCount > 1);
 
 			Controls.Clear ();
 			table = CreateTable ();
@@ -1140,19 +1140,19 @@ namespace System.Web.UI.WebControls
 			// Gets the current data item
 
 			if (AllowPaging) {
-				PageCount = dataSource.DataSourceCount;
+				PageCount = pagedDataSource.DataSourceCount;
 				if (PageIndex >= PageCount && PageCount > 0)
-					pageIndex = dataSource.CurrentPageIndex = PageCount - 1;
-				if (dataSource.DataSource != null) {
-					IEnumerator e = dataSource.GetEnumerator ();
+					pageIndex = pagedDataSource.CurrentPageIndex = PageCount - 1;
+				if (pagedDataSource.DataSource != null) {
+					IEnumerator e = pagedDataSource.GetEnumerator ();
 					if (e.MoveNext ())
 						dataItem = e.Current;
 				}
 			} else {
 				int page = 0;
 				object lastItem = null;
-				if (dataSource.DataSource != null) {
-					IEnumerator e = dataSource.GetEnumerator ();
+				if (pagedDataSource.DataSource != null) {
+					IEnumerator e = pagedDataSource.GetEnumerator ();
 					for (; e.MoveNext (); page++) {
 						lastItem = e.Current;
 						if (page == PageIndex)
@@ -1202,7 +1202,7 @@ namespace System.Web.UI.WebControls
 				if (showPager && PagerSettings.Position == PagerPosition.Top ||
 						PagerSettings.Position == PagerPosition.TopAndBottom) {
 					topPagerRow = CreateRow (-1, DataControlRowType.Pager, DataControlRowState.Normal);
-					InitializePager (topPagerRow, dataSource);
+					InitializePager (topPagerRow, pagedDataSource);
 					table.Rows.Add (topPagerRow);
 				}
 
@@ -1229,7 +1229,7 @@ namespace System.Web.UI.WebControls
 				if (showPager && PagerSettings.Position == PagerPosition.Bottom ||
 						PagerSettings.Position == PagerPosition.TopAndBottom) {
 					bottomPagerRow = CreateRow (-1, DataControlRowType.Pager, DataControlRowState.Normal);
-					InitializePager (bottomPagerRow, dataSource);
+					InitializePager (bottomPagerRow, pagedDataSource);
 					table.Rows.Add (bottomPagerRow);
 				}
 			}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
index 55decb19cab..099e0873b9d 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
@@ -924,23 +924,23 @@ namespace System.Web.UI.WebControls
 		
 		protected override int CreateChildControls (IEnumerable data, bool dataBinding)
 		{
-			PagedDataSource dataSource = new PagedDataSource ();
-			dataSource.DataSource = CurrentMode != FormViewMode.Insert ? data : null;
-			dataSource.AllowPaging = AllowPaging;
-			dataSource.PageSize = 1;
-			dataSource.CurrentPageIndex = PageIndex;
+			PagedDataSource pagedDataSource = new PagedDataSource ();
+			pagedDataSource.DataSource = CurrentMode != FormViewMode.Insert ? data : null;
+			pagedDataSource.AllowPaging = AllowPaging;
+			pagedDataSource.PageSize = 1;
+			pagedDataSource.CurrentPageIndex = PageIndex;
 
 			if (dataBinding && CurrentMode != FormViewMode.Insert) {
 				DataSourceView view = GetData ();
 				if (view != null && view.CanPage) {
-					dataSource.AllowServerPaging = true;
+					pagedDataSource.AllowServerPaging = true;
 					if (SelectArguments.RetrieveTotalRowCount)
-						dataSource.VirtualCount = SelectArguments.TotalRowCount;
+						pagedDataSource.VirtualCount = SelectArguments.TotalRowCount;
 				}
 			}
 
 			PagerSettings pagerSettings = PagerSettings;
-			bool showPager = AllowPaging && pagerSettings.Visible && (dataSource.PageCount > 1);
+			bool showPager = AllowPaging && pagerSettings.Visible && (pagedDataSource.PageCount > 1);
 			
 			Controls.Clear ();
 			table = CreateTable ();
@@ -953,20 +953,20 @@ namespace System.Web.UI.WebControls
 			// Gets the current data item
 
 			if (AllowPaging) {
-				PageCount = dataSource.DataSourceCount;
+				PageCount = pagedDataSource.DataSourceCount;
 				if (PageIndex >= PageCount && PageCount > 0)
-					pageIndex = dataSource.CurrentPageIndex = PageCount - 1;
+					pageIndex = pagedDataSource.CurrentPageIndex = PageCount - 1;
 				
-				if (dataSource.DataSource != null) {
-					IEnumerator e = dataSource.GetEnumerator ();
+				if (pagedDataSource.DataSource != null) {
+					IEnumerator e = pagedDataSource.GetEnumerator ();
 					if (e.MoveNext ())
 						dataItem = e.Current;
 				}
 			} else {
 				int page = 0;
 				object lastItem = null;
-				if (dataSource.DataSource != null) {
-					IEnumerator e = dataSource.GetEnumerator ();
+				if (pagedDataSource.DataSource != null) {
+					IEnumerator e = pagedDataSource.GetEnumerator ();
 					for (; e.MoveNext (); page++) {
 						lastItem = e.Current;
 						if (page == PageIndex)
@@ -991,7 +991,7 @@ namespace System.Web.UI.WebControls
 
 			if (showPager && pagerSettings.Position == PagerPosition.Top || pagerSettings.Position == PagerPosition.TopAndBottom) {
 				topPagerRow = CreateRow (-1, DataControlRowType.Pager, DataControlRowState.Normal);
-				InitializePager (topPagerRow, dataSource);
+				InitializePager (topPagerRow, pagedDataSource);
 				table.Rows.Add (topPagerRow);
 			}
 
@@ -1024,7 +1024,7 @@ namespace System.Web.UI.WebControls
 			
 			if (showPager && pagerSettings.Position == PagerPosition.Bottom || pagerSettings.Position == PagerPosition.TopAndBottom) {
 				bottomPagerRow = CreateRow (0, DataControlRowType.Pager, DataControlRowState.Normal);
-				InitializePager (bottomPagerRow, dataSource);
+				InitializePager (bottomPagerRow, pagedDataSource);
 				table.Rows.Add (bottomPagerRow);
 			}
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
index 8e2695137dc..136a2f8e853 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
@@ -1385,34 +1385,34 @@ namespace System.Web.UI.WebControls
 			if (data == null)
 				return 0;
 
-			PagedDataSource dataSource;
+			PagedDataSource pagedDataSource;
 
 			if (dataBinding) {
 				DataSourceView view = GetData ();
-				dataSource = new PagedDataSource ();
-				dataSource.DataSource = data;
+				pagedDataSource = new PagedDataSource ();
+				pagedDataSource.DataSource = data;
 				
 				if (AllowPaging) {
-					dataSource.AllowPaging = true;
-					dataSource.PageSize = PageSize;
+					pagedDataSource.AllowPaging = true;
+					pagedDataSource.PageSize = PageSize;
 					if (view.CanPage) {
-						dataSource.AllowServerPaging = true;
+						pagedDataSource.AllowServerPaging = true;
 						if (SelectArguments.RetrieveTotalRowCount)
-							dataSource.VirtualCount = SelectArguments.TotalRowCount;
+							pagedDataSource.VirtualCount = SelectArguments.TotalRowCount;
 					}
-					if (PageIndex >= dataSource.PageCount)
-						pageIndex = dataSource.PageCount - 1;
-					dataSource.CurrentPageIndex = PageIndex;
+					if (PageIndex >= pagedDataSource.PageCount)
+						pageIndex = pagedDataSource.PageCount - 1;
+					pagedDataSource.CurrentPageIndex = PageIndex;
 				}
 				
-				PageCount = dataSource.PageCount;
+				PageCount = pagedDataSource.PageCount;
 			} else {
-				dataSource = new PagedDataSource ();
-				dataSource.DataSource = data;
+				pagedDataSource = new PagedDataSource ();
+				pagedDataSource.DataSource = data;
 				if (AllowPaging) {
-					dataSource.AllowPaging = true;
-					dataSource.PageSize = PageSize;
-					dataSource.CurrentPageIndex = PageIndex;
+					pagedDataSource.AllowPaging = true;
+					pagedDataSource.PageSize = PageSize;
+					pagedDataSource.CurrentPageIndex = PageIndex;
 				}
 			}
 
@@ -1423,7 +1423,7 @@ namespace System.Web.UI.WebControls
 			// Creates the set of fields to show
 
 			_dataEnumerator = null;
-			ICollection fieldCollection = CreateColumns (dataSource, dataBinding);
+			ICollection fieldCollection = CreateColumns (pagedDataSource, dataBinding);
 			int fieldCount = fieldCollection.Count;
 			DataControlField dcf;
 			DataControlField[] fields = new DataControlField [fieldCount];
@@ -1443,7 +1443,7 @@ namespace System.Web.UI.WebControls
 				enumerator = _dataEnumerator;
 				skip_first = true;
 			} else
-				enumerator = dataSource.GetEnumerator ();
+				enumerator = pagedDataSource.GetEnumerator ();
 
 			// Main table creation
 			Table mainTable = ContainedTable;
@@ -1469,7 +1469,7 @@ namespace System.Web.UI.WebControls
 				
 				if (list.Count == 0) {
 					if (createPager && (PagerSettings.Position == PagerPosition.Top || PagerSettings.Position == PagerPosition.TopAndBottom)) {
-						topPagerRow = CreatePagerRow (fieldCount, dataSource);
+						topPagerRow = CreatePagerRow (fieldCount, pagedDataSource);
 						OnRowCreated (new GridViewRowEventArgs (topPagerRow));
 						mainTable.Rows.Add (topPagerRow);
 						if (dataBinding) {
@@ -1527,7 +1527,7 @@ namespace System.Web.UI.WebControls
 				}
 
 				if (createPager && (PagerSettings.Position == PagerPosition.Bottom || PagerSettings.Position == PagerPosition.TopAndBottom)) {
-					bottomPagerRow = CreatePagerRow (fieldCount, dataSource);
+					bottomPagerRow = CreatePagerRow (fieldCount, pagedDataSource);
 					OnRowCreated (new GridViewRowEventArgs (bottomPagerRow));
 					mainTable.Rows.Add (bottomPagerRow);
 					if (dataBinding) {
@@ -1545,7 +1545,7 @@ namespace System.Web.UI.WebControls
 				return -1;
 
 			if (AllowPaging)
-				return dataSource.DataSourceCount;
+				return pagedDataSource.DataSourceCount;
 			else
 				return list.Count;
 		}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Wizard.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Wizard.cs
index 3cb54bf0dfd..aa54b0c373a 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Wizard.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Wizard.cs
@@ -1302,10 +1302,10 @@ namespace System.Web.UI.WebControls
 		protected internal override void LoadControlState (object ob)
 		{
 			if (ob == null) return;
-			object[] state = (object[]) ob;
-			base.LoadControlState (state[0]);
-			activeStepIndex = (int) state[1];
-			history = (ArrayList) state[2];
+			object[] controlState = (object[]) ob;
+			base.LoadControlState (controlState[0]);
+			activeStepIndex = (int) controlState[1];
+			history = (ArrayList) controlState[2];
 		}
 		
 		protected internal override object SaveControlState ()
diff --git a/mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs b/mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs
index c79752dffe7..e083485d7bf 100644
--- a/mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs
+++ b/mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs
@@ -62,8 +62,8 @@ namespace System.Diagnostics {
 
 		public void CopyTo (EventLogEntry[] eventLogEntries, int index)
 		{
-			EventLogEntry[] entries = _impl.GetEntries ();
-			Array.Copy (entries, 0, eventLogEntries, index, entries.Length);
+			EventLogEntry[] evLogEntries = _impl.GetEntries ();
+			Array.Copy (evLogEntries, 0, eventLogEntries, index, evLogEntries.Length);
 		}
 
 		public IEnumerator GetEnumerator ()