projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement LogicSegment::get_surrounding_edges() and use it
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 0e58fbae8163842b0a80a267158a8466ef6d8715..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>
@@
-57,7
+56,7
@@
class MainWindow;
class Session;
namespace views {
class Session;
namespace views {
-namespace
TraceView
{
+namespace
trace
{
class View;
}
}
class View;
}
}
@@
-87,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();
@@
-101,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();