Have separate lists of recent capture filters for all interfaces, in

addition to a "global" list.  Store all of those lists in the recent
file.  Maintain the lists in ui/recent.c, rather than attaching them to
widgets; have the code that populates the combo boxes get the lists from
the ui/recent.c code.

This makes a little more of the code GUI-toolkit-independent, and should
fix bug 7278.

#BACKPORT 1.10, 1.8

svn path=/trunk/; revision=50956

1 files changed, 0 insertions, 16 deletions

diff --git a/ui/qt/display_filter_combo.cpp b/ui/qt/display_filter_combo.cpp
index ce46feb828..cf852faa33 100644
--- a/ui/qt/display_filter_combo.cpp
+++ b/ui/qt/display_filter_combo.cpp
@@ -121,22 +121,6 @@ extern "C" gboolean dfilter_combo_add_recent(const gchar *filter) {
 }
 
 
-// xxx - Move to an as-yet-to-be-written capture filter module along with ::addRecentCapture and ::writeRecentCapture
-QList<QString> cfilters;
-
-extern "C" gboolean cfilter_combo_add_recent(const gchar *filter) {
-    cfilters.append(filter);
-    return TRUE;
-}
-
-extern "C" void cfilter_combo_recent_write_all(FILE *rf) {
-    QString cfilter;
-
-    foreach (cfilter, cfilters) {
-        fprintf (rf, RECENT_KEY_CAPTURE_FILTER ": %s\n", cfilter.toUtf8().constData());
-    }
-}
-
 /*
  * Editor modelines
  *