Have routines for parsing options that affect dissection.

Have them handle -d, -t, --disable-protocol, --disable-heuristic, and
--enable-heuristic for TShark and both flavors of Wireshark.

Change-Id: I612c276b1f9df8a2092202d23ab3d48be7857e85
Reviewed-on: https://code.wireshark.org/review/18583
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 7 insertions, 5 deletions

diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 388ab77ab4..7597ab9503 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -34,12 +34,14 @@
 #include <windows.h>
 #endif
 
-#include "ui/commandline.h"
+#include "ui/dissect_opts.h"
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
 #endif
 
+#include "ui/commandline.h"
+
 #include "epan/color_filters.h"
 
 #include "wsutil/file_util.h"
@@ -1384,12 +1386,12 @@ void MainWindow::startInterfaceCapture(bool valid, const QString capture_filter)
 
 void MainWindow::applyGlobalCommandLineOptions()
 {
-    if (global_commandline_info.time_format != TS_NOT_SET) {
+    if (global_dissect_options.time_format != TS_NOT_SET) {
         foreach (QAction* tda, td_actions.keys()) {
-            if (global_commandline_info.time_format == td_actions[tda]) {
+            if (global_dissect_options.time_format == td_actions[tda]) {
                 tda->setChecked(true);
-                recent.gui_time_format = global_commandline_info.time_format;
-                timestamp_set_type(global_commandline_info.time_format);
+                recent.gui_time_format = global_dissect_options.time_format;
+                timestamp_set_type(global_dissect_options.time_format);
                 break;
             }
         }