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>

1 files changed, 13 insertions, 13 deletions

diff --git a/ui/qt/column_editor_frame.cpp b/ui/qt/column_editor_frame.cpp
index 2e3ca3dc16..dcacada1ef 100644
--- a/ui/qt/column_editor_frame.cpp
+++ b/ui/qt/column_editor_frame.cpp
@@ -63,17 +63,17 @@ void ColumnEditorFrame::setFields(int index)
     bool ok = true;
 
     if (index == COL_CUSTOM) {
-        ui->fieldNameLineEdit->setText(saved_field_);
-        ui->fieldNameLineEdit->checkFieldName(saved_field_);
+        ui->fieldsNameLineEdit->setText(saved_fields_);
+        ui->fieldsNameLineEdit->checkCustomColumn(saved_fields_);
         ui->occurrenceLineEdit->setText(saved_occurrence_);
         ui->occurrenceLineEdit->checkInteger(saved_occurrence_);
-        if ((ui->fieldNameLineEdit->syntaxState() != SyntaxLineEdit::Valid) ||
+        if ((ui->fieldsNameLineEdit->syntaxState() != SyntaxLineEdit::Valid) ||
             (ui->occurrenceLineEdit->syntaxState() != SyntaxLineEdit::Valid)) {
             ok = false;
         }
     } else {
-        ui->fieldNameLineEdit->clear();
-        ui->fieldNameLineEdit->setSyntaxState(SyntaxLineEdit::Empty);
+        ui->fieldsNameLineEdit->clear();
+        ui->fieldsNameLineEdit->setSyntaxState(SyntaxLineEdit::Empty);
         ui->occurrenceLineEdit->clear();
         ui->occurrenceLineEdit->setSyntaxState(SyntaxLineEdit::Empty);
     }
@@ -84,7 +84,7 @@ void ColumnEditorFrame::editColumn(int column)
 {
     cur_column_ = column;
     ui->titleLineEdit->setText(get_column_title(column));
-    saved_field_ = get_column_custom_field(column);
+    saved_fields_ = get_column_custom_fields(column);
     saved_occurrence_ = QString::number(get_column_custom_occurrence(column));
     ui->typeComboBox->setCurrentIndex(get_column_format(column));
     setFields(ui->typeComboBox->currentIndex());
@@ -95,22 +95,22 @@ void ColumnEditorFrame::on_typeComboBox_activated(int index)
     setFields(index);
 }
 
-void ColumnEditorFrame::on_fieldNameLineEdit_textEdited(const QString &field)
+void ColumnEditorFrame::on_fieldsNameLineEdit_textEdited(const QString &fields)
 {
-    ui->fieldNameLineEdit->checkFieldName(field);
+    ui->fieldsNameLineEdit->checkCustomColumn(fields);
     if (ui->typeComboBox->currentIndex() != COL_CUSTOM) {
         ui->typeComboBox->setCurrentIndex(COL_CUSTOM);
         ui->occurrenceLineEdit->setText(saved_occurrence_);
     }
 
     bool ok = true;
-    if ((ui->fieldNameLineEdit->syntaxState() == SyntaxLineEdit::Invalid) ||
+    if ((ui->fieldsNameLineEdit->syntaxState() == SyntaxLineEdit::Invalid) ||
         ((ui->typeComboBox->currentIndex() == COL_CUSTOM) &&
         (ui->occurrenceLineEdit->syntaxState() == SyntaxLineEdit::Empty)))
         ok = false;
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
 
-    saved_field_ = field;
+    saved_fields_ = fields;
 }
 
 void ColumnEditorFrame::on_occurrenceLineEdit_textEdited(const QString &occurrence)
@@ -118,7 +118,7 @@ void ColumnEditorFrame::on_occurrenceLineEdit_textEdited(const QString &occurren
     ui->occurrenceLineEdit->checkInteger(occurrence);
     if (ui->typeComboBox->currentIndex() != COL_CUSTOM) {
         ui->typeComboBox->setCurrentIndex(COL_CUSTOM);
-        ui->fieldNameLineEdit->setText(saved_field_);
+        ui->fieldsNameLineEdit->setText(saved_fields_);
     }
 
     bool ok = true;
@@ -145,8 +145,8 @@ void ColumnEditorFrame::on_buttonBox_accepted()
         set_column_title(cur_column_, col_str.constData());
         set_column_format(cur_column_, ui->typeComboBox->currentIndex());
         if (ui->typeComboBox->currentIndex() == COL_CUSTOM) {
-            col_str = ui->fieldNameLineEdit->text().toUtf8();
-            set_column_custom_field(cur_column_, col_str.constData());
+            col_str = ui->fieldsNameLineEdit->text().toUtf8();
+            set_column_custom_fields(cur_column_, col_str.constData());
             if (!ui->occurrenceLineEdit->text().isEmpty()) {
                 set_column_custom_occurrence(cur_column_, ui->occurrenceLineEdit->text().toInt());
             }