projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced NULL with nullptr
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 35ccf0655d10b4e37699f87d47d9f308cb007822..a6b2c89831ab60ab6796297918bce86eb3277430 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-78,7
+78,7
@@
private:
public:
explicit MainWindow(DeviceManager &device_manager,
public:
explicit MainWindow(DeviceManager &device_manager,
- const char *open_file_name =
NULL
,
+ const char *open_file_name =
nullptr
,
QWidget *parent = 0);
QAction* action_open() const;
QWidget *parent = 0);
QAction* action_open() const;
@@
-102,6
+102,7
@@
public:
public Q_SLOTS:
void export_file(std::shared_ptr<sigrok::OutputFormat> format);
public Q_SLOTS:
void export_file(std::shared_ptr<sigrok::OutputFormat> format);
+ void import_file(std::shared_ptr<sigrok::InputFormat> format);
private:
void setup_ui();
private:
void setup_ui();