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.        See dotnet#6920

Author: WhiteBlackGoose

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.CaseSensitive Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -54,7 +54,7 @@ public static DataSet CreateDataSet()
     // Add twelve rows
     for (int i = 0; i < 10; i++)
     {
-        t.Rows.Add(new object[] { i, i.ToString() });
+        t.Rows.Add(new object[] { i, i.Tostring() });
     }
     t.Rows.Add(new object[] { 11, "abc" });
     t.Rows.Add(new object[] { 15, "ABC" });

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.LoadDataRow Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Data;
 
@@ -29,7 +29,7 @@ public static void Main() {
       row = dt.LoadDataRow(newRow, true);
 
       foreach (DataRow dr in dt.Rows) {
-         Console.WriteLine(String.Format("Row: {0}, {1}, {2}", dr["col1"], dr["col2"], dr["col3"]));
+         Console.WriteLine(string.Format("Row: {0}, {1}, {2}", dr["col1"], dr["col2"], dr["col3"]));
       }
 
       dt.EndLoadData();

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.NewRow Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -37,7 +37,7 @@ private void MakeDataTableAndDisplay()
         {
             row = table.NewRow();
             row["id"] = i;
-            row["item"] = "item " + i.ToString();
+            row["item"] = "item " + i.Tostring();
             table.Rows.Add(row);
         }
 

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Select2 Example/CS/source.cs

@@ -1,13 +1,13 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Data;
 
 public class A {
 
    public static void Main() {
       DataTable table = new DataTable("Orders");
-      table.Columns.Add("OrderID", typeof(Int32));
-      table.Columns.Add("OrderQuantity", typeof(Int32));
+      table.Columns.Add("OrderID", typeof(int));
+      table.Columns.Add("OrderQuantity", typeof(int));
       table.Columns.Add("CompanyName", typeof(string));
       table.Columns.Add("Date", typeof(DateTime));
 

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.ToString Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -10,11 +10,11 @@ public class Form1: Form
     protected DataGrid dataGrid1;
 
     // <Snippet1>
-    private void PrintToString(DataSet dataSet)
+    private void PrintTostring(DataSet dataSet)
     {
         foreach(DataTable table in dataSet.Tables)
         {
-            Console.WriteLine(table.ToString());
+            Console.WriteLine(table.Tostring());
         }
     }
     // </Snippet1>

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add1 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -22,7 +22,7 @@ private void AddTable()
         // Code to add columns and rows not shown here.
 
         Console.WriteLine(table.TableName);
-        Console.WriteLine(thisDataSet.Tables.Count.ToString());
+        Console.WriteLine(thisDataSet.Tables.Count.Tostring());
     }
     // </Snippet1>
 }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add2 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -18,7 +18,7 @@ private void AddTables()
 
         for (int i = 0; i < 3; i++)
             thisDataSet.Tables.Add();
-        Console.WriteLine(thisDataSet.Tables.Count.ToString()
+        Console.WriteLine(thisDataSet.Tables.Count.Tostring()
             + " tables");
         foreach (DataTable table in thisDataSet.Tables)
             Console.WriteLine(table.TableName);

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanged Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Data.SqlClient;
 using System.Data.Odbc;
@@ -58,7 +58,7 @@ private static void Collection_Changed(object sender,
         System.ComponentModel.CollectionChangeEventArgs e)
     {
         Console.WriteLine("Collection_Changed Event: '{0}'\table element={1}",
-            e.Action.ToString(), e.Element.ToString());
+            e.Action.Tostring(), e.Element.Tostring());
     }
     // </Snippet1>
 }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanging Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using System.Data.SqlClient;
 using System.Data.Odbc;
@@ -63,7 +63,7 @@ private static void Collection_Changing(object sender,
         // catch.
 
         Console.WriteLine("Collection_Changing Event: '{0}'\table element={1}",
-            e.Action.ToString(), e.Element.ToString());
+            e.Action.Tostring(), e.Element.Tostring());
     }
     // </Snippet1>
 }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -21,7 +21,7 @@ public void AddDataTableMapping()
             new DataTableMapping("Categories","DataCategories");
         tableMappings.Add((Object) mapping);
         Console.WriteLine("Table {0} added to {1} table mapping collection.",
-            mapping.ToString(), tableMappings.ToString());
+            mapping.Tostring(), tableMappings.Tostring());
     }
     // </Snippet1>
 }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ToString Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -20,8 +20,8 @@ public void AddDataTableMapping()
         DataTableMapping mapping =
             new DataTableMapping("Categories","DataCategories");
         mappings.Add((Object) mapping);
