X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=f82175107adc998f8cfce5288c9e468b1fd54ab1;hb=f46e495ef1db0a4e522462ac18260f2151fa2b89;hp=c3bc1dff0a4981170e86b748fe8f45c1a7206b33;hpb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;p=pulseview.git

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index c3bc1df..f821751 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -303,8 +303,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	}
 	else
 	{
-		list< shared_ptr<Decoder> >::const_iterator iter =
-			stack.begin();
+		auto iter = stack.cbegin();
 		for (int i = 0; i < (int)stack.size(); i++, iter++) {
 			shared_ptr<Decoder> dec(*iter);
 			create_decoder_form(i, dec, parent, form);
@@ -373,7 +372,7 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
 {
 	const QString text = a.annotations().empty() ?
 		QString() : a.annotations().back();
-	const double w = min(p.boundingRect(QRectF(), 0, text).width(),
+	const double w = min((double)p.boundingRect(QRectF(), 0, text).width(),
 		0.0) + h;
 	const QRectF rect(x - w / 2, y - h / 2, w, h);
 
@@ -592,9 +591,7 @@ QComboBox* DecodeTrace::create_probe_selector(
 	const vector< shared_ptr<Signal> > sigs = _session.get_signals();
 
 	assert(_decoder_stack);
-	const map<const srd_channel*,
-		shared_ptr<LogicSignal> >::const_iterator probe_iter =
-		dec->channels().find(pdch);
+	const auto probe_iter = dec->channels().find(pdch);
 
 	QComboBox *selector = new QComboBox(parent);
 
@@ -705,7 +702,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
 	const list< shared_ptr<Decoder> > stack(_decoder_stack->stack());
 
 	// Find the decoder in the stack
-	list< shared_ptr<Decoder> >::const_iterator iter = stack.begin();
+	auto iter = stack.cbegin();
 	for(int i = 0; i < index; i++, iter++)
 		assert(iter != stack.end());