Merge pull request #956 from SlavaRa/feature/refactor_﻿Redundant_'Object.ToString()'_call_for_value_type

elsassph · elsassph · commit 5d4285b1fb05 · 2015-11-30T22:52:42.000Z
[Code cleanup] Fixes redundant 'Object.ToString()' call for value type
diff --git a/External/Plugins/ASCompletion/Completion/ASGenerator.cs b/External/Plugins/ASCompletion/Completion/ASGenerator.cs
@@ -3053,7 +3053,7 @@ private static string GuessVarName(string name, string type)
             name = name.TrimStart(new char[] { '_' });
             if (name.Length > 3 && name.StartsWith("get") && (name[3].ToString() == char.ToUpper(name[3]).ToString()))
             {
-                name = char.ToLower(name[3]).ToString() + name.Substring(4);
+                name = char.ToLower(name[3]) + name.Substring(4);
             }
 
             if (name.Length > 1)
diff --git a/External/Plugins/ASCompletion/Model/ASFileParser.cs b/External/Plugins/ASCompletion/Model/ASFileParser.cs
@@ -193,7 +193,7 @@ public static TypeDefinitionKind ParseTypedCallback(string comment, MemberModel
         private static string getRandomStringRepl()
         {
             random.NextDouble();
-            return "StringRepl" + random.Next(0xFFFFFFF).ToString();
+            return "StringRepl" + random.Next(0xFFFFFFF);
         }
 
         /// <summary>
diff --git a/External/Plugins/ASCompletion/PluginUI.cs b/External/Plugins/ASCompletion/PluginUI.cs
@@ -533,7 +533,7 @@ internal void UpdateView(FileModel aFile)
                     }
                     foreach (MemberModel member in aFile.Members)
                     {
-                        sb.Append(member.Flags.ToString()).Append(member.ToString());
+                        sb.Append(member.Flags).Append(member);
                         lines.Add(member.LineFrom);
                         names.Add(member.Name);
                     }
@@ -542,7 +542,7 @@ internal void UpdateView(FileModel aFile)
                         if (string.IsNullOrEmpty(aClass.ExtendsType))
                             aClass.ResolveExtends();
 
-                        sb.Append(aClass.Flags.ToString()).Append(aClass.FullName);
+                        sb.Append(aClass.Flags).Append(aClass.FullName);
                         sb.Append(aClass.ExtendsType);
                         if (aClass.Implements != null)
                             foreach (string implements in aClass.Implements)
@@ -551,7 +551,7 @@ internal void UpdateView(FileModel aFile)
                         names.Add(aClass.Name);
                         foreach (MemberModel member in aClass.Members)
                         {
-                            sb.Append(member.Flags.ToString()).Append(member.ToString());
+                            sb.Append(member.Flags).Append(member);
                             lines.Add(member.LineFrom);
                             names.Add(member.Name);
                         }