-        Console.WriteLine("Table " + mapping.ToString() + " added to " +
-            "table mapping collection " + mappings.ToString());
+        Console.WriteLine("Table " + mapping.Tostring() + " added to " +
+            "table mapping collection " + mappings.Tostring());
     }
     // </Snippet1>
 }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -23,8 +23,8 @@ public void ShowTableMappings()
         string message = "Table Mappings:\n";
         for(int i=0;i < adapter.TableMappings.Count;i++)
         {
-            message += i.ToString() + " "
-                + adapter.TableMappings[i].ToString() + "\n";
+            message += i.Tostring() + " "
+                + adapter.TableMappings[i].Tostring() + "\n";
         }
         Console.WriteLine(message);
     }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Count Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -20,8 +20,8 @@ public void CreateTableMappings()
         string message = "TableMappings:\n";
         for(int i=0;i < mappings.Count;i++)
         {
-            message += i.ToString() + " "
-                + mappings[i].ToString() + "\n";
+            message += i.Tostring() + " "
+                + mappings[i].Tostring() + "\n";
         }
         Console.WriteLine(message);
     }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.DataTableMappingCollection Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -20,8 +20,8 @@ public void CreateTableMappings()
         string message = "TableMappings:\n";
         for(int i=0;i < mappings.Count;i++)
         {
-            message += i.ToString() + " "
-                + mappings[i].ToString() + "\n";
+            message += i.Tostring() + " "
+                + mappings[i].Tostring() + "\n";
         }
         Console.WriteLine(message);
     }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/CS/source.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 using System.Data;
 using System.Data.Common;
@@ -21,8 +21,8 @@ public void FindDataTableMapping()
             Console.WriteLine("Error: no such table in collection");
         else
             Console.WriteLine
-                ("Name: " + mappings["Categories"].ToString() + "\n"
-                + "Index: " + mappings.IndexOf("Categories").ToString());
+                ("Name: " + mappings["Categories"].Tostring() + "\n"
+                + "Index: " + mappings.IndexOf("Categories").Tostring());
     }
     // </Snippet1>
 }

samples/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.RowFilter Example/CS/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Data;
 using System.Windows.Forms;
@@ -52,8 +52,8 @@ private static void DemostrateDataView() {
       PrintDataView(dv);
 
       // Removing Sort and RpwFilter to ilustrate RowStateFilter. DataView should contain all 10 rows back in the original order
-      dv.Sort = String.Empty;
-      dv.RowFilter = String.Empty;
+      dv.Sort = string.Empty;
+      dv.RowFilter = string.Empty;
 
       // Show only Unchanged rows or last 5 rows
       dv.RowStateFilter = DataViewRowState.Unchanged;

samples/snippets/csharp/VS_Snippets_ADO.NET/classic webdata datatable example2/cs/source.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Data;
 
@@ -62,7 +62,7 @@ private static DataTable CreateOrderTable() {
       DataTable orderTable = new DataTable("Order");
 
       // Define one column.
-      DataColumn colId = new DataColumn("OrderId", typeof(String));
+      DataColumn colId = new DataColumn("OrderId", typeof(string));
       orderTable.Columns.Add(colId);
 
       DataColumn colDate = new DataColumn("OrderDate", typeof(DateTime));
@@ -79,11 +79,11 @@ private static DataTable CreateOrderDetailTable() {
 
       // Define all the columns once.
       DataColumn[] cols ={
-                                  new DataColumn("OrderDetailId",typeof(Int32)),
-                                  new DataColumn("OrderId",typeof(String)),
-                                  new DataColumn("Product",typeof(String)),
+                                  new DataColumn("OrderDetailId",typeof(int)),
+                                  new DataColumn("OrderId",typeof(string)),
+                                  new DataColumn("Product",typeof(string)),
                                   new DataColumn("UnitPrice",typeof(Decimal)),
-                                  new DataColumn("OrderQty",typeof(Int32)),
+                                  new DataColumn("OrderQty",typeof(int)),
                                   new DataColumn("LineTotal",typeof(Decimal),"UnitPrice*OrderQty")
                               };