unused macro and update QTime to QElapsedTimer (#417)
This commit is contained in:
parent
75c1df5312
commit
21b4aa5072
@ -1,6 +1,8 @@
|
|||||||
#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"
|
||||||
|
@ -186,6 +186,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);
|
||||||
|
UNUSED(channel);
|
||||||
|
UNUSED(data);
|
||||||
|
UNUSED(user);
|
||||||
doBASSreset();
|
doBASSreset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,6 +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);
|
||||||
|
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);
|
||||||
|
@ -141,6 +141,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);
|
||||||
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);
|
||||||
|
@ -4355,6 +4355,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);
|
||||||
ui_ic_chat_message->setFocus();
|
ui_ic_chat_message->setFocus();
|
||||||
ui_sfx_remove->hide();
|
ui_sfx_remove->hide();
|
||||||
custom_sfx = "";
|
custom_sfx = "";
|
||||||
@ -4716,6 +4717,7 @@ void Courtroom::music_stop()
|
|||||||
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
|
||||||
QString p_area = p_item->text(0);
|
QString p_area = p_item->text(0);
|
||||||
|
|
||||||
QStringList packet_contents;
|
QStringList packet_contents;
|
||||||
|
@ -131,7 +131,7 @@ void NetworkManager::on_srv_lookup()
|
|||||||
qDebug() << "Connecting to " << record.target() << ":" << record.port();
|
qDebug() << "Connecting to " << record.target() << ":" << record.port();
|
||||||
#endif
|
#endif
|
||||||
ms_socket->connectToHost(record.target(), record.port());
|
ms_socket->connectToHost(record.target(), record.port());
|
||||||
QTime timer;
|
QElapsedTimer timer;
|
||||||
timer.start();
|
timer.start();
|
||||||
do {
|
do {
|
||||||
ao_app->processEvents();
|
ao_app->processEvents();
|
||||||
|
Loading…
Reference in New Issue
Block a user