projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce PV-internal channel types
[pulseview.git]
/
pv
/
view
/
tracetreeitem.hpp
diff --git
a/pv/view/tracetreeitem.hpp
b/pv/view/tracetreeitem.hpp
index cc329121ffcebdf842348c1903ad2b3e190b5f8e..d1dd67ccfc7bcbb2ca464f432a770025e1af3af9 100644
(file)
--- a/
pv/view/tracetreeitem.hpp
+++ b/
pv/view/tracetreeitem.hpp
@@
-26,6
+26,9
@@
#include "rowitem.hpp"
#include "rowitem.hpp"
+using std::enable_shared_from_this;
+using std::pair;
+
namespace pv {
namespace views {
namespace TraceView {
namespace pv {
namespace views {
namespace TraceView {
@@
-33,7
+36,7
@@
namespace TraceView {
class TraceTreeItemOwner;
class TraceTreeItem : public RowItem,
class TraceTreeItemOwner;
class TraceTreeItem : public RowItem,
- public
std::
enable_shared_from_this<TraceTreeItem>
+ public enable_shared_from_this<TraceTreeItem>
{
Q_OBJECT
Q_PROPERTY(int visual_v_offset
{
Q_OBJECT
Q_PROPERTY(int visual_v_offset
@@
-122,7
+125,7
@@
public:
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
- virtual
std::
pair<int, int> v_extents() const = 0;
+ virtual pair<int, int> v_extents() const = 0;
protected:
TraceTreeItemOwner *owner_;
protected:
TraceTreeItemOwner *owner_;