From 21b4aa5072755923f5f555605ef4dc2b01857579 Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Tue, 19 Jan 2021 05:30:56 -0600
Subject: [PATCH] unused macro and update QTime to QElapsedTimer (#417)

---
 include/aoapplication.h | 2 ++
 src/aoapplication.cpp   | 4 ++++
 src/aomusicplayer.cpp   | 2 ++
 src/charselect.cpp      | 1 +
 src/courtroom.cpp       | 2 ++
 src/networkmanager.cpp  | 2 +-
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 4607fa6..9b7cef1 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -1,6 +1,8 @@
 #ifndef AOAPPLICATION_H
 #define AOAPPLICATION_H
 
+#define UNUSED(x) (void)(x)
+
 #include "aopacket.h"
 #include "datatypes.h"
 #include "demoserver.h"
diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index a7f41e3..34afb28 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -186,6 +186,10 @@ void AOApplication::call_announce_menu(Courtroom *court)
 void CALLBACK AOApplication::BASSreset(HSTREAM handle, DWORD channel,
                                        DWORD data, void *user)
 {
+  UNUSED(handle);
+  UNUSED(channel);
+  UNUSED(data);
+  UNUSED(user);
   doBASSreset();
 }
 
diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp
index 0f87205..be9d763 100644
--- a/src/aomusicplayer.cpp
+++ b/src/aomusicplayer.cpp
@@ -150,6 +150,8 @@ void AOMusicPlayer::set_volume(int p_value, int channel)
 
 void CALLBACK loopProc(HSYNC handle, DWORD channel, DWORD data, void *user)
 {
+  UNUSED(handle);
+  UNUSED(data);
   QWORD loop_start = *(static_cast<unsigned *>(user));
   BASS_ChannelLock(channel, true);
   BASS_ChannelSetPosition(channel, loop_start, BASS_POS_BYTE);
diff --git a/src/charselect.cpp b/src/charselect.cpp
index 0a58bda..d7026dd 100644
--- a/src/charselect.cpp
+++ b/src/charselect.cpp
@@ -141,6 +141,7 @@ void Courtroom::set_char_select_page()
 
 void Courtroom::on_char_list_double_clicked(QTreeWidgetItem *p_item, int column)
 {
+  UNUSED(column);
   int cid = p_item->text(1).toInt();
   if (cid == -1 && !p_item->isExpanded()) {
     p_item->setExpanded(true);
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index d2483a8..2021671 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -4355,6 +4355,7 @@ void Courtroom::set_sfx_dropdown()
 
 void Courtroom::on_sfx_dropdown_changed(int p_index)
 {
+  UNUSED(p_index);
   ui_ic_chat_message->setFocus();
   ui_sfx_remove->hide();
   custom_sfx = "";
@@ -4716,6 +4717,7 @@ void Courtroom::music_stop()
 void Courtroom::on_area_list_double_clicked(QTreeWidgetItem *p_item, int column)
 {
   column = 0; // The metadata
+  UNUSED(column); // so gcc shuts up
   QString p_area = p_item->text(0);
 
   QStringList packet_contents;
diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp
index cf89d0a..5e29e21 100644
--- a/src/networkmanager.cpp
+++ b/src/networkmanager.cpp
@@ -131,7 +131,7 @@ void NetworkManager::on_srv_lookup()
       qDebug() << "Connecting to " << record.target() << ":" << record.port();
 #endif
       ms_socket->connectToHost(record.target(), record.port());
-      QTime timer;
+      QElapsedTimer timer;
       timer.start();
       do {
         ao_app->processEvents();