X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewitemowner.hpp;h=dcec370f3fcd18afabfceba48dbc49dbe9fd10a5;hb=303eec78f3c499cd30fc88b282aa1f336e82a806;hp=60c8507626eaae243b12aba2b05c409609512be1;hpb=c373f82810ad9c5376a7370118de9dd587ee0e43;p=pulseview.git
diff --git a/pv/view/viewitemowner.hpp b/pv/view/viewitemowner.hpp
index 60c8507..dcec370 100644
--- a/pv/view/viewitemowner.hpp
+++ b/pv/view/viewitemowner.hpp
@@ -14,23 +14,27 @@
* 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_VIEWITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEW_VIEWITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
#include
#include
#include "viewitemiterator.hpp"
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::vector;
+
namespace pv {
class Session;
-namespace view {
+namespace views {
+namespace TraceView {
class ViewItem;
class View;
@@ -38,16 +42,11 @@ class View;
class ViewItemOwner
{
public:
- typedef std::vector< std::shared_ptr > item_list;
+ typedef vector< shared_ptr > item_list;
typedef ViewItemIterator iterator;
typedef ViewItemIterator 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.
*/
@@ -77,13 +76,13 @@ public:
const_iterator end() const;
/**
- * Creates a list of decendant signals filtered by type.
+ * Creates a list of descendant signals filtered by type.
*/
template
- std::vector< std::shared_ptr > list_by_type() {
- std::vector< std::shared_ptr > items;
+ vector< shared_ptr > list_by_type() {
+ vector< shared_ptr > items;
for (const auto &r : *this) {
- std::shared_ptr p = std::dynamic_pointer_cast(r);
+ shared_ptr p = dynamic_pointer_cast(r);
if (p)
items.push_back(p);
}
@@ -95,7 +94,8 @@ protected:
item_list items_;
};
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_VIEWITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP