projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 0242dc9da0ec73f184902b9570c40af6716aaf7c..0e58fbae8163842b0a80a267158a8466ef6d8715 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-39,13
+39,15
@@
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
+using std::shared_ptr;
+
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
-Q_DECLARE_METATYPE(s
td::s
hared_ptr<sigrok::Device>)
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Device>)
class QAction;
class QAction;
@@
-126,9
+128,9
@@
private Q_SLOTS:
void add_decoder(srd_decoder *decoder);
void add_decoder(srd_decoder *decoder);
- void export_file(s
td::s
hared_ptr<sigrok::OutputFormat> format,
+ void export_file(shared_ptr<sigrok::OutputFormat> format,
bool selection_only = false);
bool selection_only = false);
- void import_file(s
td::s
hared_ptr<sigrok::InputFormat> format);
+ void import_file(shared_ptr<sigrok::InputFormat> format);
void on_device_selected();
void on_device_changed();
void on_device_selected();
void on_device_changed();