electron
/
pulseview
mirror of git://sigrok.org/pulseview
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a compiler warning

This commit is contained in:
Soeren Apel 2020-05-17 13:56:12 +02:00 committed by Uwe Hermann
parent 1e948182f3
commit 5f46ec7a62
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pv/binding/inputoutput.cpp
View File

@ -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);

2
pv/devices/inputfile.cpp
View File

@ -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);

2
pv/mainwindow.cpp
View File

@ -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
}

2
pv/views/trace/view.cpp
View File

@ -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;

2
pv/widgets/exportmenu.cpp
View File

@ -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;

2
pv/widgets/importmenu.cpp
View File

@ -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())));