aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/display_filter_edit.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-12-15 01:04:39 +0000
committerGerald Combs <gerald@wireshark.org>2012-12-15 01:04:39 +0000
commit5c2c5aed87a35800a8136b34e576aaf53ad25c1a (patch)
tree0aa9c2b38d1eb1ec46591c280f5addcf5c0c3760 /ui/qt/display_filter_edit.cpp
parent92cfec56b8abd8cd04c0133763fea2ddbd9a197e (diff)
Rename the search type menu items to more accurately reflect what we're
actually doing and what users are likely to want to do. Rename the search enum values and functions to reflect what we're actually doing and add a comment explaining why making searches more correct might make searching worse. Add a search bar to the Qt main window, thus continuing the War On Gratuitous Dialogs. Clear out any previous temporary label stack items before adding a new one. svn path=/trunk/; revision=46541
Diffstat (limited to 'ui/qt/display_filter_edit.cpp')
-rw-r--r--ui/qt/display_filter_edit.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp
index ae13d6dc9a..3afd543f38 100644
--- a/ui/qt/display_filter_edit.cpp
+++ b/ui/qt/display_filter_edit.cpp
@@ -23,8 +23,6 @@
#include "config.h"
-#include "globals.h"
-
#include <glib.h>
#include <epan/proto.h>
@@ -268,7 +266,7 @@ void DisplayFilterEdit::checkFilter(const QString& text)
if (dfp != NULL) {
depr = dfilter_deprecated_tokens(dfp);
}
- if (text.length() < 1) {
+ if (text.isEmpty()) {
setSyntaxState(Empty);
} else if (depr) {
/* You keep using that word. I do not think it means what you think it means. */