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

Enables override/virtual warnings

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-15 14:11:17 -07:00
committed by GitHub
parent c50f3b2638 9cba144e39
commit bbe437819b
501 changed files with 3326 additions and 2777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSLogSystemInterface.h
+13 -1
View File
@@ -57,14 +57,26 @@ namespace AWSNativeSDKInit
/**
* Does a printf style output to the output stream. Don't use this, it's unsafe. See LogStream
*/
#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
void Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...) override;
#else
void Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...);
#endif
/**
* Writes the stream to the output stream.
*/
void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream);
#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream) override;
#else
void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream& messageStream);
#endif
#if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
void Flush() override;
#else
void Flush();
#endif
private:
bool ShouldLog(Aws::Utils::Logging::LogLevel logLevel);
Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.h
+2 -2
View File
@@ -26,8 +26,8 @@ namespace AssetBuilder
void EnableDebugMode(bool enable);
bool OnAssert(const char* message) override;
bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message);
bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message);
bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override;
bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
bool OnException(const char* message) override;
bool OnPrintf(const char* window, const char* message) override;
bool OnOutput(const char* window, const char* message) override;
Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h
+4 -4
View File
@@ -122,8 +122,8 @@ namespace AssetProcessor
//////////////////////////////////////////////////////////////////////////
// AzToolsFramework::ToolsAssetSystemBus::Handler
void RegisterSourceAssetType(const AZ::Data::AssetType& assetType, const char* assetFileFilter);
void UnregisterSourceAssetType(const AZ::Data::AssetType& assetType);
void RegisterSourceAssetType(const AZ::Data::AssetType& assetType, const char* assetFileFilter) override;
void UnregisterSourceAssetType(const AZ::Data::AssetType& assetType) override;
//////////////////////////////////////////////////////////////////////////
//! given some absolute path, please respond with its relative product path. For now, this will be a
@@ -163,9 +163,9 @@ namespace AssetProcessor
AZ::Outcome<AZStd::vector<AZ::Data::ProductDependency>, AZStd::string> GetAllProductDependenciesFilter(
const AZ::Data::AssetId& id,
const AZStd::unordered_set<AZ::Data::AssetId>& exclusionList,
const AZStd::vector<AZStd::string>& wildcardPatternExclusionList);
const AZStd::vector<AZStd::string>& wildcardPatternExclusionList) override;
bool DoesAssetIdMatchWildcardPattern(const AZ::Data::AssetId& assetId, const AZStd::string& wildcardPattern);
bool DoesAssetIdMatchWildcardPattern(const AZ::Data::AssetId& assetId, const AZStd::string& wildcardPattern) override;
void AddAssetDependencies(
const AZ::Data::AssetId& searchAssetId,
Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h
+1 -1
View File
@@ -67,7 +67,7 @@ namespace AssetProcessor
int columnCount(const QModelIndex& parent = QModelIndex()) const override;
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
QVariant data(const QModelIndex& index, int role) const;
QVariant data(const QModelIndex& index, int role) const override;
void markAsProcessing(RCJob* rcJob);
void markAsStarted(RCJob* rcJob);
Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/SerializationDependenciesTests.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ namespace SerializationDependencyTests
// Use an arbitrary ID for the asset type.
return AZ::Data::AssetType("{03FD33E2-DA2F-4021-A266-0DC9714FF84D}");
}
virtual const char* GetFileFilter() const
const char* GetFileFilter() const override
{
return nullptr;
}
Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.h
+2
View File
@@ -81,6 +81,8 @@ public:
struct MockRecognizerConfiguration
: public RecognizerConfiguration
{
virtual ~MockRecognizerConfiguration() = default;
const RecognizerContainer& GetAssetRecognizerContainer() const override
{
return m_recognizerContainer;
Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.cpp
+2 -2
View File
@@ -49,13 +49,13 @@ namespace
bool m_deleteFenceFileResult = false;
protected:
virtual QString CreateFenceFile(unsigned int fenceId)
QString CreateFenceFile(unsigned int fenceId) override
{
m_numTimesCreateFenceFileCalled++;
m_fenceId = fenceId;
return m_fenceFileName;
}
virtual bool DeleteFenceFile(QString fenceFileName)
bool DeleteFenceFile(QString fenceFileName) override
{
m_numTimesDeleteFenceFileCalled++;
return m_deleteFenceFileResult;
Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.cpp
+2
View File
@@ -22,6 +22,8 @@ namespace AssetProcessor
struct MockRecognizerConfiguration
: public RecognizerConfiguration
{
virtual ~MockRecognizerConfiguration() = default;
const RecognizerContainer& GetAssetRecognizerContainer() const override
{
return m_container;
Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp
+1 -1
View File
@@ -543,7 +543,7 @@ public:
Q_EMIT UnitTestPassed();
}
bool OnPreAssert(const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/)
bool OnPreAssert(const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/) override
{
m_assertTriggered = true;
return true;
Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h
+1 -1
View File
@@ -114,7 +114,7 @@ public:
void Rescan();
bool IsAssetProcessorManagerIdle() const;
bool IsAssetProcessorManagerIdle() const override;
bool CheckFullIdle();
Q_SIGNALS:
void CheckAssetProcessorManagerIdleState();
Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.h
+1 -1
View File
@@ -22,7 +22,7 @@ namespace AssetProcessor
virtual ~AssetServerHandler();
//////////////////////////////////////////////////////////////////////////
// AssetServerBus::Handler overrides
bool IsServerAddressValid();
bool IsServerAddressValid() override;
//! StoreJobResult will store all the files in the the temp folder provided by AP to a zip file on the network drive
//! whose file name will be based on the server key
bool StoreJobResult(const AssetProcessor::BuilderParams& builderParams, AZStd::vector<AZStd::string>& sourceFileList) override;
Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
+3
View File
@@ -84,6 +84,8 @@ namespace AssetProcessor
return !m_platformIdentifierStack.empty() ? AZ::SettingsRegistryInterface::VisitResponse::Continue
: AZ::SettingsRegistryInterface::VisitResponse::Skip;
}
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit([[maybe_unused]] AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override
{
if (m_platformIdentifierStack.empty())
@@ -114,6 +116,7 @@ namespace AssetProcessor
struct MetaDataTypesVisitor
: AZ::SettingsRegistryInterface::Visitor
{
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit([[maybe_unused]] AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override
{
m_metaDataTypes.push_back({ AZ::IO::PathView(valueName, AZ::IO::PosixPathSeparator).LexicallyNormal().String(), value });
Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
+7
View File
@@ -49,6 +49,7 @@ namespace AssetProcessor
{
}
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view path, AZStd::string_view, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override;
AZ::SettingsRegistryInterface* m_settingsRegistry;
@@ -129,6 +130,8 @@ namespace AssetProcessor
{
AZ::SettingsRegistryInterface::VisitResponse Traverse(AZStd::string_view jsonPath, AZStd::string_view valueName,
AZ::SettingsRegistryInterface::VisitAction action, AZ::SettingsRegistryInterface::Type) override;
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZ::s64 value) override;
void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override;
@@ -152,6 +155,8 @@ namespace AssetProcessor
{
AZ::SettingsRegistryInterface::VisitResponse Traverse(AZStd::string_view jsonPath, AZStd::string_view valueName,
AZ::SettingsRegistryInterface::VisitAction action, AZ::SettingsRegistryInterface::Type) override;
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override;
AZStd::vector<ExcludeAssetRecognizer> m_excludeAssetRecognizers;
@@ -169,6 +174,8 @@ namespace AssetProcessor
}
AZ::SettingsRegistryInterface::VisitResponse Traverse(AZStd::string_view jsonPath, AZStd::string_view valueName,
AZ::SettingsRegistryInterface::VisitAction action, AZ::SettingsRegistryInterface::Type) override;
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, bool value) override;
void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZ::s64 value) override;
void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override;
Code/Tools/DeltaCataloger/Tests/tests_main.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ protected:
}
bool OnPreError([[maybe_unused]] const char* window, [[maybe_unused]] const char* fileName, [[maybe_unused]] int line, [[maybe_unused]] const char* func, [[maybe_unused]] const char* message)
bool OnPreError([[maybe_unused]] const char* window, [[maybe_unused]] const char* fileName, [[maybe_unused]] int line, [[maybe_unused]] const char* func, [[maybe_unused]] const char* message) override
{
return true;
}
Code/Tools/GridHub/GridHub/gridhub.hxx
+11 -11
View File
@@ -57,8 +57,8 @@ public slots:
protected:
void SanityCheckDetectionTimeout();
void timerEvent(QTimerEvent *event);
void closeEvent(QCloseEvent *event);
void timerEvent(QTimerEvent *event) override;
void closeEvent(QCloseEvent *event) override;
void SystemTick();
private:
@@ -125,7 +125,7 @@ public:
/// Callback that is called when the Session service is ready to process sessions.
void OnSessionServiceReady() override {}
/// Callback that notifies the title when a game search query have completed.
void OnGridSearchComplete(GridMate::GridSearch* gridSearch) { (void)gridSearch; }
void OnGridSearchComplete(GridMate::GridSearch* gridSearch) override { (void)gridSearch; }
/// Callback that notifies the title when a new member joins the game session.
void OnMemberJoined(GridMate::GridSession* session, GridMate::GridMember* member) override;
/// Callback that notifies the title that a member is leaving the game session. member pointer is NOT valid after the callback returns.
@@ -133,25 +133,25 @@ public:
// \todo a better way will be (after we solve migration) is to supply a reason to OnMemberLeaving... like the member was kicked.
// this will require that we actually remove the replica at the same moment.
/// Callback that host decided to kick a member. You will receive a OnMemberLeaving when the actual member leaves the session.
void OnMemberKicked(GridMate::GridSession* session, GridMate::GridMember* member, AZ::u8 reason) { (void)session;(void)member;(void)reason; }
void OnMemberKicked(GridMate::GridSession* session, GridMate::GridMember* member, AZ::u8 reason) override { (void)session;(void)member;(void)reason; }
/// After this callback it is safe to access session features. If host session is fully operational if client wait for OnSessionJoined.
void OnSessionCreated(GridMate::GridSession* session) override;
/// Called on client machines to indicate that we join successfully.
void OnSessionJoined(GridMate::GridSession* session) { (void)session; }
void OnSessionJoined(GridMate::GridSession* session) override { (void)session; }
/// Callback that notifies the title when a session will be left. session pointer is NOT valid after the callback returns.
void OnSessionDelete(GridMate::GridSession* session) override;
/// Called when a session error occurs.
void OnSessionError(GridMate::GridSession* session, const AZStd::string& errorMsg ) { (void)session; (void)errorMsg; }
void OnSessionError(GridMate::GridSession* session, const AZStd::string& errorMsg ) override { (void)session; (void)errorMsg; }
/// Called when the actual game(match) starts
void OnSessionStart(GridMate::GridSession* session) { (void)session; }
void OnSessionStart(GridMate::GridSession* session) override { (void)session; }
/// Called when the actual game(match) ends
void OnSessionEnd(GridMate::GridSession* session) { (void)session; }
void OnSessionEnd(GridMate::GridSession* session) override { (void)session; }
/// Called when we start a host migration.
void OnMigrationStart(GridMate::GridSession* session) { (void)session; }
void OnMigrationStart(GridMate::GridSession* session) override { (void)session; }
/// Called so the user can select a member that should be the new Host. Value will be ignored if NULL, current host or the member has invalid connection id.
void OnMigrationElectHost(GridMate::GridSession* session,GridMate::GridMember*& newHost) { (void)session;(void)newHost; }
void OnMigrationElectHost(GridMate::GridSession* session,GridMate::GridMember*& newHost) override { (void)session;(void)newHost; }
/// Called when the host migration has completed.
void OnMigrationEnd(GridMate::GridSession* session,GridMate::GridMember* newHost) { (void)session;(void)newHost; }
void OnMigrationEnd(GridMate::GridSession* session,GridMate::GridMember* newHost) override { (void)session;(void)newHost; }
//////////////////////////////////////////////////////////////////////////
void SetUI(GridHub* ui) { m_ui = ui; }
Code/Tools/GridHub/GridHub/main.cpp
+2 -2
View File
@@ -140,7 +140,7 @@ protected:
* ComponentApplication::RegisterCoreComponents and then register the application
* specific core components.
*/
virtual void RegisterCoreComponents();
void RegisterCoreComponents() override;
/**
AZ::SystemTickBus::Handler
@@ -220,7 +220,7 @@ public:
}
//virtual bool QGridHubApplication::winEventFilter( MSG *msg , long *result)
virtual bool nativeEventFilter(const QByteArray &eventType, void *message, [[maybe_unused]] long *result)
bool nativeEventFilter(const QByteArray &eventType, void *message, [[maybe_unused]] long *result) override
{
#ifdef AZ_PLATFORM_WINDOWS
if ((eventType == "windows_generic_MSG")||(eventType == "windows_dispatcher_MSG"))
Code/Tools/RemoteConsole/Core/RemoteConsoleCore.h
+6 -6
View File
@@ -94,11 +94,11 @@ struct SNoDataEvent
{
SNoDataEvent()
: IRemoteEvent(T) {};
virtual IRemoteEvent* Clone() { return new SNoDataEvent<T>(); }
IRemoteEvent* Clone() override { return new SNoDataEvent<T>(); }
protected:
virtual void WriteToBuffer([[maybe_unused]] char* buffer, int& size, [[maybe_unused]] int maxsize) { size = 0; }
virtual IRemoteEvent* CreateFromBuffer([[maybe_unused]] const char* buffer, [[maybe_unused]] int size) { return Clone(); }
void WriteToBuffer([[maybe_unused]] char* buffer, int& size, [[maybe_unused]] int maxsize) override { size = 0; }
IRemoteEvent* CreateFromBuffer([[maybe_unused]] const char* buffer, [[maybe_unused]] int size) override { return Clone(); }
};
/////////////////////////////////////////////////////////////////////////////////////////////
@@ -109,17 +109,17 @@ struct SStringEvent
SStringEvent(const char* data)
: IRemoteEvent(T)
, m_data(data) {};
virtual IRemoteEvent* Clone() { return new SStringEvent<T>(GetData()); }
IRemoteEvent* Clone() override { return new SStringEvent<T>(GetData()); }
const char* GetData() const { return m_data.c_str(); }
protected:
virtual void WriteToBuffer(char* buffer, int& size, int maxsize)
void WriteToBuffer(char* buffer, int& size, int maxsize) override
{
const char* data = GetData();
size = min((int)strlen(data), maxsize);
memcpy(buffer, data, size);
}
virtual IRemoteEvent* CreateFromBuffer(const char* buffer, [[maybe_unused]] int size) { return new SStringEvent<T>(buffer); }
IRemoteEvent* CreateFromBuffer(const char* buffer, [[maybe_unused]] int size) override { return new SStringEvent<T>(buffer); }
private:
AZStd::string m_data;
Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneGraphTests.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ namespace AZ
BusDisconnect();
}
bool OnPreAssert(const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/)
bool OnPreAssert(const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/) override
{
m_assertTriggered = true;
return true;
Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.h
+1 -1
View File
@@ -38,7 +38,7 @@ namespace AZ
void OverrideId(const Uuid& id);
Containers::RuleContainer& GetRuleContainer() override;
const Containers::RuleContainer& GetRuleContainerConst() const;
const Containers::RuleContainer& GetRuleContainerConst() const override;
const AZStd::string& GetSelectedRootBone() const override;
uint32_t GetStartFrame() const override;
Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.h
+2 -2
View File
@@ -39,8 +39,8 @@ namespace AZ
const Uuid& GetId() const override;
void OverrideId(const Uuid& id);
Containers::RuleContainer& GetRuleContainer();
const Containers::RuleContainer& GetRuleContainerConst() const;
Containers::RuleContainer& GetRuleContainer() override;
const Containers::RuleContainer& GetRuleContainerConst() const override;
const AZStd::string& GetSelectedRootBone() const override;
void SetSelectedRootBone(const AZStd::string& selectedRootBone) override;
Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.h
+2 -2
View File
@@ -46,8 +46,8 @@ namespace AZ
const Uuid& GetId() const override;
void OverrideId(const Uuid& id);
Containers::RuleContainer& GetRuleContainer();
const Containers::RuleContainer& GetRuleContainerConst() const;
Containers::RuleContainer& GetRuleContainer() override;
const Containers::RuleContainer& GetRuleContainerConst() const override;
DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList() override;
const DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList() const override;
Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.h
+1 -1
View File
@@ -34,7 +34,7 @@ namespace AZ
QWidget* CreateGUI(QWidget* parent) override;
u32 GetHandlerName() const override;
bool AutoDelete() const;
bool AutoDelete() const override;
void ConsumeAttribute(ManifestNameWidget* widget, u32 attrib,
AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.h
+1 -1
View File
@@ -57,7 +57,7 @@ namespace AZ
QWidget* CreateGUI(QWidget* parent) override;
u32 GetHandlerName() const override;
bool AutoDelete() const;
bool AutoDelete() const override;
void ConsumeAttribute(NodeListSelectionWidget* widget, u32 attrib,
AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.h
+1 -1
View File
@@ -33,7 +33,7 @@ namespace AZ
QWidget* CreateGUI(QWidget* parent) override;
u32 GetHandlerName() const override;
bool AutoDelete() const;
bool AutoDelete() const override;
bool IsDefaultHandler() const override;
Code/Tools/SerializeContextTools/Converter.cpp
+2
View File
@@ -494,6 +494,7 @@ namespace AZ
return AZ::SettingsRegistryInterface::VisitResponse::Continue;
}
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view, [[maybe_unused]] AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override
{
if (m_processingSourcePathKey)
@@ -656,6 +657,7 @@ namespace AZ
return AZ::SettingsRegistryInterface::VisitResponse::Continue;
}
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view path, AZStd::string_view valueName, [[maybe_unused]] AZ::SettingsRegistryInterface::Type type,
AZStd::string_view value) override
{
Code/Tools/Standalone/Source/LUA/LUAEditorContext.h
+64 -64
View File
@@ -84,22 +84,22 @@ namespace LUAEditor
//////////////////////////////////////////////////////////////////////////
// AZ::Component
virtual void Init();
virtual void Activate();
virtual void Deactivate();
void Init() override;
void Activate() override;
void Deactivate() override;
//////////////////////////////////////////////////////////////////////////
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
//////////////////////////////////////////////////////////////////////////
// EditorFramework::CoreMessageBus::Handler
virtual void RunAsAnotherInstance();
void RunAsAnotherInstance() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// AzToolsFramework::AssetSystemInfoBus::Handler
virtual void AssetCompilationSuccess(const AZStd::string& assetPath) override;
virtual void AssetCompilationFailed(const AZStd::string& assetPath) override;
void AssetCompilationSuccess(const AZStd::string& assetPath) override;
void AssetCompilationFailed(const AZStd::string& assetPath) override;
//////////////////////////////////////////////////////////////////////////
@@ -111,110 +111,110 @@ namespace LUAEditor
//////////////////////////////////////////////////////////////////////////
// ContextInterface Messages
// it is an error to call GetDocumentData when the data is not yet ready.
virtual void ShowLUAEditorView();
void ShowLUAEditorView() override;
// this occurs from time to time, generally triggered when some external event occurs
// that makes it suspect that its document statuses might be invalid:
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
//Context_DocumentManagement Messages
virtual void OnNewDocument(const AZStd::string& assetId);
virtual void OnLoadDocument(const AZStd::string& assetId, bool errorOnNotFound);
virtual void OnCloseDocument(const AZStd::string& assetId);
virtual void OnSaveDocument(const AZStd::string& assetId, bool bCloseAfterSaved, bool bSaveAs);
virtual bool OnSaveDocumentAs(const AZStd::string& assetId, bool bCloseAfterSaved);
virtual void NotifyDocumentModified(const AZStd::string& assetId, bool modified);
virtual void DocumentCheckOutRequested(const AZStd::string& assetId);
virtual void RefreshAllDocumentPerforceStat();
virtual void OnReloadDocument(const AZStd::string assetId);
void OnNewDocument(const AZStd::string& assetId) override;
void OnLoadDocument(const AZStd::string& assetId, bool errorOnNotFound) override;
void OnCloseDocument(const AZStd::string& assetId) override;
void OnSaveDocument(const AZStd::string& assetId, bool bCloseAfterSaved, bool bSaveAs) override;
bool OnSaveDocumentAs(const AZStd::string& assetId, bool bCloseAfterSaved) override;
void NotifyDocumentModified(const AZStd::string& assetId, bool modified) override;
void DocumentCheckOutRequested(const AZStd::string& assetId) override;
void RefreshAllDocumentPerforceStat() override;
void OnReloadDocument(const AZStd::string assetId) override;
virtual void UpdateDocumentData(const AZStd::string& assetId, const char* dataPtr, const AZStd::size_t dataLength);
virtual void GetDocumentData(const AZStd::string& assetId, const char** dataPtr, AZStd::size_t& dataLength);
void UpdateDocumentData(const AZStd::string& assetId, const char* dataPtr, const AZStd::size_t dataLength) override;
void GetDocumentData(const AZStd::string& assetId, const char** dataPtr, AZStd::size_t& dataLength) override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// Target Manager
//////////////////////////////////////////////////////////////////////////
virtual void DesiredTargetConnected(bool connected);
virtual void DesiredTargetChanged(AZ::u32 newTargetID, AZ::u32 oldTargetID);
void DesiredTargetConnected(bool connected) override;
void DesiredTargetChanged(AZ::u32 newTargetID, AZ::u32 oldTargetID) override;
//////////////////////////////////////////////////////////////////////////
//Context_DebuggerManagement Messages
//////////////////////////////////////////////////////////////////////////
void ExecuteScriptBlob(const AZStd::string& fromAssetId, bool executeLocal);
virtual void SynchronizeBreakpoints();
virtual void CreateBreakpoint(const AZStd::string& fromAssetId, int lineNumber);
virtual void MoveBreakpoint(const AZ::Uuid& breakpointUID, int lineNumber);
virtual void DeleteBreakpoint(const AZ::Uuid& breakpointUID);
virtual void CleanUpBreakpoints();
void ExecuteScriptBlob(const AZStd::string& fromAssetId, bool executeLocal) override;
void SynchronizeBreakpoints() override;
void CreateBreakpoint(const AZStd::string& fromAssetId, int lineNumber) override;
void MoveBreakpoint(const AZ::Uuid& breakpointUID, int lineNumber) override;
void DeleteBreakpoint(const AZ::Uuid& breakpointUID) override;
void CleanUpBreakpoints() override;
// These come from the VM
virtual void OnDebuggerAttached();
virtual void OnDebuggerRefused();
virtual void OnDebuggerDetached();
virtual void OnBreakpointHit(const AZStd::string& assetIdString, int lineNumber);
virtual void OnBreakpointAdded(const AZStd::string& assetIdString, int lineNumber);
virtual void OnBreakpointRemoved(const AZStd::string& assetIdString, int lineNumber);
virtual void OnReceivedAvailableContexts(const AZStd::vector<AZStd::string>& contexts);
virtual void OnReceivedRegisteredClasses(const AzFramework::ScriptUserClassList& classes);
virtual void OnReceivedRegisteredEBuses(const AzFramework::ScriptUserEBusList& ebuses);
virtual void OnReceivedRegisteredGlobals(const AzFramework::ScriptUserMethodList& methods, const AzFramework::ScriptUserPropertyList& properties);
virtual void OnReceivedLocalVariables(const AZStd::vector<AZStd::string>& vars);
virtual void OnReceivedCallstack(const AZStd::vector<AZStd::string>& callstack);
virtual void OnReceivedValueState(const AZ::ScriptContextDebug::DebugValue& value);
virtual void OnSetValueResult(const AZStd::string& name, bool success);
virtual void OnExecutionResumed();
virtual void OnExecuteScriptResult(bool success);
void OnDebuggerAttached() override;
void OnDebuggerRefused() override;
void OnDebuggerDetached() override;
void OnBreakpointHit(const AZStd::string& assetIdString, int lineNumber) override;
void OnBreakpointAdded(const AZStd::string& assetIdString, int lineNumber) override;
void OnBreakpointRemoved(const AZStd::string& assetIdString, int lineNumber) override;
void OnReceivedAvailableContexts(const AZStd::vector<AZStd::string>& contexts) override;
void OnReceivedRegisteredClasses(const AzFramework::ScriptUserClassList& classes) override;
void OnReceivedRegisteredEBuses(const AzFramework::ScriptUserEBusList& ebuses) override;
void OnReceivedRegisteredGlobals(const AzFramework::ScriptUserMethodList& methods, const AzFramework::ScriptUserPropertyList& properties) override;
void OnReceivedLocalVariables(const AZStd::vector<AZStd::string>& vars) override;
void OnReceivedCallstack(const AZStd::vector<AZStd::string>& callstack) override;
void OnReceivedValueState(const AZ::ScriptContextDebug::DebugValue& value) override;
void OnSetValueResult(const AZStd::string& name, bool success) override;
void OnExecutionResumed() override;
void OnExecuteScriptResult(bool success) override;
//////////////////////////////////////////////////////////////////////////
//BreakpointTracker Messages
//////////////////////////////////////////////////////////////////////////
virtual const BreakpointMap* RequestBreakpoints();
virtual void RequestEditorFocus(const AZStd::string& assetIdString, int lineNumber);
virtual void RequestDeleteBreakpoint(const AZStd::string& assetIdString, int lineNumber);
const BreakpointMap* RequestBreakpoints() override;
void RequestEditorFocus(const AZStd::string& assetIdString, int lineNumber) override;
void RequestDeleteBreakpoint(const AZStd::string& assetIdString, int lineNumber) override;
//////////////////////////////////////////////////////////////////////////
//StackTracker Messages
//////////////////////////////////////////////////////////////////////////
virtual void RequestStackClicked(const AZStd::string& stackString, int lineNumber);
void RequestStackClicked(const AZStd::string& stackString, int lineNumber) override;
//////////////////////////////////////////////////////////////////////////
//TargetContextTracker Messages
//////////////////////////////////////////////////////////////////////////
virtual const AZStd::vector<AZStd::string> RequestTargetContexts();
virtual const AZStd::string RequestCurrentTargetContext();
virtual void SetCurrentTargetContext(AZStd::string& contextName);
virtual const AZStd::vector<AZStd::string> RequestTargetContexts() override;
const AZStd::string RequestCurrentTargetContext() override;
void SetCurrentTargetContext(AZStd::string& contextName) override;
//////////////////////////////////////////////////////////////////////////
//Watch window messages
//////////////////////////////////////////////////////////////////////////
virtual void RequestWatchedVariable(const AZStd::string& varName);
void RequestWatchedVariable(const AZStd::string& varName) override;
//////////////////////////////////////////////////////////////////////////
//Debug Request messages
//////////////////////////////////////////////////////////////////////////
virtual void RequestDetachDebugger();
virtual void RequestAttachDebugger();
void RequestDetachDebugger() override;
void RequestAttachDebugger() override;
//////////////////////////////////////////////////////////////////////////
// AzToolsFramework CoreMessages
virtual void OnRestoreState(); // sent when everything is registered up and ready to go, this is what bootstraps stuff to get going.
virtual bool OnGetPermissionToShutDown();
virtual bool CheckOkayToShutDown();
virtual void OnSaveState(); // sent to everything when the app is about to shut down - do what you need to do.
virtual void OnDestroyState();
virtual void ApplicationDeactivated();
virtual void ApplicationActivated();
virtual void ApplicationShow(AZ::Uuid id);
virtual void ApplicationHide(AZ::Uuid id);
virtual void ApplicationCensus();
void OnRestoreState() override; // sent when everything is registered up and ready to go, this is what bootstraps stuff to get going.
bool OnGetPermissionToShutDown() override;
bool CheckOkayToShutDown() override;
void OnSaveState() override; // sent to everything when the app is about to shut down - do what you need to do.
void OnDestroyState() override;
void ApplicationDeactivated() override;
void ApplicationActivated() override;
void ApplicationShow(AZ::Uuid id) override;
void ApplicationHide(AZ::Uuid id) override;
void ApplicationCensus() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// HighlightedWords
virtual const HighlightedWords::LUAKeywordsType* GetLUAKeywords() { return &m_LUAKeywords; }
virtual const HighlightedWords::LUAKeywordsType* GetLUALibraryFunctions() { return &m_LUALibraryFunctions; }
const HighlightedWords::LUAKeywordsType* GetLUAKeywords() override { return &m_LUAKeywords; }
const HighlightedWords::LUAKeywordsType* GetLUALibraryFunctions() override { return &m_LUALibraryFunctions; }
// internal data structure for the LUA debugger class/member/property reference panel
// this is what we serialize and work with
Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.hxx
+18 -18
View File
@@ -86,14 +86,14 @@ namespace LUAEditor
public:
AZ_CLASS_ALLOCATOR(LUAEditorMainWindow,AZ::SystemAllocator,0);
LUAEditorMainWindow(QStandardItemModel* dataModel, bool connectedState, QWidget* parent = NULL, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~LUAEditorMainWindow(void);
virtual ~LUAEditorMainWindow();
bool OnGetPermissionToShutDown();
//////////////////////////////////////////////////////////////////////////
// Qt Events
private:
virtual void closeEvent(QCloseEvent* event);
void closeEvent(QCloseEvent* event) override;
Ui::LUAEditorMainWindow* m_gui;
AzToolsFramework::TargetSelectorButtonAction* m_pTargetButton;
@@ -204,7 +204,7 @@ namespace LUAEditor
AZStd::string m_lastOpenFilePath;
AZStd::vector<FindResultsBlockInfo> m_dProcessFindListClicked;
void OnDataLoadedAndSet(const DocumentInfo& info, LUAViewWidget* pLUAViewWidget);
void OnDataLoadedAndSet(const DocumentInfo& info, LUAViewWidget* pLUAViewWidget) override;
AzToolsFramework::AssetBrowser::AssetBrowserFilterModel* m_filterModel;
QSharedPointer<AzToolsFramework::AssetBrowser::CompositeFilter> CreateFilter();
@@ -243,18 +243,18 @@ namespace LUAEditor
// LUAEditorMainWindow Messages.
public:
virtual void OnCloseView(const AZStd::string& assetId);
virtual void OnFocusInEvent(const AZStd::string& assetId);
virtual void OnFocusOutEvent(const AZStd::string& assetId);
virtual void OnRequestCheckOut(const AZStd::string& assetId);
virtual void OnConnectedToTarget();
virtual void OnDisconnectedFromTarget();
virtual void OnConnectedToDebugger();
virtual void OnDisconnectedFromDebugger();
void OnFocusInEvent(const AZStd::string& assetId) override;
void OnFocusOutEvent(const AZStd::string& assetId) override;
void OnRequestCheckOut(const AZStd::string& assetId) override;
void OnConnectedToTarget() override;
void OnDisconnectedFromTarget() override;
void OnConnectedToDebugger() override;
void OnDisconnectedFromDebugger() override;
void Repaint() override;
//////////////////////////////////////////////////////////////////////////
virtual void dragEnterEvent(QDragEnterEvent *pEvent);
virtual void dropEvent(QDropEvent *pEvent);
void dragEnterEvent(QDragEnterEvent *pEvent) override;
void dropEvent(QDropEvent *pEvent) override;
void IgnoreFocusEvents(bool ignore) { m_bIgnoreFocusRequests = ignore; }
@@ -327,7 +327,7 @@ namespace LUAEditor
// support for windows-ish Ctrl+Tab cycling through documents via the above Tab actions
typedef AZStd::list<AZStd::string> TrackedLUACtrlTabOrder;
TrackedLUACtrlTabOrder m_CtrlTabOrder;
bool eventFilter(QObject *obj, QEvent *event);
bool eventFilter(QObject *obj, QEvent *event) override;
AZStd::string m_StoredTabAssetId;
bool m_bIgnoreFocusRequests;
@@ -338,10 +338,10 @@ namespace LUAEditor
//////////////////////////////////////////////////////////////////////////
//Debugger Messages, from the LUAEditor::LUABreakpointTrackerMessages::Bus
virtual void BreakpointsUpdate(const LUAEditor::BreakpointMap& uniqueBreakpoints);
virtual void BreakpointHit(const LUAEditor::Breakpoint& breakpoint);
virtual void BreakpointResume();
virtual void OnExecuteScriptResult(bool success);
void BreakpointsUpdate(const LUAEditor::BreakpointMap& uniqueBreakpoints) override;
void BreakpointHit(const LUAEditor::Breakpoint& breakpoint) override;
void BreakpointResume() override;
void OnExecuteScriptResult(bool success) override;
//////////////////////////////////////////////////////////////////////////
// track activity and synchronize the appropriate widgets' states to match
@@ -433,7 +433,7 @@ namespace LUAEditor
bool m_bAutoReloadUnmodifiedFiles = false;
LUAEditorMainWindowSavedState() {}
void Init(const QByteArray& windowState,const QByteArray& windowGeom)
void Init(const QByteArray& windowState,const QByteArray& windowGeom) override
{
AzToolsFramework::MainWindowSavedState::Init(windowState, windowGeom);
}
Code/Tools/Standalone/Source/LUA/LUAEditorView.hxx
+5 -5
View File
@@ -73,7 +73,7 @@ namespace LUAEditor
LUADockWidget* luaDockWidget(){ return m_pLUADockWidget;}
void SetLuaDockWidget(LUADockWidget* pLUADockWidget){m_pLUADockWidget = pLUADockWidget;}
virtual void dropEvent(QDropEvent *e);
void dropEvent(QDropEvent *e) override;
// point a little arrow at this line. -1 means remove it.
void UpdateCurrentExecutingLine(int lineNumber);
@@ -83,9 +83,9 @@ namespace LUAEditor
//////////////////////////////////////////////////////////////////////////
//Debugger Messages, from the LUAEditor::LUABreakpointTrackerMessages::Bus
virtual void BreakpointsUpdate(const LUAEditor::BreakpointMap& uniqueBreakpoints);
virtual void BreakpointHit(const LUAEditor::Breakpoint& breakpoint);
virtual void BreakpointResume();
void BreakpointsUpdate(const LUAEditor::BreakpointMap& uniqueBreakpoints) override;
void BreakpointHit(const LUAEditor::Breakpoint& breakpoint) override;
void BreakpointResume() override;
void BreakpointToggle(int line);
@@ -153,7 +153,7 @@ namespace LUAEditor
void RegainFocus();
private:
virtual void keyPressEvent(QKeyEvent *ev);
void keyPressEvent(QKeyEvent *ev) override;
int CalcDocPosition(int line, int column);
template<typename Callable> //callabe must take a const QTextCursor& as a parameter
void UpdateCursor(Callable callable);
Code/Tools/Standalone/Source/StandaloneToolsApplication.h
+1 -1
View File
@@ -42,7 +42,7 @@ namespace StandaloneTools
bool LaunchDiscoveryService();
// AZ::UserSettingsFileLocatorBus::Handler
AZStd::string ResolveFilePath(AZ::u32 /*providerId*/);
AZStd::string ResolveFilePath(AZ::u32 /*providerId*/) override;
//////////////////////////////////////////////////////////////////////////
};
}
Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.h
+2 -2
View File
@@ -26,8 +26,8 @@ namespace Telemetry
//////////////////
// AZ::Component
void Activate();
void Deactivate();
void Activate() override;
void Deactivate() override;
static void Reflect(AZ::ReflectContext* context);
//////////////////