Remove unnecessary name qualifiers.

openrails · Jul 24, 2020 · 633793b · 633793b
1 parent 03dc5dd
commit 633793b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/Contrib/ContentManager/Models/Consist.cs b/Source/Contrib/ContentManager/Models/Consist.cs
@@ -74,7 +74,7 @@ private static IEnumerable<Item> GetOrtsItems(TrainFile file)
         /// </summary>
         /// <param name="file">The consist structure to query.</param>
         /// <returns>An iterator of items.</returns>
-        private static IEnumerable<Item> GetMstsItems(Orts.Formats.Msts.ConsistFile file) => file.Train.TrainCfg.WagonList
+        private static IEnumerable<Item> GetMstsItems(ConsistFile file) => file.Train.TrainCfg.WagonList
             .Select((Wagon wagon) => new MstsCar(wagon));
 
         public enum Direction{

diff --git a/Source/ORTS.Menu/Consists.cs b/Source/ORTS.Menu/Consists.cs
@@ -21,6 +21,7 @@
 using System.Linq;
 using GNU.Gettext;
 using Orts.Formats.Msts;
+using Orts.Formats.OR;
 using ORTS.Common;
 
 namespace ORTS.Menu
@@ -65,9 +66,9 @@ private static ITrainFile LoadConsist(string filePath)
             switch (System.IO.Path.GetExtension(filePath).ToLowerInvariant())
             {
                 case ".train-or":
-                    return Orts.Formats.OR.TrainFile.LoadFrom(filePath);
+                    return TrainFile.LoadFrom(filePath);
                 case ".con":
-                    return new Orts.Formats.Msts.ConsistFile(filePath);
+                    return new ConsistFile(filePath);
                 default:
                     throw new InvalidDataException("Unknown train format");
             }