diff --git a/External/Plugins/AirProperties/Forms/AirWizard.cs b/External/Plugins/AirProperties/Forms/AirWizard.cs
@@ -1065,11 +1065,11 @@ private void UpdateIcon(string fileName, ref TextBox fileNameTextBox, Point dime
                 {
                     if (_pluginMain.Settings.UseUniformFilenames)
                     {
-                        destinationFileName = filePrefix + dimensions.X.ToString() + Path.GetExtension(fileName);
+                        destinationFileName = filePrefix + dimensions.X + Path.GetExtension(fileName);
                     }
                     else if (_pluginMain.Settings.RenameIconsWithSize)
                     {
-                        destinationFileName = Path.GetFileNameWithoutExtension(fileName) + dimensions.X.ToString() + Path.GetExtension(fileName);
+                        destinationFileName = Path.GetFileNameWithoutExtension(fileName) + dimensions.X + Path.GetExtension(fileName);
                     }
                     else destinationFileName = Path.GetFileName(fileName);
                     if (!Directory.Exists(destinationPath))
@@ -1089,7 +1089,7 @@ private void UpdateIcon(string fileName, ref TextBox fileNameTextBox, Point dime
             }
             else
             {
-                MessageBox.Show(String.Format(TextHelper.GetString("Alert.Message.InvalidIconDimensions"), dimensions.X.ToString(), dimensions.Y.ToString()), TextHelper.GetString("Alert.Title.InvalidIconDimensions"), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                MessageBox.Show(String.Format(TextHelper.GetString("Alert.Message.InvalidIconDimensions"), dimensions.X, dimensions.Y), TextHelper.GetString("Alert.Title.InvalidIconDimensions"), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
             }
         }
 
diff --git a/External/Plugins/CodeFormatter/Handlers/ASPrettyPrinter.cs b/External/Plugins/CodeFormatter/Handlers/ASPrettyPrinter.cs
@@ -4735,7 +4735,7 @@ public EqualContext(EqualContext parent, int index)
             mParent=parent;
             if (parent!=null)
             {
-                mPathCode=parent.mPathCode+index.ToString();
+                mPathCode = parent.mPathCode + index;
             }
             else
             {
diff --git a/External/Plugins/CodeRefactor/Commands/Rename.cs b/External/Plugins/CodeRefactor/Commands/Rename.cs
@@ -347,7 +347,7 @@ private void ReportResults()
                         reportableLines[lineNumber] = new List<string>();
                     }
                     // the data we store matches the TraceManager.Add's formatting.  We insert the {0} at the end so that we can insert the final line state later
-                    reportableLines[lineNumber].Add(entry.Key + ":" + match.Line.ToString() + ": chars " + column + "-" + (column + newNameLength) + " : {0}");
+                    reportableLines[lineNumber].Add(entry.Key + ":" + match.Line + ": chars " + column + "-" + (column + newNameLength) + " : {0}");
                 }
                 // report all the lines
                 foreach (KeyValuePair<int, List<String>> lineSetsToReport in reportableLines)
diff --git a/External/Plugins/FileExplorer/PluginUI.cs b/External/Plugins/FileExplorer/PluginUI.cs
@@ -453,7 +453,7 @@ private void UpdateUI(string path, DirectoryInfo directory, FileSystemInfo[] inf
                         item = new ListViewItem(file.Name, ExtractIconIfNecessary(file.FullName));
                         item.Tag = file.FullName;
                         if (file.Length / 1024 < 1) item.SubItems.Add("1 " + kbs);
-                        else item.SubItems.Add((file.Length / 1024).ToString() + " " + kbs);
+                        else item.SubItems.Add((file.Length / 1024) + " " + kbs);
                         item.SubItems.Add(file.Extension.ToUpper().Replace(".", ""));
                         item.SubItems.Add(file.LastWriteTime.ToString());
                         this.fileView.Items.Add(item);
diff --git a/External/Plugins/FlashDebugger/Controls/DataTree/ValueNode.cs b/External/Plugins/FlashDebugger/Controls/DataTree/ValueNode.cs
@@ -69,11 +69,11 @@ public override string Value
                         {
                             if (number < 0 && number >= Int32.MinValue)
                             {
-                                return number.ToString() + " [0x" + ((Int32)number).ToString("x") + "]";
+                                return number + " [0x" + ((Int32)number).ToString("x") + "]";
                             }
                             else if (number < 0 || number > 9)
                             {
-                                return number.ToString() + " [0x" + ((Int64)number).ToString("x") + "]";
+                                return number + " [0x" + ((Int64)number).ToString("x") + "]";
                             }
                         }
                         else return number.ToString();
diff --git a/External/Plugins/FlashDebugger/Helpers/MenusHelper.cs b/External/Plugins/FlashDebugger/Helpers/MenusHelper.cs
@@ -289,7 +289,7 @@ public void UpdateMenuState(object sender, DebuggerState state)
             // Notify plugins of main states when state changes...
             if (hasChanged && (state == DebuggerState.Running || state == DebuggerState.Stopped))
             {
-                DataEvent de = new DataEvent(EventType.Command, "FlashDebugger." + state.ToString(), null);
+                DataEvent de = new DataEvent(EventType.Command, "FlashDebugger." + state, null);
                 EventManager.DispatchEvent(this, de);
             }
             PluginBase.MainForm.RefreshUI();
diff --git a/External/Plugins/ProjectManager/Controls/TreeView/OtherNodes.cs b/External/Plugins/ProjectManager/Controls/TreeView/OtherNodes.cs
@@ -248,7 +248,7 @@ public override void Refresh(bool recursive)
                 string absolute = globalClasspath;
                 if (!Path.IsPathRooted(absolute))
                     absolute = project.GetAbsolutePath(globalClasspath);
-                if (absolute.StartsWith(project.Directory + Path.DirectorySeparatorChar.ToString()))
+                if (absolute.StartsWith(project.Directory + Path.DirectorySeparatorChar))
                     continue;
 
                 cpNode = ReuseNode(absolute, nodesToDie) as ProjectClasspathNode ?? new ClasspathNode(project, absolute, globalClasspath);
diff --git a/FlashDevelop/Dialogs/FRInFilesDialog.cs b/FlashDevelop/Dialogs/FRInFilesDialog.cs
@@ -775,7 +775,7 @@ private void ReplaceFinished(FRResults results)
                     {
                         foreach (SearchMatch match in entry.Value)
                         {
-                            TraceManager.Add(entry.Key + ":" + match.Line.ToString() + ": chars " + match.Column + "-" + (match.Column + match.Length) + " : " + match.Value, (Int32)TraceType.Info);
+                            TraceManager.Add(entry.Key + ":" + match.Line + ": chars " + match.Column + "-" + (match.Column + match.Length) + " : " + match.Value, (Int32)TraceType.Info);
                         }
                     }
                     Globals.MainForm.CallCommand("PluginCommand", "ResultsPanel.ShowResults");
diff --git a/FlashDevelop/MainForm.cs b/FlashDevelop/MainForm.cs
@@ -1414,8 +1414,8 @@ public void OnScintillaControlUpdateControl(ScintillaControl sci)
             if (sci != null && document != null && document.IsEditable)
             {
                 String statusText = " " + TextHelper.GetString("Info.StatusText");
-                String line = sci.CurrentLine + 1 + " / " + sci.LineCount.ToString();
-                String column = sci.Column(sci.CurrentPos) + 1 + " / " + (sci.Column(sci.LineEndPosition(sci.CurrentLine)) + 1).ToString();
+                String line = sci.CurrentLine + 1 + " / " + sci.LineCount;
+                String column = sci.Column(sci.CurrentPos) + 1 + " / " + (sci.Column(sci.LineEndPosition(sci.CurrentLine)) + 1);
                 var oldOS = this.OSVersion.Major < 6; // Vista is 6.0 and ok...
                 String file = oldOS ? PathHelper.GetCompactPath(sci.FileName) : sci.FileName;
                 String eol = (sci.EOLMode == 0) ? "CR+LF" : ((sci.EOLMode == 1) ? "CR" : "LF");
diff --git a/PluginCore/BBCode/BBCodeStyle.cs b/PluginCore/BBCode/BBCodeStyle.cs
@@ -145,7 +145,7 @@ override public String ToString()
                    + " isUnderlined='" + isUnderlined + "'"
                    + " fontName='" + (fontName == null ? "null" : fontName) + "'"
                    + " fontSize='" + fontSize + "'"
-                   + " isAbsFontSize='" + isAbsFontSize.ToString() + "'"
+                   + " isAbsFontSize='" + isAbsFontSize + "'"
                    + " foreColor='" + (foreColor == null ? "null" : foreColor.ToString()) + "'"
                    + " backColor='" + (backColor == null ? "null" : backColor.ToString()) + "'"
                    + "]";
diff --git a/PluginCore/BBCode/BBCodeTagInfo.cs b/PluginCore/BBCode/BBCodeTagInfo.cs
@@ -44,7 +44,7 @@ public String tagParam
         override public String ToString()
         {
             return "[bbCodeTagInfo"
-                   + " isTagOpener=" + _isTagOpener.ToString()
+                   + " isTagOpener=" + _isTagOpener
                    + " tagName='" + _tagName + "'"
                    + " tagParam='" + _tagParam + "'"
                    + "]";
diff --git a/PluginCore/BBCode/BBCodeTagMatch.cs b/PluginCore/BBCode/BBCodeTagMatch.cs
@@ -108,13 +108,13 @@ override public String ToString()
         {
             return "[bbCodeTagMatch"
                    + " isTagOpener=" + this.isTagOpener
-                   + " tagIndex=" + _tagIndex.ToString()
-                   + " tagLength=" + _tagLength.ToString()
+                   + " tagIndex=" + _tagIndex
+                   + " tagLength=" + _tagLength
                    + " tagValue='" + _tagValue + "'"
                    + " tagName='" + this.tagName + "'"
                    + " tagParam='" + this.tagParam + "'"
-                   + " numOpenBraceSlashes='" + _numOpenBraceSlashes.ToString() + "'"
-                   + " numCloseBraceSlashes='" + _numCloseBraceSlashes.ToString() + "'"
+                   + " numOpenBraceSlashes='" + _numOpenBraceSlashes + "'"
+                   + " numCloseBraceSlashes='" + _numCloseBraceSlashes + "'"
                    + " bbCodeStyle='" + (_bbCodeStyle == null ? "null" : _bbCodeStyle.ToString()) + "'"
                    + "]";
         }
diff --git a/PluginCore/BBCode/IndexTree.cs b/PluginCore/BBCode/IndexTree.cs
@@ -266,11 +266,11 @@ public static String treeToString( IndexTree tree, String space, Boolean noEolAn
                 s += "\n";
             
             s += space + "<tree"
-                       + " indexA=" + tree.indexA.ToString()
-                       + " indexB=" + tree.indexB.ToString()
-                       + " offsetA=" + tree.offsetA.ToString()
-                       + " offsetB=" + tree.offsetB.ToString()
-                       + " nodes=" + tree.nodes.Count.ToString()
+                       + " indexA=" + tree.indexA
+                       + " indexB=" + tree.indexB
+                       + " offsetA=" + tree.offsetA
+                       + " offsetB=" + tree.offsetB
+                       + " nodes=" + tree.nodes.Count
                        + " data='" + (tree.data == null ? "null" : tree.data.ToString()) + "'"
                        + " root='" + (getRootNode(tree).data == null ? "null" : getRootNode(tree).data.ToString()) + "'"
                        + ">";
diff --git a/PluginCore/PluginCore/Localization/TextHelper.cs b/PluginCore/PluginCore/Localization/TextHelper.cs
@@ -21,7 +21,7 @@ public static String GetString(String key)
             if (resourceManager == null || localeSetting != storedLocale)
             {
                 storedLocale = localeSetting;
-                String path = "PluginCore.PluginCore.Resources." + storedLocale.ToString();
+                String path = "PluginCore.PluginCore.Resources." + storedLocale;
                 resourceManager = new ResourceManager(path, Assembly.GetExecutingAssembly());
             }
             prefix = Assembly.GetCallingAssembly().GetName().Name;
diff --git a/PluginCore/PluginCore/Managers/ErrorManager.cs b/PluginCore/PluginCore/Managers/ErrorManager.cs
@@ -77,9 +77,9 @@ public static void ShowError(Exception exception)
         public static void AddToLog(String message, Exception exception)
         {
             String result = String.Empty;
-            result += DateTime.Now.ToString() + "\r\n\r\n";
-            if (message != null) result += message.ToString() + "\r\n\r\n";
-            if (exception != null) result += exception.ToString() + "\r\n\r\n";
+            result += DateTime.Now + "\r\n\r\n";
+            if (message != null) result += message + "\r\n\r\n";
+            if (exception != null) result += exception + "\r\n\r\n";
             try
             {
                 String fileName = Path.Combine(PathHelper.BaseDir, "Exceptions.log");
diff --git a/PluginCore/SharpZipLib/Zip/ZipInputStream.cs b/PluginCore/SharpZipLib/Zip/ZipInputStream.cs
@@ -485,7 +485,7 @@ int ReadingNotSupported(byte[] destination, int offset, int count)
         int InitialRead(byte[] destination, int offset, int count)
         {
             if ( !CanDecompressEntry ) {
-                throw new ZipException("Library cannot extract this entry. Version required is (" + entry.Version.ToString() + ")");
+                throw new ZipException("Library cannot extract this entry. Version required is (" + entry.Version + ")");
             }
             
             // Handle encryption if required.

Original file line number	Diff line number	Diff line change
`@@ -3053,7 +3053,7 @@ private static string GuessVarName(string name, string type)`
`3053`	`3053`	`name = name.TrimStart(new char[] { '_' });`
`3054`	`3054`	`if (name.Length > 3 && name.StartsWith("get") && (name[3].ToString() == char.ToUpper(name[3]).ToString()))`
`3055`	`3055`	`{`
`3056`		`- name = char.ToLower(name[3]).ToString() + name.Substring(4);`
	`3056`	`+ name = char.ToLower(name[3]) + name.Substring(4);`
`3057`	`3057`	`}`
`3058`	`3058`
`3059`	`3059`	`if (name.Length > 1)`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public static TypeDefinitionKind ParseTypedCallback(string comment, MemberModel`
`193`	`193`	`private static string getRandomStringRepl()`
`194`	`194`	`{`
`195`	`195`	`random.NextDouble();`
`196`		`- return "StringRepl" + random.Next(0xFFFFFFF).ToString();`
	`196`	`+ return "StringRepl" + random.Next(0xFFFFFFF);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ internal void UpdateView(FileModel aFile)`
`533`	`533`	`}`
`534`	`534`	`foreach (MemberModel member in aFile.Members)`
`535`	`535`	`{`
`536`		`- sb.Append(member.Flags.ToString()).Append(member.ToString());`
	`536`	`+ sb.Append(member.Flags).Append(member);`
`537`	`537`	`lines.Add(member.LineFrom);`
`538`	`538`	`names.Add(member.Name);`
`539`	`539`	`}`
`@@ -542,7 +542,7 @@ internal void UpdateView(FileModel aFile)`
`542`	`542`	`if (string.IsNullOrEmpty(aClass.ExtendsType))`
`543`	`543`	`aClass.ResolveExtends();`
`544`	`544`
`545`		`- sb.Append(aClass.Flags.ToString()).Append(aClass.FullName);`
	`545`	`+ sb.Append(aClass.Flags).Append(aClass.FullName);`
`546`	`546`	`sb.Append(aClass.ExtendsType);`
`547`	`547`	`if (aClass.Implements != null)`
`548`	`548`	`foreach (string implements in aClass.Implements)`
`@@ -551,7 +551,7 @@ internal void UpdateView(FileModel aFile)`
`551`	`551`	`names.Add(aClass.Name);`
`552`	`552`	`foreach (MemberModel member in aClass.Members)`
`553`	`553`	`{`
`554`		`- sb.Append(member.Flags.ToString()).Append(member.ToString());`
	`554`	`+ sb.Append(member.Flags).Append(member);`
`555`	`555`	`lines.Add(member.LineFrom);`
`556`	`556`	`names.Add(member.Name);`
`557`	`557`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1065,11 +1065,11 @@ private void UpdateIcon(string fileName, ref TextBox fileNameTextBox, Point dime`
`1065`	`1065`	`{`
`1066`	`1066`	`if (_pluginMain.Settings.UseUniformFilenames)`
`1067`	`1067`	`{`
`1068`		`- destinationFileName = filePrefix + dimensions.X.ToString() + Path.GetExtension(fileName);`
	`1068`	`+ destinationFileName = filePrefix + dimensions.X + Path.GetExtension(fileName);`
`1069`	`1069`	`}`
`1070`	`1070`	`else if (_pluginMain.Settings.RenameIconsWithSize)`
`1071`	`1071`	`{`
`1072`		`- destinationFileName = Path.GetFileNameWithoutExtension(fileName) + dimensions.X.ToString() + Path.GetExtension(fileName);`
	`1072`	`+ destinationFileName = Path.GetFileNameWithoutExtension(fileName) + dimensions.X + Path.GetExtension(fileName);`
`1073`	`1073`	`}`
`1074`	`1074`	`else destinationFileName = Path.GetFileName(fileName);`
`1075`	`1075`	`if (!Directory.Exists(destinationPath))`
`@@ -1089,7 +1089,7 @@ private void UpdateIcon(string fileName, ref TextBox fileNameTextBox, Point dime`
`1089`	`1089`	`}`
`1090`	`1090`	`else`
`1091`	`1091`	`{`
`1092`		`- MessageBox.Show(String.Format(TextHelper.GetString("Alert.Message.InvalidIconDimensions"), dimensions.X.ToString(), dimensions.Y.ToString()), TextHelper.GetString("Alert.Title.InvalidIconDimensions"), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);`
	`1092`	`+ MessageBox.Show(String.Format(TextHelper.GetString("Alert.Message.InvalidIconDimensions"), dimensions.X, dimensions.Y), TextHelper.GetString("Alert.Title.InvalidIconDimensions"), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);`
`1093`	`1093`	`}`
`1094`	`1094`	`}`
`1095`	`1095`
Original file line number	Diff line number	Diff line change
`@@ -4735,7 +4735,7 @@ public EqualContext(EqualContext parent, int index)`
`4735`	`4735`	`mParent=parent;`
`4736`	`4736`	`if (parent!=null)`
`4737`	`4737`	`{`
`4738`		`- mPathCode=parent.mPathCode+index.ToString();`
	`4738`	`+ mPathCode = parent.mPathCode + index;`
`4739`	`4739`	`}`
`4740`	`4740`	`else`
`4741`	`4741`	`{`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ private void ReportResults()`
`347`	`347`	`reportableLines[lineNumber] = new List<string>();`
`348`	`348`	`}`
`349`	`349`	`// the data we store matches the TraceManager.Add's formatting. We insert the {0} at the end so that we can insert the final line state later`
`350`		`- reportableLines[lineNumber].Add(entry.Key + ":" + match.Line.ToString() + ": chars " + column + "-" + (column + newNameLength) + " : {0}");`
	`350`	`+ reportableLines[lineNumber].Add(entry.Key + ":" + match.Line + ": chars " + column + "-" + (column + newNameLength) + " : {0}");`
`351`	`351`	`}`
`352`	`352`	`// report all the lines`
`353`	`353`	`foreach (KeyValuePair<int, List<String>> lineSetsToReport in reportableLines)`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ public override string Value`
`69`	`69`	`{`
`70`	`70`	`if (number < 0 && number >= Int32.MinValue)`
`71`	`71`	`{`
`72`		`- return number.ToString() + " [0x" + ((Int32)number).ToString("x") + "]";`
	`72`	`+ return number + " [0x" + ((Int32)number).ToString("x") + "]";`
`73`	`73`	`}`
`74`	`74`	`else if (number < 0 \|\| number > 9)`
`75`	`75`	`{`
`76`		`- return number.ToString() + " [0x" + ((Int64)number).ToString("x") + "]";`
	`76`	`+ return number + " [0x" + ((Int64)number).ToString("x") + "]";`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`else return number.ToString();`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public void UpdateMenuState(object sender, DebuggerState state)`
`289`	`289`	`// Notify plugins of main states when state changes...`
`290`	`290`	`if (hasChanged && (state == DebuggerState.Running \|\| state == DebuggerState.Stopped))`
`291`	`291`	`{`
`292`		`- DataEvent de = new DataEvent(EventType.Command, "FlashDebugger." + state.ToString(), null);`
	`292`	`+ DataEvent de = new DataEvent(EventType.Command, "FlashDebugger." + state, null);`
`293`	`293`	`EventManager.DispatchEvent(this, de);`
`294`	`294`	`}`
`295`	`295`	`PluginBase.MainForm.RefreshUI();`