From 2e6f4fafd4de38817d1359a165b17b41c10a144a Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sat, 3 Nov 2012 18:02:01 +0000
Subject: [PATCH] Allow a display filter to be specified in openCaptureFile().

svn path=/trunk/; revision=45883
---
 ui/qt/main_window.h         | 2 +-
 ui/qt/main_window_slots.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 49215c34ef..ebe7626925 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -122,7 +122,7 @@ signals:
 
 public slots:
     // in main_window_slots.cpp
-    void openCaptureFile(QString& cf_path = *new QString());
+    void openCaptureFile(QString& cf_path = *new QString(), QString &display_filter = *new QString());
 
 #ifdef HAVE_LIBPCAP
     void captureCapturePrepared(capture_options *capture_opts);
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index c793b71ea5..018010546b 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -67,10 +67,9 @@
 // Public slots
 //
 
-void MainWindow::openCaptureFile(QString &cf_path)
+void MainWindow::openCaptureFile(QString &cf_path, QString &display_filter)
 {
     QString file_name = "";
-    QString display_filter = "";
     dfilter_t *rfcode = NULL;
     int err;