Use a generic approach when adding the "close on enter" hook for popups

[pulseview.git] / pv / view / signal.cpp

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 97e05494cca05eac922a47a6bb0c1dd878472d93..51af899ee4d814d8703e92c33ebfe135142cd6ad 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -118,9 +118,6 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
        connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
                this, SLOT(on_text_changed(const QString&)));
 
        connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
                this, SLOT(on_text_changed(const QString&)));
 

-       // We want to close the popup when the Enter key was pressed.
-       _name_widget->installEventFilter(this);
-

        form->addRow(tr("Name"), _name_widget);
 
        add_colour_option(parent, form);
        form->addRow(tr("Name"), _name_widget);
 
        add_colour_option(parent, form);


@@ -140,24 +137,6 @@ QMenu* Signal::create_context_menu(QWidget *parent)
        return menu;
 }
 
        return menu;
 }
 

-bool Signal::eventFilter(QObject *obj, QEvent *evt)
-{
-       QKeyEvent *keyEvent;
-
-       (void)obj;
-
-       if (evt->type() == QEvent::KeyPress) {
-               keyEvent = static_cast<QKeyEvent*>(evt);
-               if (keyEvent->key() == Qt::Key_Enter ||
-                   keyEvent->key() == Qt::Key_Return) {
-                       close_popup();
-                       return true;
-               }
-       }
-
-       return false;
-}
-

 void Signal::delete_pressed()
 {
        on_disable();
 void Signal::delete_pressed()
 {
        on_disable();