Adjust includes

This commit is contained in:
Wojtek Figat
2021-06-17 14:15:19 +02:00
parent aa83af477a
commit 99012725dc
21 changed files with 57 additions and 55 deletions

View File

@@ -80,11 +80,6 @@ MClass::~MClass()
_events.ClearDelete();
}
String MClass::ToString() const
{
return String(_fullname);
}
MonoClass* MClass::GetNative() const
{
return _monoClass;

View File

@@ -73,12 +73,6 @@ public:
return _fullname;
}
/// <summary>
/// Gets the class full name as string.
/// </summary>
/// <returns>The class full name.</returns>
String ToString() const;
#if USE_MONO
/// <summary>

View File

@@ -639,9 +639,7 @@ MClass* Scripting::FindClass(MonoClass* monoClass)
{
if (monoClass == nullptr)
return nullptr;
PROFILE_CPU();
auto& modules = BinaryModule::GetModules();
for (auto module : modules)
{
@@ -653,7 +651,6 @@ MClass* Scripting::FindClass(MonoClass* monoClass)
return result;
}
}
return nullptr;
}
@@ -661,9 +658,7 @@ MClass* Scripting::FindClass(const StringAnsiView& fullname)
{
if (fullname.IsEmpty())
return nullptr;
PROFILE_CPU();
auto& modules = BinaryModule::GetModules();
for (auto module : modules)
{
@@ -675,7 +670,6 @@ MClass* Scripting::FindClass(const StringAnsiView& fullname)
return result;
}
}
return nullptr;
}
@@ -683,9 +677,7 @@ MonoClass* Scripting::FindClassNative(const StringAnsiView& fullname)
{
if (fullname.IsEmpty())
return nullptr;
PROFILE_CPU();
auto& modules = BinaryModule::GetModules();
for (auto module : modules)
{
@@ -697,7 +689,6 @@ MonoClass* Scripting::FindClassNative(const StringAnsiView& fullname)
return result->GetNative();
}
}
return nullptr;
}
@@ -705,9 +696,7 @@ ScriptingTypeHandle Scripting::FindScriptingType(const StringAnsiView& fullname)
{
if (fullname.IsEmpty())
return ScriptingTypeHandle();
PROFILE_CPU();
auto& modules = BinaryModule::GetModules();
for (auto module : modules)
{
@@ -717,7 +706,6 @@ ScriptingTypeHandle Scripting::FindScriptingType(const StringAnsiView& fullname)
return ScriptingTypeHandle(module, typeIndex);
}
}
return ScriptingTypeHandle();
}

View File

@@ -91,21 +91,21 @@ public:
/// <summary>
/// Finds the class with given fully qualified name within whole assembly.
/// </summary>
/// <param name="fullname">The full name of the type eg: System.Int64.MaxInt.</param>
/// <param name="fullname">The full name of the type eg: System.Int64.</param>
/// <returns>The MClass object or null if missing.</returns>
static MClass* FindClass(const StringAnsiView& fullname);
/// <summary>
/// Finds the native class with given fully qualified name within whole assembly.
/// </summary>
/// <param name="fullname">The full name of the type eg: System.Int64.MaxInt.</param>
/// <param name="fullname">The full name of the type eg: System.Int64.</param>
/// <returns>The MClass object or null if missing.</returns>
static MonoClass* FindClassNative(const StringAnsiView& fullname);
/// <summary>
/// Finds the scripting type of the given fullname by searching loaded scripting assemblies.
/// </summary>
/// <param name="fullname">The full name of the type eg: System.Int64.MaxInt.</param>
/// <param name="fullname">The full name of the type eg: System.Int64.</param>
/// <returns>The scripting type or invalid type if missing.</returns>
static ScriptingTypeHandle FindScriptingType(const StringAnsiView& fullname);

View File

@@ -259,7 +259,7 @@ void ScriptingObject::OnDeleteObject()
String ScriptingObject::ToString() const
{
return _type ? _type.GetType().ManagedClass->ToString() : String::Empty;
return _type ? String(_type.GetType().ManagedClass->GetFullName()) : String::Empty;
}
ManagedScriptingObject::ManagedScriptingObject(const SpawnParams& params)