projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #958 by using new method that auto-converts analog samples
[pulseview.git]
/
pv
/
view
/
viewitemowner.hpp
diff --git
a/pv/view/viewitemowner.hpp
b/pv/view/viewitemowner.hpp
index 60c8507626eaae243b12aba2b05c409609512be1..dcec370f3fcd18afabfceba48dbc49dbe9fd10a5 100644
(file)
--- 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
* 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_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 "viewitemiterator.hpp"
#include <memory>
#include <vector>
#include "viewitemiterator.hpp"
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::vector;
+
namespace pv {
class Session;
namespace pv {
class Session;
-namespace view {
+namespace views {
+namespace TraceView {
class ViewItem;
class View;
class ViewItem;
class View;
@@
-38,16
+42,11
@@
class View;
class ViewItemOwner
{
public:
class ViewItemOwner
{
public:
- typedef
std::vector< std::
shared_ptr<ViewItem> > item_list;
+ typedef
vector<
shared_ptr<ViewItem> > item_list;
typedef ViewItemIterator<ViewItemOwner, ViewItem> iterator;
typedef ViewItemIterator<const ViewItemOwner, ViewItem> const_iterator;
public:
typedef ViewItemIterator<ViewItemOwner, ViewItem> iterator;
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,13
+76,13
@@
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>
*/
template<class T>
-
std::vector< std::
shared_ptr<T> > list_by_type() {
-
std::vector< std::
shared_ptr<T> > items;
+
vector<
shared_ptr<T> > list_by_type() {
+
vector<
shared_ptr<T> > items;
for (const auto &r : *this) {
for (const auto &r : *this) {
- s
td::shared_ptr<T> p = std::
dynamic_pointer_cast<T>(r);
+ s
hared_ptr<T> p =
dynamic_pointer_cast<T>(r);
if (p)
items.push_back(p);
}
if (p)
items.push_back(p);
}
@@
-95,7
+94,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