Remove Header::BaselineOffset and move arrows as needed instead

[pulseview.git] / pv / view / header.hpp

diff --git a/pv/view/header.hpp b/pv/view/header.hpp
index 6756681624a4f6aaf2abf423c529098b44ba7423..6a4c9a39521863e9aac6e111d08b21b0ebcdbf5e 100644 (file)
--- a/pv/view/header.hpp
+++ b/pv/view/header.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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_HEADER_H
-#define PULSEVIEW_PV_VIEW_HEADER_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
 
 #include <list>
 #include <memory>
@@ -27,10 +26,14 @@
 
 #include "marginwidget.hpp"
 
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
-class RowItem;
+class TraceTreeItem;
 class View;
 class ViewItem;
 
@@ -53,17 +56,11 @@ public:
         */
        QSize extended_size_hint() const;
 
-       /**
-        * The horizontal offset, relative to the left edge of the widget,
-        * where the arrows of the trace labels end.
-        */
-       static const int BaselineOffset;
-
 private:
        /**
         * Gets the row items.
         */
-       std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+       vector< shared_ptr<ViewItem> > items();
 
        /**
         * Gets the first view item which has a label that contains @c pt .
@@ -71,14 +68,7 @@ private:
         * @return the view item that has been found, or and empty
         *   @c shared_ptr if no item was found.
         */
-       std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-               const QPoint &pt);
-
-       /**
-        * Drag the dragging items by the delta offset.
-        * @param delta the drag offset in pixels.
-        */
-       void drag_items(const QPoint &delta);
+       shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt);
 
 private:
        void paintEvent(QPaintEvent *event);
@@ -86,20 +76,16 @@ private:
 private:
        void contextMenuEvent(QContextMenuEvent *event);
 
-       void keyPressEvent(QKeyEvent *e);
+       void keyPressEvent(QKeyEvent *event);
 
 private Q_SLOTS:
-       void on_signals_moved();
-
        void on_group();
 
        void on_ungroup();
-
-Q_SIGNALS:
-       void signals_moved();
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_HEADER_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP