projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INSTALL: Bump libsigrokdecode requirement to >= 0.6.0.
[pulseview.git]
/
pv
/
widgets
/
importmenu.hpp
diff --git
a/pv/widgets/importmenu.hpp
b/pv/widgets/importmenu.hpp
index cb33af9808d36733a337b0f12e3e55e62967f141..c70962a4a781c4fef7fed32857bfce4a6787a749 100644
(file)
--- a/
pv/widgets/importmenu.hpp
+++ b/
pv/widgets/importmenu.hpp
@@
-26,6
+26,7
@@
#include <QSignalMapper>
using std::shared_ptr;
#include <QSignalMapper>
using std::shared_ptr;
+using std::vector;
namespace sigrok {
class Context;
namespace sigrok {
class Context;
@@
-41,7
+42,7
@@
class ImportMenu : public QMenu
public:
ImportMenu(QWidget *parent, shared_ptr<sigrok::Context> context,
public:
ImportMenu(QWidget *parent, shared_ptr<sigrok::Context> context,
-
QAction *open_action = nullptr
);
+
vector<QAction *>open_actions = vector<QAction *>()
);
private Q_SLOTS:
void on_action(QObject *action);
private Q_SLOTS:
void on_action(QObject *action);
@@
-54,7
+55,7
@@
private:
QSignalMapper mapper_;
};
QSignalMapper mapper_;
};
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv
#endif // PULSEVIEW_PV_WIDGETS_IMPORTMENU_HPP
#endif // PULSEVIEW_PV_WIDGETS_IMPORTMENU_HPP