X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fexportmenu.cpp;h=f5189d129fe02ad422750bb68233c18f38ca0f34;hb=999869aa676f7077b7181355eee28e9b025d4cea;hp=13c977d50cda7cedc8f72dd19f9e2599ca2cc56f;hpb=6f925ba9d6faf1077b73c5a5808259576081716a;p=pulseview.git diff --git a/pv/widgets/exportmenu.cpp b/pv/widgets/exportmenu.cpp index 13c977d5..f5189d12 100644 --- a/pv/widgets/exportmenu.cpp +++ b/pv/widgets/exportmenu.cpp @@ -70,7 +70,7 @@ ExportMenu::ExportMenu(QWidget *parent, shared_ptr context, 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())); } @@ -95,5 +95,5 @@ void ExportMenu::on_action(QObject *action) format_selected((*iter).second); } -} // widgets -} // pv +} // namespace widgets +} // namespace pv