projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: Fix notification message
[pulseview.git]
/
pv
/
views
/
viewbase.hpp
diff --git
a/pv/views/viewbase.hpp
b/pv/views/viewbase.hpp
index 3e180830f897574de522b460cf775f43a264361e..45aae7f1021f7797e0dc11cf5e53484a81d80f7e 100644
(file)
--- a/
pv/views/viewbase.hpp
+++ b/
pv/views/viewbase.hpp
@@
-21,8
+21,7
@@
#ifndef PULSEVIEW_PV_VIEWS_VIEWBASE_HPP
#define PULSEVIEW_PV_VIEWS_VIEWBASE_HPP
#ifndef PULSEVIEW_PV_VIEWS_VIEWBASE_HPP
#define PULSEVIEW_PV_VIEWS_VIEWBASE_HPP
-#include <stdint.h>
-
+#include <cstdint>
#include <memory>
#include <set>
#include <vector>
#include <memory>
#include <set>
#include <vector>
@@
-32,6
+31,8
@@
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
+using std::shared_ptr;
+
namespace pv {
class Session;
namespace pv {
class Session;
@@
-48,11
+49,12
@@
enum ViewType {
ViewTypeTabularDecode
};
ViewTypeTabularDecode
};
-class ViewBase : public QWidget {
+class ViewBase : public QWidget
+{
Q_OBJECT
public:
Q_OBJECT
public:
- explicit ViewBase(Session &session, bool is_main_view
=false, QWidget *parent = 0
);
+ explicit ViewBase(Session &session, bool is_main_view
= false, QWidget *parent = nullptr
);
Session& session();
const Session& session() const;
Session& session();
const Session& session() const;
@@
-62,9
+64,9
@@
public:
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
- virtual void add_decode_signal(s
td::s
hared_ptr<data::SignalBase> signalbase);
+ virtual void add_decode_signal(shared_ptr<data::SignalBase> signalbase);
- virtual void remove_decode_signal(s
td::s
hared_ptr<data::SignalBase> signalbase);
+ virtual void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
#endif
virtual void save_settings(QSettings &settings) const;
#endif
virtual void save_settings(QSettings &settings) const;