From c0fe6cdca0ebe6b19f8578893ec503d432683897 Mon Sep 17 00:00:00 2001 From: Ac_K Date: Wed, 16 Oct 2019 02:30:36 +0200 Subject: [PATCH] Move InvalidSystemResourceException with the other Exceptions (#794) * Move InvalidSystemResourceException with the other `InvalidSystemResourceException.cs` was in `Ryujinx.HLE/Resource` who didn't make sense since it's the only file in the folder, and other exceptions class are in `Ryujinx.HLE/Exceptions`. * Fix empty lines --- .../Exceptions/InvalidSystemResourceException.cs | 9 +++++++++ Ryujinx.HLE/HOS/Font/SharedFontManager.cs | 3 ++- .../Time/TimeZone/TimeZoneContentManager.cs | 2 +- .../Resource/InvalidSystemResourceException.cs | 13 ------------- 4 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 Ryujinx.HLE/Exceptions/InvalidSystemResourceException.cs delete mode 100644 Ryujinx.HLE/Resource/InvalidSystemResourceException.cs diff --git a/Ryujinx.HLE/Exceptions/InvalidSystemResourceException.cs b/Ryujinx.HLE/Exceptions/InvalidSystemResourceException.cs new file mode 100644 index 00000000..3c63e064 --- /dev/null +++ b/Ryujinx.HLE/Exceptions/InvalidSystemResourceException.cs @@ -0,0 +1,9 @@ +using System; + +namespace Ryujinx.HLE.Exceptions +{ + public class InvalidSystemResourceException : Exception + { + public InvalidSystemResourceException(string message) : base(message) { } + } +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs index 8a936dbf..11ba1ab4 100644 --- a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs +++ b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs @@ -1,11 +1,12 @@ using LibHac.Fs; using LibHac.Fs.NcaUtils; using Ryujinx.Common; +using Ryujinx.HLE.Exceptions; using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.FileSystem.Content; -using Ryujinx.HLE.Resource; using System.Collections.Generic; using System.IO; + using static Ryujinx.HLE.Utilities.FontUtils; namespace Ryujinx.HLE.HOS.Font diff --git a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs index 8a2a55b9..e9ec654b 100644 --- a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs +++ b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs @@ -1,9 +1,9 @@ using LibHac.Fs; using LibHac.Fs.NcaUtils; using Ryujinx.Common.Logging; +using Ryujinx.HLE.Exceptions; using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.HOS.Services.Time.Clock; -using Ryujinx.HLE.Resource; using Ryujinx.HLE.Utilities; using System.Collections.Generic; using System.IO; diff --git a/Ryujinx.HLE/Resource/InvalidSystemResourceException.cs b/Ryujinx.HLE/Resource/InvalidSystemResourceException.cs deleted file mode 100644 index 35c4874a..00000000 --- a/Ryujinx.HLE/Resource/InvalidSystemResourceException.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace Ryujinx.HLE.Resource -{ - public class InvalidSystemResourceException : Exception - { - public InvalidSystemResourceException(string message) - : base(message) - { - } - - } -}