feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Aspects: Fix ValueAcceptor handling

Browse Source 
Previously returning std::nullopt from a StringAspect::ValueAcceptor
would not cancel the change.

Change-Id: I7a329f9fe32f6d798c10102a0b68dcd638fb2398
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-02-06 11:30:04 +01:00
parent b6a6480084
commit d5c5e612d1
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/aspects.cpp
View File

@@ -1305,6 +1305,7 @@ bool StringAspect::bufferToInternal()
if (d->m_valueAcceptor) { if (d->m_valueAcceptor) {
if (const std::optional<QString> tmp = d->m_valueAcceptor(m_internal, m_buffer)) if (const std::optional<QString> tmp = d->m_valueAcceptor(m_internal, m_buffer))
return updateStorage(m_internal, *tmp); return updateStorage(m_internal, *tmp);
return false;
} }
return updateStorage(m_internal, m_buffer); return updateStorage(m_internal, m_buffer);
} }
@@ -1489,6 +1490,7 @@ bool FilePathAspect::bufferToInternal()
if (d->m_valueAcceptor) { if (d->m_valueAcceptor) {
if (const std::optional<QString> tmp = d->m_valueAcceptor(m_internal, m_buffer)) if (const std::optional<QString> tmp = d->m_valueAcceptor(m_internal, m_buffer))
return updateStorage(m_internal, *tmp); return updateStorage(m_internal, *tmp);
return false;
} }
return updateStorage(m_internal, m_buffer); return updateStorage(m_internal, m_buffer);
} }