birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix upgrade scanner

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-11-15 17:15:05 -08:00
parent 89a97a5e49
commit 0e7d732c61
21 changed files with 239 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
+9 -3
View File
@@ -189,7 +189,7 @@ namespace ScriptCanvas
namespace ScriptCanvasEditor
{
SourceHandle::SourceHandle(const SourceHandle& data, const AZ::Uuid& id, AZStd::string_view path)
SourceHandle::SourceHandle(const SourceHandle& data, const AZ::Uuid& id, const AZ::IO::Path& path)
: m_data(data.m_data)
, m_id(id)
, m_path(path)
@@ -197,7 +197,7 @@ namespace ScriptCanvasEditor
}
SourceHandle::SourceHandle(ScriptCanvas::DataPtr graph, const AZ::Uuid& id, AZStd::string_view path)
SourceHandle::SourceHandle(ScriptCanvas::DataPtr graph, const AZ::Uuid& id, const AZ::IO::Path& path)
: m_data(graph)
, m_id(id)
, m_path(path)
@@ -217,6 +217,12 @@ namespace ScriptCanvasEditor
m_path.clear();
}
// return a SourceHandle with only the Id and Path, but without a pointer to the data
SourceHandle SourceHandle::Describe() const
{
return SourceHandle(nullptr, m_id, m_path);
}
GraphPtrConst SourceHandle::Get() const
{
return m_data ? m_data->GetEditorGraph() : nullptr;
@@ -249,7 +255,7 @@ namespace ScriptCanvasEditor
return !(*this == other);
}
const AZStd::string& SourceHandle::Path() const
const AZ::IO::Path& SourceHandle::Path() const
{
return m_path;
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
+12 -10
View File
@@ -9,18 +9,19 @@
#pragma once
#include <AzCore/Component/EntityId.h>
#include <AzCore/Component/EntityUtils.h>
#include <AzCore/Component/NamedEntityId.h>
#include <AzCore/IO/Path/Path.h>
#include <AzCore/Math/MathUtils.h>
#include <AzCore/Math/Uuid.h>
#include <AzCore/Memory/Memory.h>
#include <AzCore/Memory/SystemAllocator.h>
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/RTTI/BehaviorContext.h>
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/RTTI/ReflectContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/std/any.h>
#include <AzCore/std/hash.h>
#include <AzCore/Component/EntityUtils.h>
#include <AzCore/Component/NamedEntityId.h>
#include <AzCore/Math/Uuid.h>
#include <Core/NamedId.h>
#include <ScriptCanvas/Grammar/PrimitivesDeclarations.h>
@@ -326,16 +327,17 @@ namespace ScriptCanvasEditor
SourceHandle() = default;
SourceHandle(const SourceHandle& data, const AZ::Uuid& id, AZStd::string_view path);
SourceHandle(const SourceHandle& data, const AZ::Uuid& id, const AZ::IO::Path& path);
SourceHandle(ScriptCanvas::DataPtr graph, const AZ::Uuid& id, AZStd::string_view path);
~SourceHandle() = default;
SourceHandle(ScriptCanvas::DataPtr graph, const AZ::Uuid& id, const AZ::IO::Path& path);
bool AnyEquals(const SourceHandle& other) const;
void Clear();
// return a SourceHandle with only the Id and Path, but without a pointer to the data
SourceHandle Describe() const;
GraphPtrConst Get() const;
const AZ::Uuid& Id() const;
@@ -348,7 +350,7 @@ namespace ScriptCanvasEditor
bool operator!=(const SourceHandle& other) const;
const AZStd::string& Path() const;
const AZ::IO::Path& Path() const;
bool PathEquals(const SourceHandle& other) const;
@@ -357,7 +359,7 @@ namespace ScriptCanvasEditor
private:
ScriptCanvas::DataPtr m_data;
AZ::Uuid m_id = AZ::Uuid::CreateNull();
AZStd::string m_path;
AZ::IO::Path m_path;
};
}