X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.hpp;h=b00d5bf5a06faf3ed131ecc2805f3ce13ee07736;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hp=4f631d0da23927bca35b836f244155f4b01c8774;hpb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;p=pulseview.git
diff --git a/pv/view/tracegroup.hpp b/pv/view/tracegroup.hpp
index 4f631d0..b00d5bf 100644
--- a/pv/view/tracegroup.hpp
+++ b/pv/view/tracegroup.hpp
@@ -14,20 +14,22 @@
* 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_TRACEGROUP_H
-#define PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
-#include "rowitem.hpp"
-#include "rowitemowner.hpp"
+#include "tracetreeitem.hpp"
+#include "tracetreeitemowner.hpp"
+
+using std::pair;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-class TraceGroup : public RowItem, public RowItemOwner
+class TraceGroup : public TraceTreeItem, public TraceTreeItemOwner
{
Q_OBJECT
@@ -61,18 +63,18 @@ public:
/**
* Returns the view of the owner.
*/
- virtual pv::view::View* view();
+ virtual View* view();
/**
* Returns the view of the owner.
*/
- virtual const pv::view::View* view() const;
+ virtual const View* view() const;
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
- std::pair v_extents() const;
+ pair v_extents() const;
/**
* Paints the signal label.
@@ -119,7 +121,7 @@ public:
void ungroup();
public:
- void appearance_changed(bool label, bool content);
+ void row_item_appearance_changed(bool label, bool content);
void extents_changed(bool horz, bool vert);
@@ -127,7 +129,8 @@ private Q_SLOTS:
void on_ungroup();
};
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP