X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fsignal.hpp;h=40ba52ea59ada1e232a08a6bfe95f4432c347d94;hb=0bd39c0c6fcf31063fca364bfdb23d3d40914ba1;hp=5bac1f44d83c821a5dd107d3818bad53ceeef167;hpb=3a21afa6a5dfc06c17f127960bb0038fd322f213;p=pulseview.git
diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index 5bac1f4..40ba52e 100644
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -14,24 +14,25 @@
* 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 .
*/
-#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
#include
#include
-#include
+#include
#include "signalscalehandle.hpp"
#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 channel);
+ Signal(pv::Session &session, shared_ptr channel);
public:
/**
@@ -57,14 +58,14 @@ public:
*/
virtual void set_name(QString name);
- virtual std::shared_ptr data() const = 0;
+ virtual shared_ptr data() const = 0;
/**
* Returns true if the trace is visible and enabled.
*/
bool enabled() const;
- std::shared_ptr base() const;
+ shared_ptr base() const;
virtual void save_settings(QSettings &settings) const;
@@ -75,7 +76,7 @@ public:
*/
const item_list& child_items() const;
- void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+ void paint_back(QPainter &p, ViewItemPaintParams &pp);
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -109,13 +110,14 @@ protected Q_SLOTS:
protected:
pv::Session &session_;
- const std::shared_ptr scale_handle_;
+ const shared_ptr 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