From: Soeren Apel <redacted>
Date: Thu, 12 Jan 2017 21:59:31 +0000 (+0100)
Subject: TraceView: Fix variable name
X-Git-Tag: pulseview-0.4.0~209
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=e62bee7326a4b04c0e914a3fa9e39d1e808821dd;hp=39ab01e794a0c13cfc012e90dd17eaebc234fb38;ds=sidebyside

TraceView: Fix variable name
---

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6549e51b..b5d7beb7 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -155,7 +155,7 @@ View::View(Session &session, QWidget *parent) :
 	next_flag_text_('A'),
 	trigger_markers_(),
 	hover_point_(-1, -1),
-	scroll_needs_defaults(false),
+	scroll_needs_defaults_(false),
 	saved_v_offset_(0)
 {
 	connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -324,7 +324,7 @@ void View::restore_settings(QSettings &settings)
 	if (settings.contains("v_offset")) {
 		saved_v_offset_ = settings.value("v_offset").toInt();
 		set_v_offset(saved_v_offset_);
-		scroll_needs_defaults = false;
+		scroll_needs_defaults_ = false;
 		// Note: see resizeEvent() for additional information
 	}
 }
@@ -811,7 +811,7 @@ void View::update_scroll()
 		vscrollbar->setRange(extents.first - areaSize.height(),
 			extents.second);
 
-	if (scroll_needs_defaults)
+	if (scroll_needs_defaults_)
 		set_scroll_default();
 }
 
@@ -829,10 +829,10 @@ void View::set_scroll_default()
 	// Special case: when starting up and the window isn't visible yet,
 	// areaSize is [0, 0]. In this case we want to be called again later
 	if (areaSize.height() == 0) {
-		scroll_needs_defaults = true;
+		scroll_needs_defaults_ = true;
 		return;
 	} else {
-		scroll_needs_defaults = false;
+		scroll_needs_defaults_ = false;
 	}
 
 	const pair<int, int> extents = v_extents();
diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 379c2435..42cbe3c2 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -423,7 +423,7 @@ private:
 	QTimer lazy_event_handler_;
 
 	// This is true when the defaults couldn't be set due to insufficient info
-	bool scroll_needs_defaults;
+	bool scroll_needs_defaults_;
 
 	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
 	int saved_v_offset_;