Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / views / trace / signal.hpp

diff --git a/pv/views/trace/signal.hpp b/pv/views/trace/signal.hpp
index c9f38dd96107657d7e16fd6fb05b71a16488dfa2..e10e93eac4d2863d200c530fbcb7ff4a07e72b7d 100644 (file)
--- a/pv/views/trace/signal.hpp
+++ b/pv/views/trace/signal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
 
 #include <memory>
 
@@ -62,7 +62,7 @@ class Signal : public Trace, public ViewItemOwner
        Q_OBJECT
 
 protected:
-       Signal(pv::Session &session, shared_ptr<data::SignalBase> channel);
+       Signal(pv::Session &session, shared_ptr<data::SignalBase> signal);
 
 public:
        /**
@@ -70,8 +70,6 @@ public:
         */
        virtual void set_name(QString name);
 
-       virtual shared_ptr<pv::data::SignalData> data() const = 0;
-
        /**
         * Determines the closest level change (i.e. edge) to a given sample, which
         * is useful for e.g. the "snap to edge" functionality.
@@ -119,4 +117,4 @@ protected:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP