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

Fix clang 13 compilation problems (#5791)

Browse Source 
* Fix clang 13 compilation problems

Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* apply review suggestions

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix type in assert message

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-11-25 10:24:39 +01:00
committed by GitHub
parent 0883921eb3
commit eca2e36687
48 changed files with 180 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp
-2
View File
@@ -169,11 +169,9 @@ namespace AudioControls
if (parent.isValid())
{
bool bChildValid = false;
bool bHasChildren = false;
QModelIndex child = parent.model()->index(0, 0, parent);
for (int i = 1; child.isValid(); ++i)
{
bHasChildren = true;
if (ApplyFilter(child))
{
bChildValid = true;
Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
+1 -23
View File
@@ -27,9 +27,9 @@ namespace AudioControls
//-------------------------------------------------------------------------------------------//
QConnectionsWidget::QConnectionsWidget(QWidget* parent)
: QWidget(parent)
, m_control(nullptr)
, m_notFoundColor(QColor(0xf3, 0x81, 0x1d))
, m_localizedColor(QColor(0x42, 0x85, 0xf4))
, m_control(nullptr)
{
setupUi(this);
@@ -37,7 +37,6 @@ namespace AudioControls
m_connectionList->installEventFilter(this);
connect(m_connectionList, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(ShowConnectionContextMenu(const QPoint&)));
connect(m_connectionList, SIGNAL(itemSelectionChanged()), this, SLOT(SelectedConnectionChanged()));
}
//-------------------------------------------------------------------------------------------//
@@ -101,27 +100,6 @@ namespace AudioControls
contextMenu.exec(m_connectionList->mapToGlobal(pos));
}
//-------------------------------------------------------------------------------------------//
void QConnectionsWidget::SelectedConnectionChanged()
{
TConnectionPtr connection;
EACEControlType controlType = AudioControls::eACET_NUM_TYPES;
if (m_control)
{
QList<QListWidgetItem*> selected = m_connectionList->selectedItems();
if (selected.length() == 1)
{
QListWidgetItem* currentItem = selected[0];
if (currentItem)
{
const CID externalId = currentItem->data(eMDR_ID).toInt();
connection = m_control->GetConnection(externalId);
controlType = m_control->GetType();
}
}
}
}
//-------------------------------------------------------------------------------------------//
void QConnectionsWidget::MakeConnectionTo(IAudioSystemControl* middlewareControl)
{
Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h
-1
View File
@@ -38,7 +38,6 @@ namespace AudioControls
private slots:
void ShowConnectionContextMenu(const QPoint& pos);
void SelectedConnectionChanged();
void CurrentConnectionModified();
void RemoveSelectedConnection();
Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
-11
View File
@@ -343,17 +343,6 @@ namespace Audio
{
if (CVars::s_debugDrawOptions.AreAllFlagsActive(DebugDraw::Options::FileCacheInfo))
{
EATLDataScope dataScope = eADS_ALL;
if (CVars::s_fcmDrawOptions.AreAllFlagsActive(FileCacheManagerDebugDraw::Options::Global))
{
dataScope = eADS_GLOBAL;
}
else if (CVars::s_fcmDrawOptions.AreAllFlagsActive(FileCacheManagerDebugDraw::Options::LevelSpecific))
{
dataScope = eADS_LEVEL_SPECIFIC;
}
const auto frameTime = AZStd::chrono::system_clock::now();
const float entryDrawSize = 1.5f;