projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change namespace for the trace view and implement ViewBase
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index 397ec7c0d108380719d13313114eb6d9553dafd8..9f0ecd44c2a54ca82706775887db0e453792c6fa 100644
(file)
--- a/
pv/view/trace.hpp
+++ b/
pv/view/trace.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP
#include <QColor>
#include <QPainter>
#include <QColor>
#include <QPainter>
@@
-41,7
+41,8
@@
namespace widgets {
class Popup;
}
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Trace : public TraceTreeItem
{
class Trace : public TraceTreeItem
{
@@
-127,7
+128,7
@@
private Q_SLOTS:
void on_colouredit_changed(const QColor &colour);
protected:
void on_colouredit_changed(const QColor &colour);
protected:
- std::shared_ptr<data::SignalBase>
channel
_;
+ std::shared_ptr<data::SignalBase>
base
_;
bool coloured_bg_, coloured_bg_state_;
private:
bool coloured_bg_, coloured_bg_state_;
private:
@@
-135,7
+136,8
@@
private:
QFormLayout *popup_form_;
};
QFormLayout *popup_form_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP