TraceView: Restore vertical offset

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

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index 90556a08526f04fd021a4591b915c07d43c1cf73..c8cb0e5f66fc364e7ab1f1acd8bd58b623fc0d9b 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.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_RULER_HPP
-#define PULSEVIEW_PV_VIEW_RULER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
 
 #include <functional>
 #include <memory>
@@ -36,7 +35,8 @@ struct tick_position_test_2;
 }
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class TimeItem;
 class ViewItem;
@@ -63,14 +63,14 @@ public:
        Ruler(View &parent);
 
 public:
-       QSize sizeHint() const;
+       QSize sizeHint() const override;
 
        /**
         * The extended area that the header widget would like to be sized to.
         * @remarks This area is the area specified by sizeHint, extended by
         * the area to overlap the viewport.
         */
-       QSize extended_size_hint() const;
+       QSize extended_size_hint() const override;
 
        /**
         * Formats a timestamp depending on its distance to another timestamp.
@@ -109,7 +109,7 @@ private:
        /**
         * Gets the time items.
         */
-       std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+       std::vector< std::shared_ptr<ViewItem> > items() override;
 
        /**
         * Gets the first view item which has a label that contains @c pt .
@@ -117,12 +117,12 @@ 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);
+       std::shared_ptr<ViewItem> get_mouse_over_item(
+               const QPoint &pt) override;
 
-       void paintEvent(QPaintEvent *event);
+       void paintEvent(QPaintEvent *event) override;
 
-       void mouseDoubleClickEvent(QMouseEvent *e);
+       void mouseDoubleClickEvent(QMouseEvent *event) override;
 
        /**
         * Draw a hover arrow under the cursor position.
@@ -174,7 +174,8 @@ private Q_SLOTS:
        void invalidate_tick_position_cache();
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_RULER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP