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 Qt-defined keywords, they can cause problems with other headers.
[pulseview.git]
/
pv
/
device
/
devinst.h
diff --git
a/pv/device/devinst.h
b/pv/device/devinst.h
index e6a5140989dcea0a58ec8ace4a40bae4714eba3a..4f0b6dec3137fedf5f679b4b015f27cacee02703 100644
(file)
--- a/
pv/device/devinst.h
+++ b/
pv/device/devinst.h
@@
-21,10
+21,9
@@
#ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
#define PULSEVIEW_PV_DEVICE_DEVINST_H
#ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
#define PULSEVIEW_PV_DEVICE_DEVINST_H
+#include <memory>
#include <string>
#include <string>
-#include <boost/shared_ptr.hpp>
-
#include <QObject>
#include <glib.h>
#include <QObject>
#include <glib.h>
@@
-35,9
+34,9
@@
struct sr_dev_inst;
struct sr_channel;
struct sr_channel_group;
struct sr_channel;
struct sr_channel_group;
-namespace pv {
+#include <pv/sigsession.h>
-class SigSession;
+namespace pv {
namespace device {
namespace device {
@@
-82,7
+81,7
@@
public:
virtual void run();
virtual void run();
-
signals
:
+
Q_SIGNALS
:
void config_changed();
protected:
void config_changed();
protected: