diff options
author | João Valverde <j@v6e.pt> | 2021-10-27 21:56:03 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2021-11-07 22:44:59 +0000 |
commit | 69c850df51db8b755c7e728e81165806b682ec17 (patch) | |
tree | 9ea844029a5069f5c57b9d55db29a481f3d909fa /ui | |
parent | e9f2153eed8703bb58bd52b73cd59bea27c9de2e (diff) |
ftypes: Simplify fvalue_can_*() interface
If an ftype can participate in equala assume it can also participate in
not equals. Use fvalue_can_eq() instead of fvalue_can_ne().
If it can participate in one order comparison it can participate in all.
Replace any comparison with fvalue_can_cmp().
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/display_filter_expression_dialog.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ui/qt/display_filter_expression_dialog.cpp b/ui/qt/display_filter_expression_dialog.cpp index 828a53a543..d8f765d2f2 100644 --- a/ui/qt/display_filter_expression_dialog.cpp +++ b/ui/qt/display_filter_expression_dialog.cpp @@ -358,23 +358,15 @@ void DisplayFilterExpressionDialog::on_fieldTreeWidget_itemSelectionChanged() QListWidgetItem *li = ui->relationListWidget->item(i); switch (li->type()) { case eq_op_: - case in_op_: - li->setHidden(!ftype_can_eq(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_eq(FT_BYTES))); - break; case ne_op_: - li->setHidden(!ftype_can_ne(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_ne(FT_BYTES))); + li->setHidden(!ftype_can_eq(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_eq(FT_BYTES))); break; case gt_op_: - li->setHidden(!ftype_can_gt(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_gt(FT_BYTES))); - break; case lt_op_: - li->setHidden(!ftype_can_lt(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_lt(FT_BYTES))); - break; case ge_op_: - li->setHidden(!ftype_can_ge(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_ge(FT_BYTES))); - break; case le_op_: - li->setHidden(!ftype_can_le(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_le(FT_BYTES))); + case in_op_: + li->setHidden(!ftype_can_cmp(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_cmp(FT_BYTES))); break; case contains_op_: li->setHidden(!ftype_can_contains(ftype_) && !(ftype_can_slice(ftype_) && ftype_can_contains(FT_BYTES))); |