Session: Fix issue #67 by improving error handling

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

diff --git a/pv/widgets/exportmenu.cpp b/pv/widgets/exportmenu.cpp
index ff82b6aa2b13e206fba69e94dc5cf9fca3a4ed76..bda669288f3731b9f3706fd9603de490eaee25a6 100644 (file)
--- a/pv/widgets/exportmenu.cpp
+++ b/pv/widgets/exportmenu.cpp
@@ -63,20 +63,25 @@ 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()));
        }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+       connect(&mapper_, SIGNAL(mappedObject(QObject*)),
+               this, SLOT(on_action(QObject*)));
+#else
        connect(&mapper_, SIGNAL(mapped(QObject*)),
                this, SLOT(on_action(QObject*)));
+#endif
 }
 
 void ExportMenu::on_action(QObject *action)