diff --git a/GUI/Views/InstrumentView.cpp b/GUI/Views/InstrumentView.cpp index e79d904cc35a1705f432df97961e9bfb00745b69..a91d0b0c767c1043a16d50eb16403470512d36a2 100644 --- a/GUI/Views/InstrumentView.cpp +++ b/GUI/Views/InstrumentView.cpp @@ -33,8 +33,7 @@ InstrumentView::InstrumentView(MainWindow* mainWindow) StyledToolBar* toolbar = new StyledToolBar(this); toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - for (QAction* action : m_instrumentSelector->toolbarActions()) - toolbar->addAction(action); + toolbar->addActions(m_instrumentSelector->toolbarActions()); auto mainLayout = new QVBoxLayout; mainLayout->setMargin(0); diff --git a/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp index 256fa90e226f99795b82f861cc6d86f2331ef0b9..9faf6d462258bf0171ec747a0f6fa77569d448b1 100644 --- a/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp +++ b/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp @@ -100,7 +100,7 @@ QSize InstrumentSelectorWidget::minimumSizeHint() const return QSize(96, 200); } -std::vector<QAction*> InstrumentSelectorWidget::toolbarActions() const +QList<QAction*> InstrumentSelectorWidget::toolbarActions() const { return { m_action_new_gisas, m_action_new_offspecular, m_action_new_specular, m_action_new_depthprobe, m_action_separator, m_action_remove, m_action_copy }; diff --git a/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h b/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h index 02ca6244d342b39fee91788db0b06e18f7b827e6..4749d12cd11b200dfeab7208fc2fb5cf27b38e7c 100644 --- a/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h +++ b/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h @@ -31,7 +31,7 @@ public: QSize sizeHint() const; QSize minimumSizeHint() const; - std::vector<QAction*> toolbarActions() const; + QList<QAction*> toolbarActions() const; private slots: void onContextMenuRequest(const QPoint& point);