Fix clazy warnings

[pulseview.git] / pv / subwindows / decoder_selector / subwindow.cpp

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index 5665a3227c806373f5c31a58eca2519e974d86fe..0b49c34aa190af74235473839dec121ce2392651 100644 (file)
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -33,13 +33,15 @@
 #include "pv/subwindows/decoder_selector/subwindow.hpp"
 
 using std::reverse;
-using std::shared_ptr;
 
 namespace pv {
 namespace subwindows {
 namespace decoder_selector {
 
-const QString initial_notice = QApplication::tr("Select a decoder to see its description here.");
+const char *initial_notice =
+       QT_TRANSLATE_NOOP("pv::subwindows::decoder_selector::SubWindow",
+               "Select a decoder to see its description here.");  // clazy:exclude=non-pod-global-static
+
 const int min_width_margin = 75;
 
 
@@ -132,13 +134,15 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
        info_label_header_->setTextInteractionFlags(flags);
        info_label_body_->setWordWrap(true);
        info_label_body_->setTextInteractionFlags(flags);
-       info_label_body_->setText(initial_notice);
+       info_label_body_->setText(QString(tr(initial_notice)));
        info_label_body_->setAlignment(Qt::AlignTop);
        info_label_footer_->setWordWrap(true);
        info_label_footer_->setTextInteractionFlags(flags);
 
        connect(filter, SIGNAL(textChanged(const QString&)),
                this, SLOT(on_filter_changed(const QString&)));
+       connect(filter, SIGNAL(returnPressed()),
+               this, SLOT(on_filter_return_pressed()));
 
        connect(tree_view_, SIGNAL(currentChanged(const QModelIndex&)),
                this, SLOT(on_item_changed(const QModelIndex&)));
@@ -167,7 +171,7 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
 int SubWindow::minimum_width() const
 {
        QFontMetrics m(info_label_body_->font());
-       const int label_width = m.width(initial_notice);
+       const int label_width = m.width(QString(tr(initial_notice)));
 
        return label_width + min_width_margin;
 }
@@ -193,8 +197,10 @@ vector<const srd_decoder*> SubWindow::get_decoders_providing(const char* output)
                if (!d->outputs)
                        continue;
 
+               const int maxlen = 1024;
+
                // TODO For now we ignore that d->outputs is actually a list
-               if (strncmp((char*)(d->outputs->data), output, strlen(output)) == 0)
+               if (strncmp((char*)(d->outputs->data), output, maxlen) == 0)
                        ret_val.push_back(d);
        }
 
@@ -255,13 +261,13 @@ void SubWindow::on_item_activated(const QModelIndex& index)
                return;
        }
 
-       if (strncmp(inputs.at(0), "logic", 5) == 0) {
+       if (strcmp(inputs.at(0), "logic") == 0) {
                new_decoders_selected(decoders);
                return;
        }
 
        // Check if we can automatically fulfill the stacking requirements
-       while (strncmp(inputs.at(0), "logic", 5) != 0) {
+       while (strcmp(inputs.at(0), "logic") != 0) {
                vector<const srd_decoder*> prov_decoders = get_decoders_providing(inputs.at(0));
 
                if (prov_decoders.size() == 0) {
@@ -309,6 +315,28 @@ void SubWindow::on_filter_changed(const QString& text)
        tree_view_->setExpanded(tree_view_->model()->index(0, 0), !text.isEmpty());
 }
 
+void SubWindow::on_filter_return_pressed()
+{
+       int num_visible_decoders = 0;
+       QModelIndex last_valid_index;
+
+       QModelIndex index = tree_view_->model()->index(0, 0);
+
+       while (index.isValid()) {
+               QModelIndex id_index = index.model()->index(index.row(), 2, index.parent());
+               QString decoder_name = index.model()->data(id_index, Qt::DisplayRole).toString();
+               if (!decoder_name.isEmpty()) {
+                       last_valid_index = index;
+                       num_visible_decoders++;
+               }
+               index = tree_view_->indexBelow(index);
+       }
+
+       // If only one decoder matches the filter, apply it when the user presses enter
+       if (num_visible_decoders == 1)
+               tree_view_->activated(last_valid_index);
+}
+
 } // namespace decoder_selector
 } // namespace subwindows
 } // namespace pv