Fix a few #include guard inconsistencies.

[pulseview.git] / pv / widgets / exportmenu.cpp

diff --git a/pv/widgets/exportmenu.cpp b/pv/widgets/exportmenu.cpp
index ff82b6aa2b13e206fba69e94dc5cf9fca3a4ed76..721affe058e9a359579b8caabf43485ffb99625b 100644 (file)
--- a/pv/widgets/exportmenu.cpp
+++ b/pv/widgets/exportmenu.cpp
@@ -63,14 +63,14 @@ 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;
 
                assert(f.second);
                QAction *const action = addAction(tr("Export %1...")
                        .arg(QString::fromStdString(f.second->description())));
-               action->setData(qVariantFromValue((void*)f.second.get()));
+               action->setData(QVariant::fromValue((void*)f.second.get()));
                mapper_.setMapping(action, action);
                connect(action, SIGNAL(triggered()), &mapper_, SLOT(map()));
        }