diff options
Diffstat (limited to 'src/designer/src/lib/shared/qdesigner_toolbar.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/qdesigner_toolbar.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp index 28c2ca285..08723c2ff 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -124,7 +124,7 @@ ActionList ToolBarEventFilter::contextMenuActions(const QPoint &globalPos) { ActionList rc; const int index = actionIndexAt(m_toolBar, m_toolBar->mapFromGlobal(globalPos), m_toolBar->orientation()); - const ActionList actions = m_toolBar->actions(); + const auto actions = m_toolBar->actions(); QAction *action = index != -1 ?actions.at(index) : 0; QVariant itemData; @@ -138,7 +138,7 @@ ActionList ToolBarEventFilter::contextMenuActions(const QPoint &globalPos) } // Append separator - if (actions.empty() || !actions.back()->isSeparator()) { + if (actions.isEmpty() || !actions.constLast()->isSeparator()) { QAction *newSeperatorAct = new QAction(tr("Append Separator"), nullptr); itemData.setValue(static_cast<QAction*>(nullptr)); newSeperatorAct->setData(itemData); @@ -448,7 +448,8 @@ QRect ToolBarEventFilter::freeArea(const QToolBar *tb) { QRect rc = QRect(QPoint(0, 0), tb->size()); const ActionList actionList = tb->actions(); - QRect exclusionRectangle = actionList.empty() ? handleArea(tb) : tb->actionGeometry(actionList.back()); + QRect exclusionRectangle = actionList.isEmpty() + ? handleArea(tb) : tb->actionGeometry(actionList.constLast()); switch (tb->orientation()) { case Qt::Horizontal: switch (tb->layoutDirection()) { |