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

BinEditor: Check some optional values

Browse Source 
and use the non-throwing operator*

Change-Id: Idddddf65ddea7fc269c672fced3d57ee55b0ded4
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2024-09-04 16:12:28 +02:00
parent e3fd418a6a
commit 2898d63915
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -1262,8 +1262,11 @@ void BinEditorWidget::mousePressEvent(QMouseEvent *e)
{ {
if (e->button() != Qt::LeftButton) if (e->button() != Qt::LeftButton)
return; return;
const std::optional<qint64> pos = posAt(e->pos());
if (!pos)
return;
MoveMode moveMode = e->modifiers() & Qt::ShiftModifier ? KeepAnchor : MoveAnchor; MoveMode moveMode = e->modifiers() & Qt::ShiftModifier ? KeepAnchor : MoveAnchor;
setCursorPosition(posAt(e->pos()).value(), moveMode); setCursorPosition(*pos, moveMode);
setBlinkingCursorEnabled(true); setBlinkingCursorEnabled(true);
if (m_hexCursor == inTextArea(e->pos())) { if (m_hexCursor == inTextArea(e->pos())) {
m_hexCursor = !m_hexCursor; m_hexCursor = !m_hexCursor;
@@ -1275,7 +1278,10 @@ void BinEditorWidget::mouseMoveEvent(QMouseEvent *e)
{ {
if (!(e->buttons() & Qt::LeftButton)) if (!(e->buttons() & Qt::LeftButton))
return; return;
setCursorPosition(posAt(e->pos()).value(), KeepAnchor); const std::optional<qint64> pos = posAt(e->pos());
if (!pos)
return;
setCursorPosition(*pos, KeepAnchor);
if (m_hexCursor == inTextArea(e->pos())) { if (m_hexCursor == inTextArea(e->pos())) {
m_hexCursor = !m_hexCursor; m_hexCursor = !m_hexCursor;
updateLines(); updateLines();
@@ -1397,7 +1403,7 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const
std::optional<qint64> pos = posAt(helpEvent->pos(), /*includeEmptyArea*/false); std::optional<qint64> pos = posAt(helpEvent->pos(), /*includeEmptyArea*/false);
if (!pos) if (!pos)
return QString(); return QString();
selStart = pos.value(); selStart = *pos;
byteCount = 1; byteCount = 1;
} }