X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fruler.hpp;h=c8cb0e5f66fc364e7ab1f1acd8bd58b623fc0d9b;hb=53bb2e1de75f5cca9244efc83c4e77a222e322f4;hp=cf63eaff7c7cb27ae0b2ec451801bda05b23677d;hpb=3ccf0f7f5b1b31ac628a983a2becee6f4c4c1507;p=pulseview.git
diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index cf63eaf..c8cb0e5 100644
--- 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 .
*/
-#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
#include
@@ -30,13 +29,14 @@
#include
namespace RulerTest {
-class tick_position_test_0;
-class tick_position_test_1;
-class tick_position_test_2;
+struct tick_position_test_0;
+struct tick_position_test_1;
+struct tick_position_test_2;
}
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class TimeItem;
class ViewItem;
@@ -45,9 +45,9 @@ class Ruler : public MarginWidget
{
Q_OBJECT
- friend class RulerTest::tick_position_test_0;
- friend class RulerTest::tick_position_test_1;
- friend class RulerTest::tick_position_test_2;
+ friend struct RulerTest::tick_position_test_0;
+ friend struct RulerTest::tick_position_test_1;
+ friend struct RulerTest::tick_position_test_2;
private:
@@ -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 > items();
+ std::vector< std::shared_ptr > 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 get_mouse_over_item(
- const QPoint &pt);
+ std::shared_ptr 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