summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2016-01-29 07:55:03 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2016-01-29 08:24:36 +0000
commit6e53a0667832c9a67654f198ee5a1935c54b8b75 (patch)
tree9c1a71a4d2ee9252326bbfeaf1b10cec9aba30c8
parent72a9a439338f07522571b69656df9a7066930d74 (diff)
downloadwireshark-6e53a0667832c9a67654f198ee5a1935c54b8b75.tar.gz
Qt: No capture filter bookmarks in capture interfaces list
Change-Id: I4f53758c0fa4448656daac3ad186a6b0e687fc5c Reviewed-on: https://code.wireshark.org/review/13593 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-rw-r--r--ui/qt/capture_filter_combo.cpp4
-rw-r--r--ui/qt/capture_filter_combo.h2
-rw-r--r--ui/qt/capture_interfaces_dialog.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/capture_filter_combo.cpp b/ui/qt/capture_filter_combo.cpp
index 946e8fe1e2..267e4d362d 100644
--- a/ui/qt/capture_filter_combo.cpp
+++ b/ui/qt/capture_filter_combo.cpp
@@ -30,11 +30,11 @@
#include "capture_filter_combo.h"
#include "wireshark_application.h"
-CaptureFilterCombo::CaptureFilterCombo(QWidget *parent) :
+CaptureFilterCombo::CaptureFilterCombo(QWidget *parent, bool plain) :
QComboBox(parent),
cf_edit_(NULL)
{
- cf_edit_ = new CaptureFilterEdit(this, false);
+ cf_edit_ = new CaptureFilterEdit(this, plain);
setEditable(true);
// Enabling autocompletion here gives us two simultaneous completions:
diff --git a/ui/qt/capture_filter_combo.h b/ui/qt/capture_filter_combo.h
index fd7b866c34..961ccabd9e 100644
--- a/ui/qt/capture_filter_combo.h
+++ b/ui/qt/capture_filter_combo.h
@@ -31,7 +31,7 @@ class CaptureFilterCombo : public QComboBox
{
Q_OBJECT
public:
- explicit CaptureFilterCombo(QWidget *parent = 0);
+ explicit CaptureFilterCombo(QWidget *parent = 0, bool plain = false);
bool addRecentCapture(const char *filter);
void writeRecent(FILE *rf);
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index d234f08b52..828b7e0dd8 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -1048,7 +1048,7 @@ QWidget* InterfaceTreeDelegate::createEditor(QWidget *parent, const QStyleOption
#endif
case col_filter_:
{
- CaptureFilterCombo *cf = new CaptureFilterCombo(parent);
+ CaptureFilterCombo *cf = new CaptureFilterCombo(parent, true);
connect(cf->lineEdit(), SIGNAL(textEdited(QString)), this, SIGNAL(filterChanged(QString)));
w = (QWidget*) cf;
}