Don't use std:: in the code directly (where possible).

[pulseview.git] / pv / view / signal.hpp

diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index 36d87d4594d0a6def78eb2f29daeb1c42408ace4..82d3b51fc4a5209610ca43dbd88069da6b258131 100644 (file)
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
 
 #include <memory>
 
@@ -32,6 +31,8 @@
 #include "trace.hpp"
 #include "viewitemowner.hpp"
 
+using std::shared_ptr;
+
 namespace pv {
 
 class Session;
@@ -41,15 +42,15 @@ class SignalBase;
 class SignalData;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Signal : public Trace, public ViewItemOwner
 {
        Q_OBJECT
 
 protected:
-       Signal(pv::Session &session,
-               std::shared_ptr<data::SignalBase> channel);
+       Signal(pv::Session &session, shared_ptr<data::SignalBase> channel);
 
 public:
        /**
@@ -57,16 +58,18 @@ public:
         */
        virtual void set_name(QString name);
 
-       virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
+       virtual shared_ptr<pv::data::SignalData> data() const = 0;
 
        /**
         * Returns true if the trace is visible and enabled.
         */
        bool enabled() const;
 
-       void enable(bool enable = true);
+       shared_ptr<data::SignalBase> base() const;
+
+       virtual void save_settings(QSettings &settings) const;
 
-       std::shared_ptr<data::SignalBase> channel() const;
+       virtual void restore_settings(QSettings &settings);
 
        /**
         * Returns a list of row items owned by this object.
@@ -102,16 +105,19 @@ protected Q_SLOTS:
 
        void on_disable();
 
+       void on_enabled_changed(bool enabled);
+
 protected:
        pv::Session &session_;
 
-       const std::shared_ptr<SignalScaleHandle> scale_handle_;
+       const shared_ptr<SignalScaleHandle> scale_handle_;
        const item_list items_;
 
        QComboBox *name_widget_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP