summaryrefslogtreecommitdiff
path: root/ui/qt/capture_filter_edit.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-05-20 09:17:38 -0700
committerGerald Combs <gerald@wireshark.org>2015-05-20 16:21:03 +0000
commita30000a805a8087b111f82c259f80b60b36512cb (patch)
treec22556189275ebccec0cf4032e4c4382a69211b3 /ui/qt/capture_filter_edit.cpp
parent344c990159d109940bffd28505d6dfab0cc19b9c (diff)
downloadwireshark-a30000a805a8087b111f82c259f80b60b36512cb.tar.gz
Autocompleting "and" and "or" probably isn't useful.
Change-Id: Ia16a02a616fd052eeaa9eceff76bc1b20ee8d82e Reviewed-on: https://code.wireshark.org/review/8553 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/capture_filter_edit.cpp')
-rw-r--r--ui/qt/capture_filter_edit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/capture_filter_edit.cpp b/ui/qt/capture_filter_edit.cpp
index ce84b9fc66..502af592db 100644
--- a/ui/qt/capture_filter_edit.cpp
+++ b/ui/qt/capture_filter_edit.cpp
@@ -87,7 +87,7 @@ static const QString libpcap_primitive_chars_ = "-0123456789abcdefghijklmnopqrst
// grep '^[a-z].*return [A-Z].*;$' scanner.l | awk '{gsub(/\|/, "\n") ; print " << \"" $1 "\""}' | sort
static const QStringList libpcap_primitives_ = QStringList()
<< "aarp" << "action" << "address1" << "address2" << "address3" << "address4"
- << "ah" << "and" << "arp" << "atalk" << "bcc" << "broadcast" << "byte" << "carp"
+ << "ah" << "arp" << "atalk" << "bcc" << "broadcast" << "byte" << "carp"
<< "clnp" << "connectmsg" << "csnp" << "decnet" << "direction" << "dpc"
<< "dst" << "es-is" << "esis" << "esp" << "fddi" << "fisu" << "gateway"
<< "greater" << "hdpc" << "hfisu" << "hlssu" << "hmsu" << "hopc" << "host"
@@ -96,7 +96,7 @@ static const QStringList libpcap_primitives_ = QStringList()
<< "l2" << "lane" << "lat" << "len" << "less" << "link" << "llc" << "lsp"
<< "lssu" << "lsu" << "mask" << "metac" << "metaconnect" << "mopdl" << "moprc"
<< "mpls" << "msu" << "multicast" << "net" << "netbeui" << "oam" << "oamf4"
- << "oamf4ec" << "oamf4sc" << "on" << "opc" << "or" << "outbound" << "pim"
+ << "oamf4ec" << "oamf4sc" << "on" << "opc" << "outbound" << "pim"
<< "port" << "portrange" << "pppoed" << "pppoes" << "proto" << "psnp" << "ra"
<< "radio" << "rarp" << "reason" << "rnr" << "rset" << "sc" << "sca" << "sctp"
<< "sio" << "sls" << "snp" << "src" << "srnr" << "stp" << "subtype" << "ta"