X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=56651169afee06f96813d2625475e0d717add254;hb=0f1f98fe5b6ccc7add3cedc035b0df5d8e5431eb;hp=3cc2eb173404e0213c87d6161c198f2b00ad94c1;hpb=abad24e2d61c0c84ac8495c22d29a8a3a49ee9fa;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 3cc2eb17..56651169 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ruler.h"
+#include "ruler.hpp"
 
-#include "view.h"
-#include "pv/util.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <extdef.h>
 
@@ -41,7 +41,7 @@ Ruler::Ruler(View &parent) :
 {
 	setMouseTracking(true);
 
-	connect(&_view, SIGNAL(hover_point_changed()),
+	connect(&view_, SIGNAL(hover_point_changed()),
 		this, SLOT(hover_point_changed()));
 }
 
@@ -58,7 +58,7 @@ void Ruler::paintEvent(QPaintEvent*)
 	p.setRenderHint(QPainter::Antialiasing);
 
 	std::pair<double, unsigned int> spacing =
-		calculate_tick_spacing(p, _view.scale(), _view.offset());
+		calculate_tick_spacing(p, view_.scale(), view_.offset());
 
 	double tick_period = spacing.first;
 	unsigned int prefix = spacing.second;
@@ -71,9 +71,9 @@ void Ruler::paintEvent(QPaintEvent*)
 
 	const double minor_tick_period = tick_period / MinorTickSubdivision;
 	const double first_major_division =
-		floor(_view.offset() / tick_period);
+		floor(view_.offset() / tick_period);
 	const double first_minor_division =
-		ceil(_view.offset() / minor_tick_period);
+		ceil(view_.offset() / minor_tick_period);
 	const double t0 = first_major_division * tick_period;
 
 	int division = (int)round(first_minor_division -
@@ -87,7 +87,7 @@ void Ruler::paintEvent(QPaintEvent*)
 
 	do {
 		const double t = t0 + division * minor_tick_period;
-		x = (t - _view.offset()) / _view.scale();
+		x = (t - view_.offset()) / view_.scale();
 
 		if (division % MinorTickSubdivision == 0)
 		{
@@ -115,7 +115,7 @@ void Ruler::paintEvent(QPaintEvent*)
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
-	const int x = _view.hover_point().x();
+	const int x = view_.hover_point().x();
 
 	if (x == -1)
 		return;