Names -> Keywords

Replacing full type names with keywords when appropriate

Files affected: PixelFormatsExample.cs, Window1.xaml.cs, mainwindow.xaml.cs, DataSource.cs, PackageDigitalSignature.cs, GetStringPageFunction.xaml.cs, GetStringPageFunctionCaller.xaml.cs, data.cs, Window1.xaml.cs, Window1.xaml.cs, Window1.xaml.cs, PointExample.cs.

See dotnet#6920

Author: WhiteBlackGoose

samples/snippets/csharp/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/CSharp/PixelFormatsExample.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -86,7 +86,7 @@ public PixelFormat createPixelFormat()
             IList<PixelFormatChannelMask> myChannelMaskCollection = myPixelFormat.Masks;
 
             // Capture the mask info in a string.
-            String stringOfValues = " ";
+            string stringOfValues = " ";
             foreach (PixelFormatChannelMask myMask in myChannelMaskCollection)
             {
                 IList<byte> myBytesCollection = myMask.Mask;

samples/snippets/csharp/VS_Snippets_Wpf/ImplementICommandSource/CSharp/Window1.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -127,7 +127,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
             try
             {
-                intFont = Int32.Parse(fontSize);
+                intFont = int.Parse(fontSize);
                 return intFont;
             }
             catch (FormatException e)

samples/snippets/csharp/VS_Snippets_Wpf/ObservableCollection_snip/CSharp/DataSource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
@@ -43,7 +43,7 @@ public int NLValue
         // The following variable and method provide the support for
         // handling property changed events.
         public event PropertyChangedEventHandler PropertyChanged;
-        private void OnPropertyChanged(String info)
+        private void OnPropertyChanged(string info)
         {
             if (PropertyChanged != null)
                 PropertyChanged(this, new PropertyChangedEventArgs(info));

samples/snippets/csharp/VS_Snippets_Wpf/PackageDigitalSignature/CSharp/PackageDigitalSignature.cs

@@ -1,4 +1,4 @@
-// PackageDigitalSignature SDK Sample - PackageDigitalSignature.cs
+// PackageDigitalSignature SDK Sample - PackageDigitalSignature.cs
 // Copyright (c) Microsoft Corporation. All rights reserved.
 
 using System;
@@ -56,7 +56,7 @@ public static void Main()
         ///   content and resource files.</summary>
         /// <param name="packageFilename">
         ///   The filename of the Package to create.</param>
-        private static void CreatePackage(String packageFilename)
+        private static void CreatePackage(string packageFilename)
         {
             // Create URIs for the parts that will be added to the Package.
             Uri uriDocument = new Uri(@"Content\Document.xml", UriKind.Relative);

samples/snippets/csharp/VS_Snippets_Wpf/PageFunctionMembersSnippets/CSharp/GetStringPageFunction.xaml.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Navigation;
 
 namespace CSharp
 {
-    public partial class GetStringPageFunction : PageFunction<String>
+    public partial class GetStringPageFunction : PageFunction<string>
     {
         public GetStringPageFunction()
         {
@@ -27,7 +27,7 @@ protected override void Start()
         void doneButton_Click(object sender, RoutedEventArgs e)
         {
             // Complete the page function and return data of type T
-            OnReturn(new ReturnEventArgs<String>(this.pageFunctionData.Text));
+            OnReturn(new ReturnEventArgs<string>(this.pageFunctionData.Text));
         }
         //</SnippetCallOnReturnCODE>
     }

samples/snippets/csharp/VS_Snippets_Wpf/PageFunctionMembersSnippets/CSharp/GetStringPageFunctionCaller.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Navigation;
@@ -19,13 +19,13 @@ void callPageFunctionButton_Click(object sender, RoutedEventArgs e)
             GetStringPageFunction pageFunction = new GetStringPageFunction();
 
             // Detect when page function returns
-            pageFunction.Return += new ReturnEventHandler<String>(PageFunction_Return);
+            pageFunction.Return += new ReturnEventHandler<string>(PageFunction_Return);
 
             // Call page function
             this.NavigationService.Navigate(pageFunction);
         }
 
-        void PageFunction_Return(object sender, ReturnEventArgs<String> e)
+        void PageFunction_Return(object sender, ReturnEventArgs<string> e)
         {
             // Retrieve page function return value
             string returnValue = e.Result;

samples/snippets/csharp/VS_Snippets_Wpf/PhotoStoreDemoStyled/CS/data.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
@@ -79,7 +79,7 @@ public override string ToString()
         }
 
         private string _description;
-        public String Description { get { return _description; } }
+        public string Description { get { return _description; } }
 
         private double _cost;
         public double Cost { get { return _cost; } }
@@ -128,7 +128,7 @@ public int Quantity
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
-        private void OnPropertyChanged(String info)
+        private void OnPropertyChanged(string info)
         {
             if (PropertyChanged != null)
                 PropertyChanged(this, new PropertyChangedEventArgs(info));

samples/snippets/csharp/VS_Snippets_Wpf/Point3DSample/CSharp/Window1.xaml.cs

@@ -1,4 +1,4 @@
-//This is a list of commonly used namespaces for a window.
+//This is a list of commonly used namespaces for a window.
 using System;
 using System.Windows;
 using System.Windows.Controls;
@@ -31,7 +31,7 @@ private void PerformOperation(object sender, RoutedEventArgs e)
 			RadioButton li = (sender as RadioButton);
 
             // Strings used to display the results
-            String syntaxString, resultType, operationString;
+            string syntaxString, resultType, operationString;
 
 			// The local variables point1, point2, vector2, etc are defined in each
 			// case block for readability reasons. Each variable is contained within
@@ -386,7 +386,7 @@ private void PerformOperation(object sender, RoutedEventArgs e)
         //</SnippetMil3DPoints3DN2>
 
         // Displays the results of the operation
-        private void ShowResults(String resultValue, String syntax, String resultType, String opString)
+        private void ShowResults(string resultValue, string syntax, string resultType, string opString)
         {
 
             txtResultValue.Text = resultValue;

samples/snippets/csharp/VS_Snippets_Wpf/Point4DSample/CSharp/Window1.xaml.cs

@@ -1,4 +1,4 @@
-//This is a list of commonly used namespaces for a window.
+//This is a list of commonly used namespaces for a window.
 using System;
 using System.Windows;
 using System.Windows.Controls;
@@ -32,7 +32,7 @@ private void PerformOperation(object sender, System.Windows.RoutedEventArgs e)
             RadioButton li = (sender as RadioButton);
 
             // Strings used to display the results
-            String syntaxString, resultType, operationString;
+            string syntaxString, resultType, operationString;
 
 			// The local variables point1, point2, vector2, etc are defined in each
 			// case block for readability reasons. Each variable is contained within
@@ -307,14 +307,14 @@ private void PerformOperation(object sender, System.Windows.RoutedEventArgs e)
                         //<SnippetMil4DPoints3DN15>
                         // Gets a string representation of the structure
                         Point4D point1 = new Point4D(10, 5, 1, 4);
-                        String pointString;
+                        string pointString;
 
                         pointString = point1.ToString();
                         // matrixString is equal to 10, 5, 1, 4
 
                         // Displaying Results
                         syntaxString = "pointString = point1.ToString();";
-                        resultType = "String";
+                        resultType = "string";
                         operationString = "Getting the string representation of a Point4D";
                         ShowResults(pointString.ToString(), syntaxString, resultType, operationString);
                         //</SnippetMil4DPoints3DN15>
@@ -352,7 +352,7 @@ private void PerformOperation(object sender, System.Windows.RoutedEventArgs e)
                         // result variables
                         Boolean areEqual;
                         Boolean areNotEqual;
-                        String stringResult;
+                        string stringResult;
 
                         // defining x,y,z of point1
                         point4D1.X = 10;
@@ -396,7 +396,7 @@ private void PerformOperation(object sender, System.Windows.RoutedEventArgs e)
 
         //</SnippetMil4DPoints3DN2>
         // Displays the results of the operation
-        private void ShowResults(String resultValue, String syntax, String resultType, String opString)
+        private void ShowResults(string resultValue, string syntax, string resultType, string opString)
         {
 
             txtResultValue.Text = resultValue;

samples/snippets/csharp/VS_Snippets_Wpf/PointCollection/CSharp/Window1.xaml.cs

@@ -1,4 +1,4 @@
-//This is a list of commonly used namespaces for a window.
+//This is a list of commonly used namespaces for a window.
 using System;
 using System.Windows;
 using System.Windows.Controls;
@@ -28,7 +28,7 @@ private void PointCollectionOperations(object sender, SelectionChangedEventArgs
             RadioButton li = (sender as RadioButton);
 
             // Strings used to display the results
-            String syntaxString, resultType, operationString;
+            string syntaxString, resultType, operationString;
 
             // The local variables point1, point2, vector2, etc are defined in each
             // case block for readability reasons. Each variable is contained within
@@ -299,7 +299,7 @@ private void PointCollectionOperations(object sender, SelectionChangedEventArgs
             } //end switch
         }
 
-        private void ShowResults(String resultValue, String syntax, String resultType, String opString)
+        private void ShowResults(string resultValue, string syntax, string resultType, string opString)
         {
         }
     }

samples/snippets/csharp/VS_Snippets_Wpf/PointExamples_snip/CSharp/PointExample.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
@@ -367,14 +367,14 @@ private Vector subtractExample2()
         // </SnippetSubtractExample2>
 
         // <SnippetToStringExample>
-        private String toStringExample()
+        private string toStringExample()
         {
 
             Point point1 = new Point(10, 5);
 
             // Get a string representation of a Point structure.
             // pointString is equal to 10,5	.
-            String stringResult = point1.ToString();
+            string stringResult = point1.ToString();
 
             return stringResult;
         }

samples/snippets/csharp/VS_Snippets_Wpf/inputcommandbinding/csharp/mainwindow.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -52,7 +52,7 @@ private void ChangeColor(object colorString)
             }
 
             Color newColor = 
-                (Color)ColorConverter.ConvertFromString((String)colorString);
+                (Color)ColorConverter.ConvertFromString((string)colorString);
 
             alternateColor = new SolidColorBrush(newColor);