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();
         }