From f8092f96b373f851eb91ae2ff94581bcba8d0279 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 7 Jun 2018 13:04:38 -0700
Subject: [PATCH] Qt: Move wireshark-qt.cpp back to ui/qt/main.cpp.

The Qt UI's main module started out as ui/qt/main.cpp but was moved to
the top-level directory in order to appease Autotools. We don't need to
do that any more, so move it back.

Change-Id: Ic5bc0ed5b754e36cc2b9e682f2ca097781233dfd
Reviewed-on: https://code.wireshark.org/review/28090
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 CMakeLists.txt                                       | 2 +-
 docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc | 2 +-
 image/wireshark.exe.manifest.in                      | 2 +-
 tools/update-tx                                      | 3 +--
 ui/qt/CMakeLists.txt                                 | 1 +
 wireshark-qt.cpp => ui/qt/main.cpp                   | 2 +-
 ui/qt/main_window.cpp                                | 2 +-
 ui/qt/widgets/wireshark_file_dialog.h                | 4 ++--
 ui/win32/file_dlg_win32.h                            | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename wireshark-qt.cpp => ui/qt/main.cpp (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bee2583601..64754847e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2117,7 +2117,7 @@ if(BUILD_wireshark AND QT_FOUND)
 		${WIN_VERSION_LIBRARY}
 	)
 
-	add_executable(wireshark WIN32 MACOSX_BUNDLE wireshark-qt.cpp ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
+	add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
 	add_dependencies(wireshark version)
 	set(PROGLIST ${PROGLIST} wireshark)
 	if(CMAKE_VERSION VERSION_LESS "2.8.12"
diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
index 9abc369d91..dd6ee31f65 100644
--- a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
@@ -88,7 +88,7 @@ prompt you to re-run CMake.
 
 ==== Source Code Overview
 
-Wireshark’s `main` entry point is in _wireshark-qt.cpp_. Command-line arguments
+Wireshark’s `main` entry point is in _ui/qt/main.cpp_. Command-line arguments
 are processed there and the main application class (`WiresharkApplication`)
 instance is created there along with the main window.
 
diff --git a/image/wireshark.exe.manifest.in b/image/wireshark.exe.manifest.in
index 805c2d9603..b75cb55fb4 100644
--- a/image/wireshark.exe.manifest.in
+++ b/image/wireshark.exe.manifest.in
@@ -50,7 +50,7 @@
     MSDN recommends setting our DPI awareness to PerMonitorV2 instead
     of PerMonitor. Unfortunately that causes layout issues with Qt
     5.6 and 5.9. For now enable PerMonitor DPI awareness by enabling
-    Qt::AA_EnableHighDpiScaling in wireshark-qt.cpp.
+    Qt::AA_EnableHighDpiScaling in ui/qt/main.cpp.
   -->
   <!--
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
diff --git a/tools/update-tx b/tools/update-tx
index 460b005e88..53f09f9104 100755
--- a/tools/update-tx
+++ b/tools/update-tx
@@ -11,9 +11,8 @@ while getopts "n" OPTCHAR ; do
 done
 shift $((OPTIND - 1))
 
-# All .cpp, .h, and .ui files under ui/qt plus wireshark-qt.cpp.
+# All .cpp, .h, and .ui files under ui/qt
 LUPDATE_FILES=$(find ui/qt -name '*.cpp' -o -name '*.h' -o -name '*.ui')
-LUPDATE_FILES=($LUPDATE_FILES wireshark-qt.cpp)
 
 # Add line numbers
 for i in ui/qt/*.ts ; do
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index e39366238c..73411b081a 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -373,6 +373,7 @@ set(WIRESHARK_QT_SRC
 	lte_rlc_statistics_dialog.cpp
 	main_status_bar.cpp
 	welcome_page.cpp
+	main.cpp
 	main_window.cpp
 	main_window_preferences_frame.cpp
 	main_window_layout.cpp
diff --git a/wireshark-qt.cpp b/ui/qt/main.cpp
similarity index 99%
rename from wireshark-qt.cpp
rename to ui/qt/main.cpp
index 4b595b0ebc..178799846c 100644
--- a/wireshark-qt.cpp
+++ b/ui/qt/main.cpp
@@ -1,4 +1,4 @@
-/* wireshark-qt.cpp
+/* main.cpp
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 418f82dc62..271e69cec6 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -958,7 +958,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
     }
     wsApp->quit();
     // When the main loop is not yet running (i.e. when openCaptureFile is
-    // executing in wireshark-qt.cpp), the above quit action has no effect.
+    // executing in main.cpp), the above quit action has no effect.
     // Schedule a quit action for the next execution of the main loop.
     QMetaObject::invokeMethod(wsApp, "quit", Qt::QueuedConnection);
 }
diff --git a/ui/qt/widgets/wireshark_file_dialog.h b/ui/qt/widgets/wireshark_file_dialog.h
index de7797080e..29aa4544e8 100644
--- a/ui/qt/widgets/wireshark_file_dialog.h
+++ b/ui/qt/widgets/wireshark_file_dialog.h
@@ -16,8 +16,8 @@
  * @brief The WiresharkFileDialog class
  *
  * Qt <= 5.9 supports setting old (Windows 8.1) per-monitor DPI awareness
- * via Qt:AA_EnableHighDpiScaling. We do this in wireshark-qt.cpp. In order
- * for native dialogs to be rendered correctly we need to to set per-monitor
+ * via Qt:AA_EnableHighDpiScaling. We do this in main.cpp. In order for
+ * native dialogs to be rendered correctly we need to to set per-monitor
  * *v2* awareness prior to creating the dialog.
  * Qt doesn't render correctly when per-monitor v2 awareness is enabled, so
  * we need to revert our thread context when we're done.
diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h
index 671c1b4af5..21c843027a 100644
--- a/ui/win32/file_dlg_win32.h
+++ b/ui/win32/file_dlg_win32.h
@@ -24,8 +24,8 @@ extern "C" {
  * @brief set_thread_per_monitor_v2_awareness
  *
  * Qt <= 5.9 supports setting old (Windows 8.1) per-monitor DPI awareness
- * via Qt:AA_EnableHighDpiScaling. We do this in wireshark-qt.cpp. In order
- * for native dialogs to be rendered correctly we need to to set per-monitor
+ * via Qt:AA_EnableHighDpiScaling. We do this in main.cpp. In order for
+ * native dialogs to be rendered correctly we need to to set per-monitor
  * *v2* awareness prior to creating the dialog, which we can do here.
  * Qt doesn't render correctly when per-monitor v2 awareness is enabled, so
  * we need to revert our thread context when we're done.