X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=29929a9dde63d1b1bbc4520885d28cc3e719370e;hp=40fce89fdb7660bce2b276e1dd4bcac2f27148d7;hb=491536836d878a3abf7959800f56641ac093bd11;hpb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 40fce89f..29929a9d 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGSESSION_H
-#define SIGSESSION_H
+#ifndef PULSEVIEW_PV_SIGSESSION_H
+#define PULSEVIEW_PV_SIGSESSION_H
 
 #include <boost/shared_ptr.hpp>
 
@@ -36,7 +36,10 @@ namespace pv {
 
 class LogicData;
 class LogicDataSnapshot;
+
+namespace view {
 class Signal;
+}
 
 class SigSession : public QObject
 {
@@ -52,7 +55,7 @@ public:
 	void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
 		uint64_t sample_rate);
 
-	std::vector< boost::shared_ptr<Signal> >&
+	std::vector< boost::shared_ptr<view::Signal> >&
 		get_signals();
 
 	boost::shared_ptr<LogicData> get_data();
@@ -65,7 +68,7 @@ private:
 		struct sr_datafeed_packet *packet);
 
 private:
-	std::vector< boost::shared_ptr<Signal> > _signals;
+	std::vector< boost::shared_ptr<view::Signal> > _signals;
 	boost::shared_ptr<LogicData> _logic_data;
 	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
 
@@ -81,4 +84,4 @@ private:
 
 } // namespace pv
 
-#endif // SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_H