From 4876016bda0e0078d15d3e26df220a782c95376f Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Mon, 22 Dec 2014 20:54:10 +0100 Subject: Qt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, 1159209) Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d Reviewed-on: https://code.wireshark.org/review/5995 Reviewed-by: Anders Broman --- ui/qt/column_preferences_frame.cpp | 2 ++ ui/qt/filter_expressions_preferences_frame.cpp | 1 + ui/qt/preferences_dialog.cpp | 2 ++ ui/qt/uat_dialog.cpp | 2 ++ 4 files changed, 7 insertions(+) (limited to 'ui/qt') diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp index f11dda65ed..f272a15dee 100644 --- a/ui/qt/column_preferences_frame.cpp +++ b/ui/qt/column_preferences_frame.cpp @@ -137,6 +137,7 @@ void ColumnPreferencesFrame::keyPressEvent(QKeyEvent *evt) case Qt::Key_Escape: cur_line_edit_->setText(saved_col_string_); new_idx = saved_combo_idx_; + /* Fall Through */ case Qt::Key_Enter: case Qt::Key_Return: switch (cur_column_) { @@ -164,6 +165,7 @@ void ColumnPreferencesFrame::keyPressEvent(QKeyEvent *evt) switch (evt->key()) { case Qt::Key_Escape: cur_combo_box_->setCurrentIndex(saved_combo_idx_); + /* Fall Through */ case Qt::Key_Enter: case Qt::Key_Return: // XXX The combo box eats enter and return diff --git a/ui/qt/filter_expressions_preferences_frame.cpp b/ui/qt/filter_expressions_preferences_frame.cpp index 46eba30ad9..36d0a46a9a 100644 --- a/ui/qt/filter_expressions_preferences_frame.cpp +++ b/ui/qt/filter_expressions_preferences_frame.cpp @@ -130,6 +130,7 @@ void FilterExpressionsPreferencesFrame::keyPressEvent(QKeyEvent *evt) switch (evt->key()) { case Qt::Key_Escape: cur_line_edit_->setText(saved_col_string_); + /* Fall Through */ case Qt::Key_Enter: case Qt::Key_Return: switch (cur_column_) { diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index 4702c664f1..486e627dd3 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -362,6 +362,7 @@ void PreferencesDialog::keyPressEvent(QKeyEvent *evt) switch (evt->key()) { case Qt::Key_Escape: cur_line_edit_->setText(saved_string_pref_); + /* Fall Through */ case Qt::Key_Enter: case Qt::Key_Return: switch (cur_pref_type_) { @@ -387,6 +388,7 @@ void PreferencesDialog::keyPressEvent(QKeyEvent *evt) switch (evt->key()) { case Qt::Key_Escape: cur_combo_box_->setCurrentIndex(saved_combo_idx_); + /* Fall Through */ case Qt::Key_Enter: case Qt::Key_Return: // XXX The combo box eats enter and return diff --git a/ui/qt/uat_dialog.cpp b/ui/qt/uat_dialog.cpp index ce45d429f3..bd6d9b768f 100644 --- a/ui/qt/uat_dialog.cpp +++ b/ui/qt/uat_dialog.cpp @@ -125,6 +125,7 @@ void UatDialog::keyPressEvent(QKeyEvent *evt) switch (evt->key()) { case Qt::Key_Escape: cur_line_edit_->setText(saved_string_pref_); + /* Fall Through */ case Qt::Key_Enter: case Qt::Key_Return: stringPrefEditingFinished(); @@ -136,6 +137,7 @@ void UatDialog::keyPressEvent(QKeyEvent *evt) switch (evt->key()) { case Qt::Key_Escape: cur_combo_box_->setCurrentIndex(saved_combo_idx_); + /* Fall Through */ case Qt::Key_Enter: case Qt::Key_Return: // XXX The combo box eats enter and return -- cgit v1.2.3