diff options
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/main.cpp | 5 | ||||
| -rw-r--r-- | ui/qt/main_application.cpp | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 575e924a13..c090a7d350 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -19,7 +19,7 @@ #include <tchar.h> #include <wchar.h> #include <shellapi.h> -#include "ui/win32/console_win32.h" +#include <wsutil/console_win32.h> #endif #include <ui/clopts_common.h> @@ -64,7 +64,6 @@ #include "epan/srt_table.h" #include "ui/alert_box.h" -#include "ui/console.h" #include "ui/iface_lists.h" #include "ui/language.h" #include "ui/persfilepath_opt.h" @@ -486,7 +485,7 @@ int main(int argc, char *qt_argv[]) cmdarg_err_init(wireshark_cmdarg_err, wireshark_cmdarg_err_cont); /* Initialize log handler early so we can have proper logging during startup. */ - ws_log_init_with_writer("wireshark", console_log_writer, vcmdarg_err); + ws_log_init("wireshark", vcmdarg_err); /* For backward compatibility with GLib logging and Wireshark 3.4. */ ws_log_console_writer_set_use_stdout(TRUE); diff --git a/ui/qt/main_application.cpp b/ui/qt/main_application.cpp index 1d9f35930d..25941be6d8 100644 --- a/ui/qt/main_application.cpp +++ b/ui/qt/main_application.cpp @@ -63,7 +63,6 @@ #include "wsutil/utf8_entities.h" #ifdef _WIN32 -# include "ui/win32/console_win32.h" # include "wsutil/file_util.h" # include <QMessageBox> # include <QSettings> @@ -1073,13 +1072,6 @@ _e_prefs *MainApplication::readConfigurationFiles(bool reset) /* Load libwireshark settings from the current profile. */ prefs_p = epan_load_settings(); -#ifdef _WIN32 - /* if the user wants a console to be always there, well, we should open one for him */ - if (prefs_p->gui_console_open == console_open_always) { - create_console(); - } -#endif - /* Read the capture filter file. */ read_filter_list(CFILTER_LIST); |