X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.hpp;h=1efd8737c9c938fb568bdf0948a8b9f5c0bc62d8;hb=80067e4944e111bfa8d6b399812dddaa29d5a4ab;hp=cf63eaff7c7cb27ae0b2ec451801bda05b23677d;hpb=3ccf0f7f5b1b31ac628a983a2becee6f4c4c1507;p=pulseview.git
diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index cf63eaf..1efd873 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
@@ -29,14 +28,20 @@
#include "marginwidget.hpp"
#include
+using std::function;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
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,12 +50,11 @@ 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:
-
/// Height of the ruler in multipes of the text height
static const float RulerHeight;
@@ -63,14 +67,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 +113,7 @@ private:
/**
* Gets the time items.
*/
- std::vector< std::shared_ptr > items();
+ vector< shared_ptr > items() override;
/**
* Gets the first view item which has a label that contains @c pt .
@@ -117,12 +121,11 @@ 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);
+ 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.
@@ -135,8 +138,8 @@ private:
struct TickPositions
{
- std::vector> major;
- std::vector minor;
+ vector> major;
+ vector minor;
};
/**
@@ -162,7 +165,7 @@ private:
const pv::util::Timestamp& offset,
const double scale,
const int width,
- std::function format_function);
+ function format_function);
protected:
void resizeEvent(QResizeEvent*) override;
@@ -174,7 +177,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