aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/column_preferences_frame.h
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2015-12-11 09:34:08 +0100
committerAnders Broman <a.broman58@gmail.com>2015-12-20 08:21:02 +0000
commit9bb3f6be4c18822267a64633c298e1a8f1809221 (patch)
treede9b8934c58f239e29d0227039ad7f55f3d42f06 /ui/qt/column_preferences_frame.h
parent7e0ec2c8eb3c88e70992dc40b130c76177b83a30 (diff)
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 <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/column_preferences_frame.h')
-rw-r--r--ui/qt/column_preferences_frame.h4
1 files changed, 2 insertions, 2 deletions
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();