Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swap out custom UNUSED macro for Q_UNUSED

Browse Source
This commit is contained in:
in1tiate 2021-07-29 08:54:34 -05:00
parent a4b5023088
commit 15f0ee3838
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aoapplication.h
View File

@ -1,8 +1,6 @@
#ifndef AOAPPLICATION_H #ifndef AOAPPLICATION_H
#define AOAPPLICATION_H #define AOAPPLICATION_H
#define UNUSED(x) (void)(x)
#include "aopacket.h" #include "aopacket.h"
#include "datatypes.h" #include "datatypes.h"
#include "demoserver.h" #include "demoserver.h"

8
src/aoapplication.cpp
View File

@ -198,10 +198,10 @@ void AOApplication::call_announce_menu(Courtroom *court)
void CALLBACK AOApplication::BASSreset(HSTREAM handle, DWORD channel, void CALLBACK AOApplication::BASSreset(HSTREAM handle, DWORD channel,
DWORD data, void *user) DWORD data, void *user)
{ {
UNUSED(handle); Q_UNUSED(handle);
UNUSED(channel); Q_UNUSED(channel);
UNUSED(data); Q_UNUSED(data);
UNUSED(user); Q_UNUSED(user);
doBASSreset(); doBASSreset();
} }

4
src/aomusicplayer.cpp
View File

@ -150,8 +150,8 @@ void AOMusicPlayer::set_volume(int p_value, int channel)
void CALLBACK loopProc(HSYNC handle, DWORD channel, DWORD data, void *user) void CALLBACK loopProc(HSYNC handle, DWORD channel, DWORD data, void *user)
{ {
UNUSED(handle); Q_UNUSED(handle);
UNUSED(data); Q_UNUSED(data);
QWORD loop_start = *(static_cast<unsigned *>(user)); QWORD loop_start = *(static_cast<unsigned *>(user));
BASS_ChannelLock(channel, true); BASS_ChannelLock(channel, true);
BASS_ChannelSetPosition(channel, loop_start, BASS_POS_BYTE); BASS_ChannelSetPosition(channel, loop_start, BASS_POS_BYTE);

2
src/charselect.cpp
View File

@ -147,7 +147,7 @@ void Courtroom::set_char_select_page()
void Courtroom::on_char_list_double_clicked(QTreeWidgetItem *p_item, int column) void Courtroom::on_char_list_double_clicked(QTreeWidgetItem *p_item, int column)
{ {
UNUSED(column); Q_UNUSED(column);
int cid = p_item->text(1).toInt(); int cid = p_item->text(1).toInt();
if (cid == -1 && !p_item->isExpanded()) { if (cid == -1 && !p_item->isExpanded()) {
p_item->setExpanded(true); p_item->setExpanded(true);

4
src/courtroom.cpp
View File

@ -4584,7 +4584,7 @@ void Courtroom::set_sfx_dropdown()
void Courtroom::on_sfx_dropdown_changed(int p_index) void Courtroom::on_sfx_dropdown_changed(int p_index)
{ {
UNUSED(p_index); Q_UNUSED(p_index);
ui_ic_chat_message->setFocus(); ui_ic_chat_message->setFocus();
ui_sfx_remove->hide(); ui_sfx_remove->hide();
custom_sfx = ""; custom_sfx = "";
@ -4964,7 +4964,7 @@ void Courtroom::music_stop(bool no_effects)
void Courtroom::on_area_list_double_clicked(QTreeWidgetItem *p_item, int column) void Courtroom::on_area_list_double_clicked(QTreeWidgetItem *p_item, int column)
{ {
column = 0; // The metadata column = 0; // The metadata
UNUSED(column); // so gcc shuts up Q_UNUSED(column); // so gcc shuts up
QString p_area = p_item->text(0); QString p_area = p_item->text(0);
QStringList packet_contents; QStringList packet_contents;