Qt: Fix preference change behavior.

Main window:

Keep track of our current layout and only change it if the preferences
change. This keeps the panes from resizing.

Re-select the current packet if the layout changes so that the proto
tree and byte view aren't left in an invalid state. This fixes a crash
similar to bug 10896.

Search frame:

Get rid of an invalid error message. Update coding style.

I don't think any of these fix bug 10921 since Xiaochuan seems to get a
crash immediately upon opening the dialog.

Change-Id: I0e880a50d3c9ac1c6ae6a01034b05fd2249444f4
Reviewed-on: https://code.wireshark.org/review/6989
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h
index db3b694d60..599209509b 100644
--- a/ui/qt/search_frame.h
+++ b/ui/qt/search_frame.h
@@ -54,14 +54,14 @@ protected:
     void keyPressEvent(QKeyEvent *event);
 
 private:
-    void enableWidgets();
+    void updateWidgets();
 
     Ui::SearchFrame *sf_ui_;
     capture_file *cap_file_;
 
 private slots:
-    void on_searchTypeComboBox_currentIndexChanged(int index);
-    void on_searchLineEdit_textChanged(const QString &search_string);
+    void on_searchTypeComboBox_currentIndexChanged(int);
+    void on_searchLineEdit_textChanged(const QString &);
     void on_findButton_clicked();
     void on_cancelButton_clicked();
     void changeEvent(QEvent* event);