Qt: Don't use _U_ for unused parameters in C++

Change-Id: If7acab5f438bb20b053fdcfef86b2f06765b5321
Reviewed-on: https://code.wireshark.org/review/21341
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

3 files changed, 4 insertions, 5 deletions

diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp
index 49607867a4..ada4099e0d 100644
--- a/ui/qt/bluetooth_devices_dialog.cpp
+++ b/ui/qt/bluetooth_devices_dialog.cpp
@@ -164,7 +164,7 @@ void BluetoothDevicesDialog::tableContextMenu(const QPoint &pos)
     context_menu_.exec(ui->tableTreeWidget->viewport()->mapToGlobal(pos));
 }
 
-void BluetoothDevicesDialog::tableItemDoubleClicked(QTreeWidgetItem *item, int column _U_)
+void BluetoothDevicesDialog::tableItemDoubleClicked(QTreeWidgetItem *item, int)
 {
     bluetooth_item_data_t            *item_data;
     BluetoothDeviceDialog  *bluetooth_device_dialog;
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index dd7f5ba556..efdbe3bee0 100644
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -270,10 +270,9 @@ public:
 
     // Column text raw representation.
     // Return a string, qulonglong, double, or invalid QVariant representing the raw column data.
-#ifdef HAVE_GEOIP
     QVariant colData(int col, bool resolve_names, bool strings_only) const {
-#else
-    QVariant colData(int col, bool resolve_names, bool strings_only _U_) const {
+#ifndef HAVE_GEOIP
+        Q_UNUSED(strings_only)
 #endif
         hostlist_talker_t *endp_item = &g_array_index(conv_array_, hostlist_talker_t, conv_idx_);
 
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index a5fddaf27a..976c23aae0 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -2149,7 +2149,7 @@ void MainWindow::initConversationMenus()
     connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered()));
 }
 
-gboolean MainWindow::addExportObjectsMenuItem(const void *key _U_, void *value, void *userdata)
+gboolean MainWindow::addExportObjectsMenuItem(const void *, void *value, void *userdata)
 {
     register_eo_t *eo = (register_eo_t*)value;
     MainWindow *window = (MainWindow*)userdata;