X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitem.hpp;h=d1dd67ccfc7bcbb2ca464f432a770025e1af3af9;hb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b;hp=8317db7b7454b040384f1b4933a3e6deb0f21b9a;hpb=4ca23e7d62d75523710fe4117f904ded4d26544a;p=pulseview.git
diff --git a/pv/view/tracetreeitem.hpp b/pv/view/tracetreeitem.hpp
index 8317db7..d1dd67c 100644
--- a/pv/view/tracetreeitem.hpp
+++ b/pv/view/tracetreeitem.hpp
@@ -14,12 +14,11 @@
* 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_TRACETREEITEM_HPP
-#define PULSEVIEW_PV_VIEW_TRACETREEITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
#include
@@ -27,13 +26,17 @@
#include "rowitem.hpp"
+using std::enable_shared_from_this;
+using std::pair;
+
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class TraceTreeItemOwner;
class TraceTreeItem : public RowItem,
- public std::enable_shared_from_this
+ public enable_shared_from_this
{
Q_OBJECT
Q_PROPERTY(int visual_v_offset
@@ -91,7 +94,7 @@ public:
* Sets the owner this trace in the view trace hierachy.
* @param The new owner of the trace.
*/
- void set_owner(pv::view::TraceTreeItemOwner *owner);
+ void set_owner(TraceTreeItemOwner *owner);
/**
* Gets the visual y-offset of the axis.
@@ -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.
*/
- virtual std::pair v_extents() const = 0;
+ virtual pair v_extents() const = 0;
protected:
TraceTreeItemOwner *owner_;
@@ -136,7 +139,8 @@ private:
QPropertyAnimation v_offset_animation_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACETREEITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP