From 5f46ec7a6288888aa0d5026ff444e78b6a40219d Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Sun, 17 May 2020 13:56:12 +0200
Subject: [PATCH] Fix a compiler warning

---
 pv/binding/inputoutput.cpp | 2 +-
 pv/devices/inputfile.cpp   | 2 +-
 pv/mainwindow.cpp          | 2 ++
 pv/views/trace/view.cpp    | 2 ++
 pv/widgets/exportmenu.cpp  | 2 +-
 pv/widgets/importmenu.cpp  | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp
index f9a061c7..9ba387fb 100644
--- a/pv/binding/inputoutput.cpp
+++ b/pv/binding/inputoutput.cpp
@@ -59,7 +59,7 @@ namespace binding {
 InputOutput::InputOutput(
 	const map<string, shared_ptr<Option>> &options)
 {
-	for (const pair<string, shared_ptr<Option>>& o : options) {
+	for (const pair<const string, shared_ptr<Option>>& o : options) {
 		const shared_ptr<Option> &opt = o.second;
 		assert(opt);
 
diff --git a/pv/devices/inputfile.cpp b/pv/devices/inputfile.cpp
index 94fb9c82..9cc99f4e 100644
--- a/pv/devices/inputfile.cpp
+++ b/pv/devices/inputfile.cpp
@@ -101,7 +101,7 @@ void InputFile::save_meta_to_settings(QSettings &settings)
 	settings.setValue("options", (int)options_.size());
 
 	int i = 0;
-	for (const pair<string, Glib::VariantBase>& option : options_) {
+	for (const pair<const string, Glib::VariantBase>& option : options_) {
 		settings.beginGroup("option" + QString::number(i));
 		settings.setValue("name", QString::fromStdString(option.first));
 		GlobalSettings::store_variantbase(settings, option.second);
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 4c98b490..3889d480 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -881,6 +881,8 @@ void MainWindow::on_show_decoder_selector(Session *session)
 	for (shared_ptr<Session>& s : sessions_)
 		if (s.get() == session)
 			add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s);
+#else
+	(void)session;
 #endif
 }
 
diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index a470715b..ee4a4042 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -54,6 +54,7 @@
 #include "pv/metadata_obj.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
+#include "pv/data/signalbase.hpp"
 #include "pv/devices/device.hpp"
 #include "pv/globalsettings.hpp"
 #include "pv/session.hpp"
@@ -63,6 +64,7 @@
 #include "decodetrace.hpp"
 #endif
 
+using pv::data::SignalBase;
 using pv::data::SignalData;
 using pv::data::Segment;
 using pv::util::TimeUnit;
diff --git a/pv/widgets/exportmenu.cpp b/pv/widgets/exportmenu.cpp
index f5189d12..721affe0 100644
--- a/pv/widgets/exportmenu.cpp
+++ b/pv/widgets/exportmenu.cpp
@@ -63,7 +63,7 @@ ExportMenu::ExportMenu(QWidget *parent, shared_ptr<Context> context,
 	const map<string, shared_ptr<OutputFormat> > formats =
 		context->output_formats();
 
-	for (const pair<string, shared_ptr<OutputFormat> > &f : formats) {
+	for (const pair<const string, shared_ptr<OutputFormat> > &f : formats) {
 		if (f.first == "srzip")
 			continue;
 
diff --git a/pv/widgets/importmenu.cpp b/pv/widgets/importmenu.cpp
index f827d35b..b63256cb 100644
--- a/pv/widgets/importmenu.cpp
+++ b/pv/widgets/importmenu.cpp
@@ -63,7 +63,7 @@ ImportMenu::ImportMenu(QWidget *parent, shared_ptr<Context> context,
 	const map<string, shared_ptr<InputFormat> > formats =
 		context->input_formats();
 
-	for (const pair<string, shared_ptr<InputFormat> > &f : formats) {
+	for (const pair<const string, shared_ptr<InputFormat> > &f : formats) {
 		assert(f.second);
 		QAction *const action =	addAction(tr("Import %1...")
 			.arg(QString::fromStdString(f.second->description())));