projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #849 by making sure no references to the DecodeTrace instance remain
[pulseview.git]
/
pv
/
view
/
viewitemowner.hpp
diff --git
a/pv/view/viewitemowner.hpp
b/pv/view/viewitemowner.hpp
index 60c8507626eaae243b12aba2b05c409609512be1..d31df80ec7263caafe4b388a979849091c3fc719 100644
(file)
--- a/
pv/view/viewitemowner.hpp
+++ b/
pv/view/viewitemowner.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_VIEWITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEW_VIEWITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_VIEWITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_VIEWITEMOWNER_HPP
#include <memory>
#include <vector>
#include <memory>
#include <vector>
@@
-30,7
+30,8
@@
namespace pv {
class Session;
class Session;
-namespace view {
+namespace views {
+namespace TraceView {
class ViewItem;
class View;
class ViewItem;
class View;
@@
-43,11
+44,6
@@
public:
typedef ViewItemIterator<const ViewItemOwner, ViewItem> const_iterator;
public:
typedef ViewItemIterator<const ViewItemOwner, ViewItem> const_iterator;
public:
- /**
- * Returns a list of row items owned by this object.
- */
- virtual item_list& child_items() = 0;
-
/**
* Returns a list of row items owned by this object.
*/
/**
* Returns a list of row items owned by this object.
*/
@@
-77,7
+73,7
@@
public:
const_iterator end() const;
/**
const_iterator end() const;
/**
- * Creates a list of decendant signals filtered by type.
+ * Creates a list of de
s
cendant signals filtered by type.
*/
template<class T>
std::vector< std::shared_ptr<T> > list_by_type() {
*/
template<class T>
std::vector< std::shared_ptr<T> > list_by_type() {
@@
-95,7
+91,8
@@
protected:
item_list items_;
};
item_list items_;
};
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_VIEWITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_VIEWITEMOWNER_HPP