osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Display filter completion fixes. 

Fixup the logic for adding field names to the list.

Connect our completer activation signal to its slot once, not twice.

Bug: 11187
Change-Id: Ife1879fe05c870094ee31e59dd62e3004f588bfc
Reviewed-on: https://code.wireshark.org/review/8440
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-05-12 12:35:54 -07:00
parent 79ba6e6d53
commit 99ca42153b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/qt/display_filter_edit.cpp
View File

@ -105,7 +105,6 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, bool plain) :
completion_model_ = new QStringListModel(this);
QCompleter *completer_ = new QCompleter(completion_model_, this);
setCompleter(completer_);
connect(completer_, SIGNAL(activated(QString)), this, SLOT(insertFieldCompletion(QString)));
if (plain_) {
placeholder_text_ = QString(tr("Enter a display filter %1")).arg(UTF8_HORIZONTAL_ELLIPSIS);
@ -427,7 +426,7 @@ void DisplayFilterEdit::buildCompletionList(const QString &field_word)
QString df_text = df_combo->itemText(i);
// Don't complete the current filter.
if (df_text.startsWith(text()) && df_text.compare(text())) {
recent_list <<df_text;
recent_list << df_text;
}
}
}
@ -441,16 +440,18 @@ void DisplayFilterEdit::buildCompletionList(const QString &field_word)
void *proto_cookie;
QStringList field_list;
bool show_fields = field_word.contains('.');
int field_dots = field_word.count('.'); // Some protocol names (_ws.expert) contain periods.
for (int proto_id = proto_get_first_protocol(&proto_cookie); proto_id != -1; proto_id = proto_get_next_protocol(&proto_cookie)) {
protocol_t *protocol = find_protocol_by_id(proto_id);
if (!proto_is_protocol_enabled(protocol)) continue;
// Don't complete the current word.
const QString pfname = proto_get_protocol_filter_name(proto_id);
if (!field_word.startsWith(pfname)) continue;
field_list << pfname;
if (show_fields) {
if (field_word.compare(pfname)) field_list << pfname;
// Add fields only if we're past the protocol name and only for the
// current protocol.
if (field_dots > pfname.count('.') && field_word.startsWith(pfname)) {
void *field_cookie;
for (header_field_info *hfinfo = proto_get_first_protocol_field(proto_id, &field_cookie); hfinfo; hfinfo = proto_get_next_protocol_field(proto_id, &field_cookie)) {
if (hfinfo->same_name_prev_id != -1) continue; // ignore duplicate names