Names -> Keywords batch 5 (#6929)

WhiteBlackGoose · web-flow · commit a3733d8d97e1 · 2021-08-04T12:00:27.000-04:00
* Names -> Keywords Replacing full type names with keywords when appropriate Files affected: source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs, source.cs. See #6920 * Example reverted * Example reverted
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic DirectoryInfo.Name Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic DirectoryInfo.Name Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using System.IO;
 
@@ -7,7 +7,7 @@ class GetAName
     public static void Main(string[] args)
     {
         DirectoryInfo dir = new DirectoryInfo(".");
-        String dirName=dir.Name;
+        string dirName=dir.Name;
         Console.WriteLine("DirectoryInfo name is {0}.", dirName);
     }
 }
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic FieldAttributes Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic FieldAttributes Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using System.Reflection;
 
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic MethodAttributes Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic MethodAttributes Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using System.Reflection;
 
@@ -37,7 +37,7 @@ public static void PrintAttributes(Type attribType, int iAttribValue)
         FieldInfo[] fields = attribType.GetFields(BindingFlags.Public | BindingFlags.Static);
         for (int i = 0; i < fields.Length; i++)
         {
-            int fieldvalue = (Int32)fields[i].GetValue(null);
+            int fieldvalue = (int)fields[i].GetValue(null);
             if ((fieldvalue & iAttribValue) == fieldvalue)
             {
                 Console.WriteLine(fields[i].Name);
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic MethodBase.Attributes Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic MethodBase.Attributes Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿//<Snippet1>
+//<Snippet1>
 
 using System;
 using System.Reflection;
@@ -42,7 +42,7 @@ public static void PrintAttributes(Type attribType, int iAttribValue)
         FieldInfo[] fields = attribType.GetFields(BindingFlags.Public | BindingFlags.Static);
         for (int i = 0; i < fields.Length; i++)
         {
-            int fieldvalue = (Int32)fields[i].GetValue(null);
+            int fieldvalue = (int)fields[i].GetValue(null);
             if ((fieldvalue & iAttribValue) == fieldvalue)
             {
                 Console.WriteLine(fields[i].Name);
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic MethodRental.SwapMethodBody Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic MethodRental.SwapMethodBody Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -8,7 +8,7 @@ class SwapMethodBodySample
 {
     // First make a method that returns 0.
     // Then swap the method body with a body that returns 1.
-    public static void Main(String [] args)
+    public static void Main(string [] args)
     {
     // Construct a dynamic assembly
     Guid g = Guid.NewGuid();
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberNegativePattern Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberNegativePattern Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
  using System;
  using System.Globalization;
 
@@ -20,7 +20,7 @@ public static void Main()  {
        for (int i = 0; i <= 4; i++)  {
           nfi.NumberNegativePattern = i;
             Console.WriteLine("{0,-20} {1,-10}",
-                              String.Format("Pattern {0}:",
+                              string.Format("Pattern {0}:",
                                             nfi.NumberNegativePattern),
                               value.ToString("N", nfi));
        }
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ParameterInfo.IsOut Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ParameterInfo.IsOut Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using System.Reflection;
 
@@ -40,7 +40,7 @@ public static int Main(string[] args)
 
  Reflection.ParameterInfo
 
- Mymethodbase = Void mymethod (Int32, System.String ByRef, System.String ByRef)
+ Mymethodbase = Void mymethod (int, System.String ByRef, System.String ByRef)
  For parameter # 0, the IsOut is - False
  For parameter # 1, the IsOut is - True
  For parameter # 2, the IsOut is - False
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ParameterInfo.Name Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ParameterInfo.Name Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using System.Reflection;
 
@@ -41,7 +41,7 @@ public static int Main(string[] args)
  Reflection.ParameterInfo
 
  Mymethodbase
- = Void mymethod (Int32, System.String ByRef, System.String ByRef)
+ = Void mymethod (int, System.String ByRef, System.String ByRef)
  For parameter # 0, the Name is - int1m
  For parameter # 1, the Name is - str2m
  For parameter # 2, the Name is - str3m
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ParameterInfo.ParameterType Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ParameterInfo.ParameterType Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
  using System;
  using System.Reflection;
 
@@ -41,7 +41,7 @@ public static int Main(string[] args)
 
 Reflection.Parameterinfo
 
-Mymethodbase = Void mymethod(Int32, System.String ByRef, System.String ByRef)
+Mymethodbase = Void mymethod(int, System.String ByRef, System.String ByRef)
 For parameter # 0, the ParameterType is - System.Int32
 For parameter # 1, the ParameterType is - System.String&
 For parameter # 2, the ParameterType is - System.String&
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Queue.CopyTo Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Queue.CopyTo Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
  using System;
  using System.Collections;
  public class SamplesQueue  {
@@ -15,7 +15,7 @@ public static void Main()  {
        mySourceQ.Enqueue( "barn" );
 
        // Creates and initializes the one-dimensional target Array.
-       Array myTargetArray=Array.CreateInstance( typeof(String), 15 );
+       Array myTargetArray=Array.CreateInstance( typeof(string), 15 );
        myTargetArray.SetValue( "The", 0 );
        myTargetArray.SetValue( "quick", 1 );
        myTargetArray.SetValue( "brown", 2 );
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.ClassesRoot Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.ClassesRoot Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -16,15 +16,15 @@ public static void Main() {
     static void PrintKeys(RegistryKey rkey) {
 
         // Retrieve all the subkeys for the specified key.
-        String [] names = rkey.GetSubKeyNames();
+        string [] names = rkey.GetSubKeyNames();
 
         int icount = 0;
 
         Console.WriteLine("Subkeys of " + rkey.Name);
         Console.WriteLine("-----------------------------------------------");
 
         // Print the contents of the array to the console.
-        foreach (String s in names) {
+        foreach (string s in names) {
             Console.WriteLine(s);
 
             // The following code puts a limit on the number
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.CurrentConfig Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.CurrentConfig Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -16,15 +16,15 @@ public static void Main() {
     static void PrintKeys(RegistryKey rkey) {
 
         // Retrieve all the subkeys for the specified key.
-        String [] names = rkey.GetSubKeyNames();
+        string [] names = rkey.GetSubKeyNames();
 
         int icount = 0;
 
         Console.WriteLine("Subkeys of " + rkey.Name);
         Console.WriteLine("-----------------------------------------------");
 
         // Print the contents of the array to the console.
-        foreach (String s in names) {
+        foreach (string s in names) {
             Console.WriteLine(s);
 
             // The following code puts a limit on the number
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.CurrentUser Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.CurrentUser Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -16,15 +16,15 @@ public static void Main() {
     static void PrintKeys(RegistryKey rkey) {
 
         // Retrieve all the subkeys for the specified key.
-        String [] names = rkey.GetSubKeyNames();
+        string [] names = rkey.GetSubKeyNames();
 
         int icount = 0;
 
         Console.WriteLine("Subkeys of " + rkey.Name);
         Console.WriteLine("-----------------------------------------------");
 
         // Print the contents of the array to the console.
-        foreach (String s in names) {
+        foreach (string s in names) {
             Console.WriteLine(s);
 
             // The following code puts a limit on the number
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.DynData Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.DynData Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -16,7 +16,7 @@ public static void Main() {
     static void PrintKeys(RegistryKey rkey) {
 
         // Retrieve all the subkeys for the specified key.
-        String [] names;
+        string [] names;
         try {
             names = rkey.GetSubKeyNames();
         }
@@ -31,7 +31,7 @@ static void PrintKeys(RegistryKey rkey) {
         Console.WriteLine("-----------------------------------------------");
 
         // Print the contents of the array to the console.
-        foreach (String s in names) {
+        foreach (string s in names) {
             Console.WriteLine(s);
 
             // The following code puts a limit on the number
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.LocalMachine Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.LocalMachine Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -16,15 +16,15 @@ public static void Main() {
     static void PrintKeys(RegistryKey rkey) {
 
         // Retrieve all the subkeys for the specified key.
-        String [] names = rkey.GetSubKeyNames();
+        string [] names = rkey.GetSubKeyNames();
 
         int icount = 0;
 
         Console.WriteLine("Subkeys of " + rkey.Name);
         Console.WriteLine("-----------------------------------------------");
 
         // Print the contents of the array to the console.
-        foreach (String s in names) {
+        foreach (string s in names) {
             Console.WriteLine(s);
 
             // The following code puts a limit on the number
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.PerformanceData Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.PerformanceData Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -16,15 +16,15 @@ public static void Main() {
     static void PrintKeys(RegistryKey rkey) {
 
         // Retrieve all the subkeys for the specified key.
-        String [] names = rkey.GetSubKeyNames();
+        string [] names = rkey.GetSubKeyNames();
 
         int icount = 0;
 
         Console.WriteLine("Subkeys of " + rkey.Name);
         Console.WriteLine("-----------------------------------------------");
 
         // Print the contents of the array to the console.
-        foreach (String s in names) {
+        foreach (string s in names) {
             Console.WriteLine(s);
 
             // The following code puts a limit on the number
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.Users Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic Registry.Users Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -16,15 +16,15 @@ public static void Main() {
     static void PrintKeys(RegistryKey rkey) {
 
         // Retrieve all the subkeys for the specified key.
-        String [] names = rkey.GetSubKeyNames();
+        string [] names = rkey.GetSubKeyNames();
 
         int icount = 0;
 
         Console.WriteLine("Subkeys of " + rkey.Name);
         Console.WriteLine("-----------------------------------------------");
 
         // Print the contents of the array to the console.
-        foreach (String s in names) {
+        foreach (string s in names) {
             Console.WriteLine(s);
 
             // The following code puts a limit on the number
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic RegistryKey.GetValue Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic RegistryKey.GetValue Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using Microsoft.Win32;
 
@@ -33,7 +33,7 @@ public static void Main()
                 Console.WriteLine();
                 break;
             case RegistryValueKind.DWord:
-                Console.WriteLine("Value = " + Convert.ToString((Int32)o));
+                Console.WriteLine("Value = " + Convert.ToString((int)o));
                 break;
             case RegistryValueKind.QWord:
                 Console.WriteLine("Value = " + Convert.ToString((Int64)o));
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ResourceWriter Example/CS/source.cs b/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic ResourceWriter Example/CS/source.cs
@@ -1,4 +1,4 @@
-﻿// <Snippet1>
+// <Snippet1>
 using System;
 using System.Resources;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// <Snippet1>`
	`1`	`+// <Snippet1>`
`2`	`2`	`using System;`
`3`	`3`	`using System.IO;`
`4`	`4`
`@@ -7,7 +7,7 @@ class GetAName`
`7`	`7`	`public static void Main(string[] args)`
`8`	`8`	`{`
`9`	`9`	`DirectoryInfo dir = new DirectoryInfo(".");`
`10`		`- String dirName=dir.Name;`
	`10`	`+ string dirName=dir.Name;`
`11`	`11`	`Console.WriteLine("DirectoryInfo name is {0}.", dirName);`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//<Snippet1>`
	`1`	`+//<Snippet1>`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`	`using System.Reflection;`
`@@ -42,7 +42,7 @@ public static void PrintAttributes(Type attribType, int iAttribValue)`
`42`	`42`	`FieldInfo[] fields = attribType.GetFields(BindingFlags.Public \| BindingFlags.Static);`
`43`	`43`	`for (int i = 0; i < fields.Length; i++)`
`44`	`44`	`{`
`45`		`- int fieldvalue = (Int32)fields[i].GetValue(null);`
	`45`	`+ int fieldvalue = (int)fields[i].GetValue(null);`
`46`	`46`	`if ((fieldvalue & iAttribValue) == fieldvalue)`
`47`	`47`	`{`
`48`	`48`	`Console.WriteLine(fields[i].Name);`