Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* Rename enum fields

* Naming conventions

* Remove unneeded ".this"

* Remove unneeded semicolons

* Remove unused Usings

* Don't use var

* Remove unneeded enum underlying types

* Explicitly label class visibility

* Remove unneeded @ prefixes

* Remove unneeded commas

* Remove unneeded if expressions

* Method doesn't use unsafe code

* Remove unneeded casts

* Initialized objects don't need an empty constructor

* Remove settings from DotSettings

* Revert "Explicitly label class visibility"

This reverts commit ad5eb5787c.

* Small changes

* Revert external enum renaming

* Changes from feedback

* Remove unneeded property setters
This commit is contained in:
Alex Barney 2018-12-04 14:23:37 -06:00 • committed by gdkchan
parent c86aacde76
commit 85dbb9559a
299 changed files with 12268 additions and 12276 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Ryujinx.HLE/HOS/IdDictionary.cs
View file

@ -6,56 +6,56 @@ namespace Ryujinx.HLE.HOS
{
class IdDictionary
{
private ConcurrentDictionary<int, object> Objs;
private ConcurrentDictionary<int, object> _objs;
public IdDictionary()
{
Objs = new ConcurrentDictionary<int, object>();
_objs = new ConcurrentDictionary<int, object>();
}
public bool Add(int Id, object Data)
public bool Add(int id, object data)
{
return Objs.TryAdd(Id, Data);
return _objs.TryAdd(id, data);
}
public int Add(object Data)
public int Add(object data)
{
for (int Id = 1; Id < int.MaxValue; Id++)
for (int id = 1; id < int.MaxValue; id++)
{
if (Objs.TryAdd(Id, Data))
if (_objs.TryAdd(id, data))
{
return Id;
return id;
}
}
throw new InvalidOperationException();
}
public object GetData(int Id)
public object GetData(int id)
{
if (Objs.TryGetValue(Id, out object Data))
if (_objs.TryGetValue(id, out object data))
{
return Data;
return data;
}
return null;
}
public T GetData<T>(int Id)
public T GetData<T>(int id)
{
if (Objs.TryGetValue(Id, out object Data) && Data is T)
if (_objs.TryGetValue(id, out object data) && data is T)
{
return (T)Data;
return (T)data;
}
return default(T);
}
public object Delete(int Id)
public object Delete(int id)
{
if (Objs.TryRemove(Id, out object Obj))
if (_objs.TryRemove(id, out object obj))
{
return Obj;
return obj;
}
return null;
@ -63,11 +63,11 @@ namespace Ryujinx.HLE.HOS
public ICollection<object> Clear()
{
ICollection<object> Values = Objs.Values;
ICollection<object> values = _objs.Values;
Objs.Clear();
_objs.Clear();
return Values;
return values;
}
}
}