Mercurial > octave

comparison libgui/graphics/ToolBarButton.cc @ 31647:431f80aba37a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 15:37:43 -0500
parents ca7d58406f82 c6d54dd31a7e
children deb553ac2c54
comparison
equal deleted inserted replaced
31645:bd9da634f00d 31647:431f80aba37a
34 34
35 #include "ToolBarButton.h" 35 #include "ToolBarButton.h"
36 #include "QtHandlesUtils.h" 36 #include "QtHandlesUtils.h"
37 #include "gui-preferences-global.h" 37 #include "gui-preferences-global.h"
38 38
39 namespace octave 39 OCTAVE_BEGIN_NAMESPACE(octave)
40 { 40
41 template <typename T> 41 template <typename T>
42 ToolBarButton<T>::ToolBarButton (octave::interpreter& interp, 42 ToolBarButton<T>::ToolBarButton (octave::interpreter& interp,
43 const graphics_object& go, QAction *action) 43 const graphics_object& go, QAction *action)
44 : Object (interp, go, action), m_separator (nullptr) 44 : Object (interp, go, action), m_separator (nullptr)
45 { 45 {
156 QIcon ToolBarButton<T>::get_icon (const std::string& name) 156 QIcon ToolBarButton<T>::get_icon (const std::string& name)
157 { 157 {
158 return QIcon (global_icon_paths.at (ICON_THEME_OCTAVE) + QString::fromStdString (name) + ".png"); 158 return QIcon (global_icon_paths.at (ICON_THEME_OCTAVE) + QString::fromStdString (name) + ".png");
159 } 159 }
160 160
161 } 161 OCTAVE_END_NAMESPACE(octave)