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

more gems changes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-23 13:03:37 -07:00
parent 804d833bb9
commit 23f99aeb94
30 changed files with 27 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp
-2
View File
@@ -156,6 +156,4 @@ namespace GraphCanvas
m_proxyWidget = nullptr;
}
}
#include <Source/Components/NodePropertyDisplays/moc_AssetIdNodePropertyDisplay.cpp>
}
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h
-2
View File
@@ -7,13 +7,11 @@
*/
#pragma once
#if !defined(Q_MOC_RUN)
#include <AzFramework/Asset/AssetCatalogBus.h>
#include <AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx>
#include <GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h>
#include <GraphCanvas/Components/NodePropertyDisplay/AssetIdDataInterface.h>
#endif
class QGraphicsProxyWidget;
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp
-2
View File
@@ -403,6 +403,4 @@ namespace GraphCanvas
m_menuDisplayDirty = true;
}
}
#include <Source/Components/NodePropertyDisplays/moc_ComboBoxNodePropertyDisplay.cpp>
}
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h
-2
View File
@@ -9,7 +9,6 @@
class QEvent;
#if !defined(Q_MOC_RUN)
#include <AzCore/Component/EntityBus.h>
#include <AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx>
@@ -18,7 +17,6 @@ class QEvent;
#include <GraphCanvas/Components/NodePropertyDisplay/ComboBoxDataInterface.h>
#include <GraphCanvas/Components/MimeDataHandlerBus.h>
#include <Widgets/GraphCanvasComboBox.h>
#endif
namespace GraphCanvas
{
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp
-2
View File
@@ -208,6 +208,4 @@ namespace GraphCanvas
m_proxyWidget = nullptr;
}
}
#include <Source/Components/NodePropertyDisplays/moc_EntityIdNodePropertyDisplay.cpp>
}
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h
-2
View File
@@ -9,7 +9,6 @@
class QEvent;
#if !defined(Q_MOC_RUN)
#include <AzCore/Component/EntityBus.h>
#include <AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx>
@@ -17,7 +16,6 @@ class QEvent;
#include <GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h>
#include <GraphCanvas/Components/NodePropertyDisplay/EntityIdDataInterface.h>
#include <GraphCanvas/Components/MimeDataHandlerBus.h>
#endif
namespace GraphCanvas
{
Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp
-2
View File
@@ -1070,8 +1070,6 @@ namespace GraphCanvas
// SceneComponent
///////////////////
static const char* k_copyPasteKey = "GraphCanvasScene";
void SceneComponent::Reflect(AZ::ReflectContext* context)
{
GraphSerialization::Reflect(context);
Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
-2
View File
@@ -11,8 +11,6 @@
namespace GraphCanvas
{
constexpr const char* s_graphCanvasTranslationBuilderName = "GraphCanvasTranslationBuilder";
AZ::Uuid TranslationAssetWorker::GetUUID()
{
return AZ::Uuid::CreateString("{459EF910-CAAF-465A-BA19-C91979DA5729}");
Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
-8
View File
@@ -20,14 +20,6 @@ namespace GraphCanvas
static constexpr char variant[] = "variant";
static constexpr char entries[] = "entries";
}
static const AZStd::string_view RequiredFields[] =
{
Field::key,
Field::context,
Field::variant,
Field::entries
};
}
AZ_CLASS_ALLOCATOR_IMPL(TranslationFormatSerializer, AZ::SystemAllocator, 0);