X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fexportmenu.cpp;h=bda669288f3731b9f3706fd9603de490eaee25a6;hb=1ed73ebd60336c7b12ee1807644dca719cb9835b;hp=e9fb4150765e76e05eeb049f117aba089e82cba5;hpb=686d9151feb1c917b85ddb60bf73888e8058e4f4;p=pulseview.git
diff --git a/pv/widgets/exportmenu.cpp b/pv/widgets/exportmenu.cpp
index e9fb4150..bda66928 100644
--- a/pv/widgets/exportmenu.cpp
+++ b/pv/widgets/exportmenu.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -32,6 +31,7 @@ using std::map;
using std::pair;
using std::string;
using std::shared_ptr;
+using std::vector;
using sigrok::Context;
using sigrok::OutputFormat;
@@ -40,7 +40,7 @@ namespace pv {
namespace widgets {
ExportMenu::ExportMenu(QWidget *parent, shared_ptr context,
- std::vectoropen_actions) :
+ vectoropen_actions) :
QMenu(parent),
context_(context),
mapper_(this)
@@ -63,20 +63,25 @@ ExportMenu::ExportMenu(QWidget *parent, shared_ptr context,
const map > formats =
context->output_formats();
- for (const pair > &f : formats) {
+ for (const pair > &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)
@@ -95,5 +100,5 @@ void ExportMenu::on_action(QObject *action)
format_selected((*iter).second);
}
-} // widgets
-} // pv
+} // namespace widgets
+} // namespace pv