X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=861eac0f6065e7f4ef93c7e14039173dd9ad0235;hp=6a9c01af731180378de18a45c9c3e2affe34286d;hb=5c48ce328b0b049d0ddc1b137f20118c9084c929;hpb=d0c0573b3ee694827a747727f862c5f91736ca05

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 6a9c01af..861eac0f 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -79,7 +79,6 @@ using std::make_pair;
 using std::make_shared;
 using std::min;
 using std::pair;
-using std::placeholders::_1;
 using std::set;
 using std::set_difference;
 using std::shared_ptr;
@@ -197,7 +196,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 
 	// Set up settings and event handlers
 	GlobalSettings settings;
-	coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+	colored_bg_ = settings.value(GlobalSettings::Key_View_ColoredBG).toBool();
 
 	GlobalSettings::add_change_handler(this);
 
@@ -562,8 +561,10 @@ void View::set_current_segment(uint32_t segment_id)
 
 	for (shared_ptr<Signal> signal : signals_)
 		signal->set_current_segment(current_segment_);
+#ifdef ENABLE_DECODE
 	for (shared_ptr<DecodeTrace> dt : decode_traces_)
 		dt->set_current_segment(current_segment_);
+#endif
 
 	vector<util::Timestamp> triggers = session_.get_triggers(current_segment_);
 
@@ -773,15 +774,15 @@ void View::enable_show_analog_minor_grid(bool state)
 	viewport_->update();
 }
 
-void View::enable_coloured_bg(bool state)
+void View::enable_colored_bg(bool state)
 {
-	coloured_bg_ = state;
+	colored_bg_ = state;
 	viewport_->update();
 }
 
-bool View::coloured_bg() const
+bool View::colored_bg() const
 {
-	return coloured_bg_;
+	return colored_bg_;
 }
 
 bool View::cursors_shown() const
@@ -951,7 +952,7 @@ void View::calculate_tick_spacing()
 				(ScaleUnits[unit++] + tp_margin);
 		} while (tp_with_margin < min_period && unit < countof(ScaleUnits));
 
-		minor_tick_count_ = (unit == 2) ? (4) : (5);
+		minor_tick_count_ = (unit == 2) ? 4 : 5;
 		tick_period = order_decimal * ScaleUnits[unit - 1];
 		tick_prefix = static_cast<pv::util::SIPrefix>(
 			(order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3);