Merge RowItem() into ViewItem()

[pulseview.git] / pv / views / trace / decodetrace.cpp

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 1f9e4c4e1b9bd7e0e2af3dad77817b33fec7f1bc..65a2bf6c6a72f3e773b837e1941565bd7378012a 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -333,7 +333,7 @@ QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos)
 
        QMenu* default_menu = Trace::create_view_context_menu(parent, click_pos);
        if (default_menu) {
-               for (QAction *action : default_menu->actions()) {
+               for (QAction *action : default_menu->actions()) {  // clazy:exclude=range-loop
                        menu->addAction(action);
                        if (action->parent() == default_menu)
                                action->setParent(menu);
@@ -899,7 +899,7 @@ void DecodeTrace::create_decoder_form(int index,
        const vector<DecodeChannel> channels = decode_signal_->get_channels();
 
        // Add the channels
-       for (DecodeChannel ch : channels) {
+       for (const DecodeChannel& ch : channels) {
                // Ignore channels not part of the decoder we create the form for
                if (ch.decoder_ != dec)
                        continue;
@@ -1036,8 +1036,7 @@ void DecodeTrace::export_annotations(vector<Annotation> *annotations) const
        }
 
        QMessageBox msg(owner_->view());
-       msg.setText(tr("Error"));
-       msg.setInformativeText(tr("File %1 could not be written to.").arg(file_name));
+       msg.setText(tr("Error") + "\n\n" + tr("File %1 could not be written to.").arg(file_name));
        msg.setStandardButtons(QMessageBox::Ok);
        msg.setIcon(QMessageBox::Warning);
        msg.exec();