diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-01-15 11:35:47 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-01-18 16:37:43 +0000 |
| commit | 6d0bc20d4e4853deb7da13312fb3eb3e36b4160f (patch) | |
| tree | 99915ce6fd0d7e39008293b17c6bb3737e89aa19 /ui/qt/display_filter_edit.cpp | |
| parent | 7b2afd5ae63ffe7ab7ac4788acfadaac638a62c8 (diff) | |
Qt: Fixup the Display Filter Expression syntax logic.
In the Display Filter Expression dialog, only disable the OK button when
we have an invalid filter.
Move the deprecated warning string from DisplayFilterEdit::checkFilter
to SyntaxLineEdit::checkDisplayFilter so that we can use it in more
places.
Change-Id: I938f5f10258f4fd9dd3a33c174dd9958c9634766
Reviewed-on: https://code.wireshark.org/review/13317
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/display_filter_edit.cpp')
| -rw-r--r-- | ui/qt/display_filter_edit.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp index 4d55502571..d91c8565c6 100644 --- a/ui/qt/display_filter_edit.cpp +++ b/ui/qt/display_filter_edit.cpp @@ -318,13 +318,7 @@ void DisplayFilterEdit::checkFilter(const QString& filter_text) switch (syntaxState()) { case Deprecated: { - /* - * We're being lazy and only printing the first "problem" token. - * Would it be better to print all of them? - */ - QString deprecatedMsg(tr("\"%1\" may have unexpected results (see the User's Guide)") - .arg(deprecatedToken())); - emit pushFilterSyntaxWarning(deprecatedMsg); + emit pushFilterSyntaxWarning(syntaxErrorMessage()); break; } case Invalid: |