Revert "Adjust naming conventions and general refactoring in HLE Project (#490)" (#526)

This reverts commit 85dbb9559ad317a657dafd24da27fec4b3f5250f.

6 files changed, 43 insertions, 46 deletions

diff --git a/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs b/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs
index bcf79901..fb0ea53e 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs
@@ -2,14 +2,14 @@ namespace Ryujinx.HLE.Loaders.Elf
 {
     struct ElfDynamic
     {
-        public ElfDynamicTag Tag { get; }
+        public ElfDynamicTag Tag { get; private set; }
 
-        public long Value { get; }
+        public long Value { get; private set; }
 
-        public ElfDynamic(ElfDynamicTag tag, long value)
+        public ElfDynamic(ElfDynamicTag Tag, long Value)
         {
-            Tag   = tag;
-            Value = value;
+            this.Tag   = Tag;
+            this.Value = Value;
         }
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfDynamicTag.cs b/Ryujinx.HLE/Loaders/Elf/ElfDynamicTag.cs
index eb37d612..9d7ad72e 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfDynamicTag.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfDynamicTag.cs
@@ -1,8 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
-
 namespace Ryujinx.HLE.Loaders.Elf
 {
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
     enum ElfDynamicTag
     {
         DT_NULL            = 0,
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs
index 9f47e353..3f3a2a79 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs
@@ -2,39 +2,39 @@ namespace Ryujinx.HLE.Loaders.Elf
 {
     struct ElfSymbol
     {
-        public string Name { get; }
+        public string Name { get; private set; }
 
-        public ElfSymbolType       Type       { get; }
-        public ElfSymbolBinding    Binding    { get; }
-        public ElfSymbolVisibility Visibility { get; }
+        public ElfSymbolType       Type       { get; private set; }
+        public ElfSymbolBinding    Binding    { get; private set; }
+        public ElfSymbolVisibility Visibility { get; private set; }
 
         public bool IsFuncOrObject =>
-            Type == ElfSymbolType.SttFunc ||
-            Type == ElfSymbolType.SttObject;
+            Type == ElfSymbolType.STT_FUNC ||
+            Type == ElfSymbolType.STT_OBJECT;
 
         public bool IsGlobalOrWeak =>
-            Binding == ElfSymbolBinding.StbGlobal ||
-            Binding == ElfSymbolBinding.StbWeak;
+            Binding == ElfSymbolBinding.STB_GLOBAL ||
+            Binding == ElfSymbolBinding.STB_WEAK;
 
-        public int  ShIdx { get; }
-        public long Value { get; }
-        public long Size  { get; }
+        public int  SHIdx { get; private set; }
+        public long Value { get; private set; }
+        public long Size  { get; private set; }
 
         public ElfSymbol(
-            string name,
-            int    info,
-            int    other,
-            int    shIdx,
-            long   value,
-            long   size)
+            string Name,
+            int    Info,
+            int    Other,
+            int    SHIdx,
+            long   Value,
+            long   Size)
         {
-            Name       = name;
-            Type       = (ElfSymbolType)(info & 0xf);
-            Binding    = (ElfSymbolBinding)(info >> 4);
-            Visibility = (ElfSymbolVisibility)other;
-            ShIdx      = shIdx;
-            Value      = value;
-            Size       = size;
+            this.Name       = Name;
+            this.Type       = (ElfSymbolType)(Info & 0xf);
+            this.Binding    = (ElfSymbolBinding)(Info >> 4);
+            this.Visibility = (ElfSymbolVisibility)Other;
+            this.SHIdx      = SHIdx;
+            this.Value      = Value;
+            this.Size       = Size;
         }
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs
index 92274fde..3c915311 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs
@@ -2,8 +2,8 @@ namespace Ryujinx.HLE.Loaders.Elf
 {
     enum ElfSymbolBinding
     {
-        StbLocal  = 0,
-        StbGlobal = 1,
-        StbWeak   = 2
+        STB_LOCAL  = 0,
+        STB_GLOBAL = 1,
+        STB_WEAK   = 2
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs
index 4110d4c3..f22e6c45 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs
@@ -2,12 +2,12 @@ namespace Ryujinx.HLE.Loaders.Elf
 {
     enum ElfSymbolType
     {
-        SttNoType  = 0,
-        SttObject  = 1,
-        SttFunc    = 2,
-        SttSection = 3,
-        SttFile    = 4,
-        SttCommon  = 5,
-        SttTls     = 6
+        STT_NOTYPE  = 0,
+        STT_OBJECT  = 1,
+        STT_FUNC    = 2,
+        STT_SECTION = 3,
+        STT_FILE    = 4,
+        STT_COMMON  = 5,
+        STT_TLS     = 6
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs
index f026fca8..4bec50a3 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs
@@ -2,9 +2,9 @@ namespace Ryujinx.HLE.Loaders.Elf
 {
     enum ElfSymbolVisibility
     {
-        StvDefault   = 0,
-        StvInternal  = 1,
-        StvHidden    = 2,
-        StvProtected = 3
+        STV_DEFAULT   = 0,
+        STV_INTERNAL  = 1,
+        STV_HIDDEN    = 2,
+        STV_PROTECTED = 3
     }
 }
\ No newline at end of file