Cleanups after merge

VocaluxeLib/Profile/CAvatar.cs

@@ -1,9 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region license
+// /*
+//     This file is part of Vocaluxe.
+// 
+//     Vocaluxe is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Vocaluxe is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+//  */
+#endregion
+
 using VocaluxeLib.Draw;
-using VocaluxeLib.Menu;
 
 namespace VocaluxeLib.Profile
 {
@@ -13,14 +27,14 @@ namespace VocaluxeLib.Profile
         public string FileName = "";
         public CTexture Texture;
 
-        public CAvatar(int ID)
+        public CAvatar(int id)
         {
-            this.ID = ID;
+            ID = id;
         }
 
-        public bool LoadFromFile(string NewFileName)
+        public bool LoadFromFile(string fileName)
         {
-            FileName = NewFileName;
+            FileName = fileName;
             return Reload();
         }
 

VocaluxeLib/Profile/CProfile.cs

@@ -1,7 +1,24 @@
-using System;
-using System.Collections.Generic;
+#region license
+// /*
+//     This file is part of Vocaluxe.
+// 
+//     Vocaluxe is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Vocaluxe is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+//  */
+#endregion
+
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Xml;
 
@@ -9,15 +26,15 @@ namespace VocaluxeLib.Profile
 {
     public class CProfile
     {
-        private static readonly XmlWriterSettings _Settings = new XmlWriterSettings()
-            { 
+        private static readonly XmlWriterSettings _Settings = new XmlWriterSettings
+            {
                 Indent = true,
                 Encoding = Encoding.UTF8,
                 ConformanceLevel = ConformanceLevel.Document
             };
 
         public int ID;
-        
+
         public string PlayerName;
         public string FileName;
         public string AvatarFileName;
@@ -55,9 +72,9 @@ namespace VocaluxeLib.Profile
             return LoadProfile(FileName);
         }
 
-        public bool LoadProfile(string NewFileName)
+        public bool LoadProfile(string fileName)
         {
-            FileName = NewFileName;
+            FileName = fileName;
 
             CXMLReader xmlReader = CXMLReader.OpenFile(FileName);
             if (xmlReader == null)
@@ -85,7 +102,9 @@ namespace VocaluxeLib.Profile
             if (FileName == String.Empty)
             {
                 string filename = string.Empty;
+                // ReSharper disable LoopCanBeConvertedToQuery
                 foreach (char chr in PlayerName)
+                    // ReSharper restore LoopCanBeConvertedToQuery
                 {
                     if (char.IsLetter(chr))
                         filename += chr.ToString();
@@ -142,4 +161,4 @@ namespace VocaluxeLib.Profile
             }
         }
     }
-}
+}