projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual: link from decoder troubleshooting to sigrok FAQ item
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 0242dc9da0ec73f184902b9570c40af6716aaf7c..e938dbbc01d1dc4c877be7bb7e42b07a460fd5f1 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-20,8
+20,7
@@
#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
-#include <stdint.h>
-
+#include <cstdint>
#include <list>
#include <memory>
#include <list>
#include <memory>
@@
-39,13
+38,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;
@@
-55,7
+56,7
@@
class MainWindow;
class Session;
namespace views {
class Session;
namespace views {
-namespace
TraceView
{
+namespace
trace
{
class View;
}
}
class View;
}
}
@@
-85,7
+86,7
@@
private:
public:
MainBar(Session &session, QWidget *parent,
public:
MainBar(Session &session, QWidget *parent,
- pv::views::
TraceView
::View *view);
+ pv::views::
trace
::View *view);
void update_device_list();
void update_device_list();
@@
-99,8
+100,6
@@
public:
QAction* action_save_selection_as() const;
QAction* action_connect() const;
QAction* action_save_selection_as() const;
QAction* action_connect() const;
- void session_error(const QString text, const QString info_text);
-
private:
void run_stop();
private:
void run_stop();
@@
-126,9
+125,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();