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

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
This commit is contained in:
Esteban Papp
2021-08-06 10:08:37 -07:00
parent 03cf71b12d 9e0b8c564d
commit 6db7488939
252 changed files with 2886 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/TrackViewNodes.cpp
+8 -8
View File
@@ -69,7 +69,7 @@ public:
: QStyledItemDelegate(parent)
{}
void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override
{
bool enabled = index.data(CTrackViewNodesCtrl::CRecord::EnableRole).toBool();
QStyleOptionViewItem opt = option;
@@ -106,7 +106,7 @@ protected:
return Qt::CopyAction | Qt::MoveAction;
}
void dragMoveEvent(QDragMoveEvent* event)
void dragMoveEvent(QDragMoveEvent* event) override
{
CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
if (!record)
@@ -144,7 +144,7 @@ protected:
}
}
void dropEvent(QDropEvent* event)
void dropEvent(QDropEvent* event) override
{
CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
if (!record)
@@ -200,7 +200,7 @@ protected:
}
}
void keyPressEvent(QKeyEvent* event)
void keyPressEvent(QKeyEvent* event) override
{
// HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
switch (event->key())
@@ -242,7 +242,7 @@ protected:
}
bool focusNextPrevChild([[maybe_unused]] bool next)
bool focusNextPrevChild([[maybe_unused]] bool next) override
{
return false; // so we get the tab key
}
@@ -361,7 +361,7 @@ CTrackViewNodesCtrl::CTrackViewNodesCtrl(QWidget* hParentWnd, CTrackViewDialog*
, m_pTrackViewDialog(parent)
{
ui->setupUi(this);
m_pDopeSheet = 0;
m_pDopeSheet = nullptr;
m_currentMatchIndex = 0;
m_matchCount = 0;
@@ -954,7 +954,7 @@ void CTrackViewNodesCtrl::OnSelectionChanged()
//////////////////////////////////////////////////////////////////////////
void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
{
CRecord* record = 0;
CRecord* record = nullptr;
bool isOnAzEntity = false;
CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
if (!sequence)
@@ -1605,7 +1605,7 @@ CTrackViewTrack* CTrackViewNodesCtrl::GetTrackViewTrack(const Export::EntityAnim
}
}
return 0;
return nullptr;
}
//////////////////////////////////////////////////////////////////////////