From 0cb3176ab770c6a5f69ffc5a5cd8889a3d5b23a0 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 5 Apr 2018 18:00:16 -0700
Subject: Remove some references to Qt4.

Change-Id: I50f5abafb8adf18a5407427f7feb260301df45cc
Reviewed-on: https://code.wireshark.org/review/26771
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>
---
 ui/qt/CMakeLists.txt                       | 23 ++++-------------------
 ui/qt/Makefile.am                          |  5 -----
 ui/qt/main_window_slots.cpp                |  3 ---
 ui/qt/rpc_service_response_time_dialog.cpp |  2 +-
 4 files changed, 5 insertions(+), 28 deletions(-)

(limited to 'ui')

diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 901b8c5308..a052a7dfa9 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -589,24 +589,13 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-# Define compatibility macros for Qt 4.8
-if(QT_VERSION EQUAL 4)
-	add_definitions(-DQ_NULLPTR=NULL)
-endif()
-
 SET(CMAKE_AUTOMOC TRUE)
 
 if(CMAKE_VERSION VERSION_LESS "3.0.2")
 	# AUTOUIC and AUTORCC are not supported in CMAKE 2.8.x
-	if (QT_VERSION EQUAL 5)
-		QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
-		QT5_ADD_RESOURCES(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
-		QT5_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI})
-	else()
-		QT4_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
-		QT4_ADD_RESOURCES(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
-		QT4_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI})
-	endif()
+	QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
+	QT5_ADD_RESOURCES(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
+	QT5_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI})
 else()
 	SET(CMAKE_AUTOUIC TRUE)
 	SET(CMAKE_AUTORCC TRUE)
@@ -616,11 +605,7 @@ else()
 
 	# Add .qrc files to library dependencies for AUTORCC.
 	set(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
-	if (QT_VERSION EQUAL 5)
-		QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
-	else()
-		QT4_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
-	endif()
+	QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
 endif()
 
 add_custom_target(
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 7426dd68d4..cf84267c76 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -27,11 +27,6 @@ if HAVE_SPEEXDSP
 AM_CPPFLAGS += $(SPEEXDSP_CFLAGS)
 endif
 
-# Define compatibility macros for Qt 4.8
-if HAVE_QT_VERSION_4
-AM_CPPFLAGS += -DQ_NULLPTR=NULL
-endif
-
 noinst_LIBRARIES = libqtui.a
 
 include Makefile_custom.common
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 4193a62c7e..b23d22c408 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1836,9 +1836,6 @@ void MainWindow::on_actionNewDisplayFilterExpression_triggered()
     main_ui_->filterExpressionFrame->addExpression(df_combo_box_->lineEdit()->text());
 }
 
-// On Qt4 + macOS with unifiedTitleAndToolBarOnMac set it's possible to make
-// the main window obnoxiously wide.
-
 void MainWindow::displayFilterButtonClicked()
 {
     QAction *dfb_action = qobject_cast<QAction*>(sender());
diff --git a/ui/qt/rpc_service_response_time_dialog.cpp b/ui/qt/rpc_service_response_time_dialog.cpp
index 30db4c5e06..360f7b1789 100644
--- a/ui/qt/rpc_service_response_time_dialog.cpp
+++ b/ui/qt/rpc_service_response_time_dialog.cpp
@@ -150,7 +150,7 @@ TapParameterDialog *RpcServiceResponseTimeDialog::createDceRpcSrtDialog(QWidget
     // dcerpc,srt,<uuid>,<major version>.<minor version>[,<filter>]
     QStringList args_l = QString(opt_arg).split(',');
     if (args_l.length() > 1) {
-        // Alas, QUuid requires Qt 4.8.
+        // XXX Switch to QUuid.
         unsigned d1, d2, d3, d4_0, d4_1, d4_2, d4_3, d4_4, d4_5, d4_6, d4_7;
         if(sscanf(args_l[0].toUtf8().constData(),
                   "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-- 
cgit v1.2.3