From 9bb3f6be4c18822267a64633c298e1a8f1809221 Mon Sep 17 00:00:00 2001 From: Michal Labedzki Date: Fri, 11 Dec 2015 09:34:08 +0100 Subject: Qt: Add missing multi-field column validation GTK already has it, but Qt forgot about it, so multi-field custom column works ok if previously saved in GTK-shark. Invalid validation prevent from modifying and saving multi-field custom column in Qt version. While at it, rename "custom field" to "custom fields" to ensure we think about multi-field custom column. Change-Id: I99588150ccb38be11b75f5dd5b0f6443e7055ebb Reviewed-on: https://code.wireshark.org/review/12685 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ui/qt/column_preferences_frame.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/qt/column_preferences_frame.h') diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h index c5c45e2895..0a7ae664b6 100644 --- a/ui/qt/column_preferences_frame.h +++ b/ui/qt/column_preferences_frame.h @@ -54,7 +54,7 @@ private: QComboBox *cur_combo_box_; int saved_combo_idx_; - void addColumn(bool visible, const char *title, int fmt, const char *custom_field, int custom_occurrence); + void addColumn(bool visible, const char *title, int fmt, const char *custom_fields, int custom_occurrence); private slots: void updateWidgets(void); @@ -64,7 +64,7 @@ private slots: void comboDestroyed(); void columnTitleEditingFinished(); void columnTypeCurrentIndexChanged(int index); - void customFieldEditingFinished(); + void customFieldsEditingFinished(); void customOccurrenceEditingFinished(); void on_newToolButton_clicked(); void on_deleteToolButton_clicked(); -- cgit v1.2.3