Update slots/signals to Qt5 connection style and eliminate some clazy warnings
This commit is contained in:
Salanto
parent
b8572f8afc
commit
bc49b3e976
@ -16,8 +16,8 @@ AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
|
||||
|
||||
net_manager = new NetworkManager(this);
|
||||
discord = new AttorneyOnline::Discord();
|
||||
QObject::connect(net_manager, SIGNAL(ms_connect_finished(bool, bool)),
|
||||
SLOT(ms_connect_finished(bool, bool)));
|
||||
connect(net_manager, &NetworkManager::ms_connect_finished,
|
||||
this, &AOApplication::ms_connect_finished);
|
||||
|
||||
asset_lookup_cache.reserve(2048);
|
||||
}
|
||||
|
||||
@ -23,10 +23,10 @@ AOCaseAnnouncerDialog::AOCaseAnnouncerDialog(QWidget *parent,
|
||||
ui_announcer_buttons->setStandardButtons(QDialogButtonBox::Ok |
|
||||
QDialogButtonBox::Cancel);
|
||||
|
||||
QObject::connect(ui_announcer_buttons, SIGNAL(accepted()), this,
|
||||
SLOT(ok_pressed()));
|
||||
QObject::connect(ui_announcer_buttons, SIGNAL(rejected()), this,
|
||||
SLOT(cancel_pressed()));
|
||||
connect(ui_announcer_buttons, &QDialogButtonBox::accepted, this,
|
||||
&AOCaseAnnouncerDialog::ok_pressed);
|
||||
connect(ui_announcer_buttons, &QDialogButtonBox::rejected, this,
|
||||
&AOCaseAnnouncerDialog::cancel_pressed);
|
||||
|
||||
setUpdatesEnabled(false);
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app,
|
||||
this->move(p_x, p_y);
|
||||
this->resize(p_w, p_h);
|
||||
|
||||
connect(this, SIGNAL(clicked()), this, SLOT(on_clicked()));
|
||||
connect(this, &AOEmoteButton::clicked, this, &AOEmoteButton::on_clicked);
|
||||
}
|
||||
|
||||
void AOEmoteButton::set_image(QString p_image, QString p_emote_comment)
|
||||
@ -67,4 +67,4 @@ void AOEmoteButton::set_char_image(QString p_char, int p_emote, QString suffix)
|
||||
this->set_image(image_path, ao_app->get_emote_comment(p_char, p_emote));
|
||||
}
|
||||
|
||||
void AOEmoteButton::on_clicked() { emote_clicked(m_id); }
|
||||
void AOEmoteButton::on_clicked() { emit emote_clicked(m_id); }
|
||||
|
||||
@ -27,7 +27,7 @@ AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app,
|
||||
this->resize(p_w, p_h);
|
||||
// this->setAcceptDrops(true);
|
||||
|
||||
connect(this, SIGNAL(clicked()), this, SLOT(on_clicked()));
|
||||
connect(this, &AOEvidenceButton::clicked, this, &AOEvidenceButton::on_clicked);
|
||||
}
|
||||
|
||||
void AOEvidenceButton::set_image(QString p_image)
|
||||
@ -80,12 +80,12 @@ void AOEvidenceButton::set_selected(bool p_selected)
|
||||
ui_selected->hide();
|
||||
}
|
||||
|
||||
void AOEvidenceButton::on_clicked() { evidence_clicked(m_id); }
|
||||
void AOEvidenceButton::on_clicked() { emit evidence_clicked(m_id); }
|
||||
|
||||
void AOEvidenceButton::mouseDoubleClickEvent(QMouseEvent *e)
|
||||
{
|
||||
QPushButton::mouseDoubleClickEvent(e);
|
||||
evidence_double_clicked(m_id);
|
||||
emit evidence_double_clicked(m_id);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -108,7 +108,7 @@ void AOEvidenceButton::enterEvent(QEvent *e)
|
||||
{
|
||||
ui_selector->show();
|
||||
|
||||
on_hover(m_id, true);
|
||||
emit on_hover(m_id, true);
|
||||
|
||||
setFlat(false);
|
||||
QPushButton::enterEvent(e);
|
||||
@ -118,6 +118,6 @@ void AOEvidenceButton::leaveEvent(QEvent *e)
|
||||
{
|
||||
ui_selector->hide();
|
||||
|
||||
on_hover(m_id, false);
|
||||
emit on_hover(m_id, false);
|
||||
QPushButton::leaveEvent(e);
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ AOEvidenceDisplay::AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app)
|
||||
|
||||
evidence_movie = new InterfaceLayer(this, ao_app);
|
||||
|
||||
connect(evidence_movie, SIGNAL(done()), this, SLOT(show_done()));
|
||||
connect(evidence_movie, &InterfaceLayer::done, this, &AOEvidenceDisplay::show_done);
|
||||
}
|
||||
|
||||
void AOEvidenceDisplay::show_evidence(QString p_evidence_image,
|
||||
|
||||
@ -12,16 +12,16 @@ AOLayer::AOLayer(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent)
|
||||
shfx_timer = new QTimer(this);
|
||||
shfx_timer->setTimerType(Qt::PreciseTimer);
|
||||
shfx_timer->setSingleShot(true);
|
||||
connect(shfx_timer, SIGNAL(timeout()), this, SLOT(shfx_timer_done()));
|
||||
connect(shfx_timer, &QTimer::timeout, this, &AOLayer::shfx_timer_done);
|
||||
|
||||
ticker = new QTimer(this);
|
||||
ticker->setTimerType(Qt::PreciseTimer);
|
||||
ticker->setSingleShot(false);
|
||||
connect(ticker, SIGNAL(timeout()), this, SLOT(movie_ticker()));
|
||||
connect(ticker, &QTimer::timeout, this, &AOLayer::movie_ticker);
|
||||
|
||||
preanim_timer = new QTimer(this);
|
||||
preanim_timer->setSingleShot(true);
|
||||
connect(preanim_timer, SIGNAL(timeout()), this, SLOT(preanim_done()));
|
||||
connect(preanim_timer, &QTimer::timeout, this, &AOLayer::preanim_done);
|
||||
}
|
||||
|
||||
BackgroundLayer::BackgroundLayer(QWidget *p_parent, AOApplication *p_ao_app)
|
||||
|
||||
@ -29,12 +29,12 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
|
||||
QDialogButtonBox::Save |
|
||||
QDialogButtonBox::RestoreDefaults);
|
||||
|
||||
QObject::connect(ui_settings_buttons, SIGNAL(accepted()), this,
|
||||
SLOT(save_pressed()));
|
||||
QObject::connect(ui_settings_buttons, SIGNAL(rejected()), this,
|
||||
SLOT(discard_pressed()));
|
||||
QObject::connect(ui_settings_buttons, SIGNAL(clicked(QAbstractButton*)), this,
|
||||
SLOT(button_clicked(QAbstractButton*)));
|
||||
connect(ui_settings_buttons, &QDialogButtonBox::accepted, this,
|
||||
&AOOptionsDialog::save_pressed);
|
||||
connect(ui_settings_buttons, &QDialogButtonBox::rejected, this,
|
||||
&AOOptionsDialog::discard_pressed);
|
||||
connect(ui_settings_buttons, &QDialogButtonBox::clicked, this,
|
||||
&AOOptionsDialog::button_clicked);
|
||||
|
||||
// We'll stop updates so that the window won't flicker while it's being made.
|
||||
setUpdatesEnabled(false);
|
||||
@ -90,8 +90,8 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
|
||||
}
|
||||
}
|
||||
|
||||
QObject::connect(ui_theme_combobox, SIGNAL(currentIndexChanged(int)), this,
|
||||
SLOT(theme_changed(int)));
|
||||
connect(ui_theme_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||
&AOOptionsDialog::theme_changed);
|
||||
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_theme_combobox);
|
||||
|
||||
row += 1;
|
||||
@ -124,8 +124,8 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
|
||||
ui_theme_reload_button->setToolTip(
|
||||
tr("Refresh the theme and update all of the ui elements to match."));
|
||||
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_theme_reload_button);
|
||||
QObject::connect(ui_theme_reload_button, SIGNAL(clicked()), this,
|
||||
SLOT(on_reload_theme_clicked()));
|
||||
connect(ui_theme_reload_button, &QPushButton::clicked, this,
|
||||
&AOOptionsDialog::on_reload_theme_clicked);
|
||||
|
||||
row += 1;
|
||||
ui_animated_theme_lbl = new QLabel(ui_form_layout_widget);
|
||||
@ -216,7 +216,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
|
||||
|
||||
ui_log_timestamp_cb = new QCheckBox(ui_form_layout_widget);
|
||||
|
||||
connect(ui_log_timestamp_cb, SIGNAL(stateChanged(int)), this, SLOT(timestamp_cb_changed(int)));
|
||||
connect(ui_log_timestamp_cb, &QCheckBox::stateChanged, this, &AOOptionsDialog::timestamp_cb_changed);
|
||||
|
||||
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_log_timestamp_cb);
|
||||
|
||||
@ -238,7 +238,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
|
||||
|
||||
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_log_timestamp_format_combobox);
|
||||
|
||||
connect(ui_log_timestamp_format_combobox, SIGNAL(currentTextChanged(QString)), this, SLOT(on_timestamp_format_edited()));
|
||||
connect(ui_log_timestamp_format_combobox, &QComboBox::currentTextChanged, this, &AOOptionsDialog::on_timestamp_format_edited);
|
||||
|
||||
if(!ao_app->get_log_timestamp())
|
||||
ui_log_timestamp_format_combobox->setDisabled(true);
|
||||
|
||||
@ -52,25 +52,25 @@ void Courtroom::construct_char_select()
|
||||
ui_char_taken->setText(tr("Taken"));
|
||||
ui_char_taken->setObjectName("ui_char_taken");
|
||||
|
||||
connect(ui_char_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
|
||||
this, SLOT(on_char_list_double_clicked(QTreeWidgetItem *, int)));
|
||||
connect(ui_char_list, &QTreeWidget::itemDoubleClicked,
|
||||
this, &Courtroom::on_char_list_double_clicked);
|
||||
|
||||
connect(ui_back_to_lobby, SIGNAL(clicked()), this,
|
||||
SLOT(on_back_to_lobby_clicked()));
|
||||
connect(ui_back_to_lobby, &AOButton::clicked, this,
|
||||
&Courtroom::on_back_to_lobby_clicked);
|
||||
|
||||
connect(ui_char_select_left, SIGNAL(clicked()), this,
|
||||
SLOT(on_char_select_left_clicked()));
|
||||
connect(ui_char_select_right, SIGNAL(clicked()), this,
|
||||
SLOT(on_char_select_right_clicked()));
|
||||
connect(ui_char_select_left, &AOButton::clicked, this,
|
||||
&Courtroom::on_char_select_left_clicked);
|
||||
connect(ui_char_select_right, &AOButton::clicked, this,
|
||||
&Courtroom::on_char_select_right_clicked);
|
||||
|
||||
connect(ui_spectator, SIGNAL(clicked()), this, SLOT(on_spectator_clicked()));
|
||||
connect(ui_spectator, &AOButton::clicked, this, &Courtroom::on_spectator_clicked);
|
||||
|
||||
connect(ui_char_search, SIGNAL(textEdited(const QString &)), this,
|
||||
SLOT(on_char_search_changed()));
|
||||
connect(ui_char_passworded, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(on_char_passworded_clicked()));
|
||||
connect(ui_char_taken, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(on_char_taken_clicked()));
|
||||
connect(ui_char_search, &QLineEdit::textEdited,this,
|
||||
&Courtroom::on_char_search_changed);
|
||||
connect(ui_char_passworded, &QCheckBox::stateChanged, this,
|
||||
&Courtroom::on_char_passworded_clicked);
|
||||
connect(ui_char_taken, &QCheckBox::stateChanged, this,
|
||||
&Courtroom::on_char_taken_clicked);
|
||||
|
||||
}
|
||||
|
||||
@ -116,7 +116,7 @@ void Courtroom::set_char_select_page()
|
||||
ui_char_select_left->hide();
|
||||
ui_char_select_right->hide();
|
||||
|
||||
for (AOCharButton *i_button : ui_char_button_list) {
|
||||
for (AOCharButton *i_button : qAsConst(ui_char_button_list)) {
|
||||
i_button->reset();
|
||||
i_button->hide();
|
||||
i_button->move(0, 0);
|
||||
@ -298,9 +298,9 @@ void Courtroom::character_loading_finished()
|
||||
100);
|
||||
ao_app->w_lobby->set_loading_value(loading_value);
|
||||
ao_app->w_lobby->set_loading_text(
|
||||
tr("Generating chars:\n%1/%2")
|
||||
.arg(QString::number(ao_app->generated_chars))
|
||||
.arg(QString::number(ao_app->char_list_size)));
|
||||
tr("Generating chars:\n%1/%2").arg(
|
||||
QString::number(ao_app->generated_chars),
|
||||
QString::number(ao_app->char_list_size)));
|
||||
}
|
||||
}
|
||||
ui_char_list->expandAll();
|
||||
|
||||
@ -7,7 +7,7 @@ chatlogpiece::chatlogpiece()
|
||||
message = tr("UNKNOWN");
|
||||
color = 0;
|
||||
action = "";
|
||||
datetime = QDateTime::currentDateTime().toUTC();
|
||||
datetime = QDateTime::currentDateTimeUtc();
|
||||
}
|
||||
|
||||
chatlogpiece::chatlogpiece(QString p_name, QString p_showname,
|
||||
@ -18,7 +18,7 @@ chatlogpiece::chatlogpiece(QString p_name, QString p_showname,
|
||||
message = p_message;
|
||||
action = p_action;
|
||||
color = p_color;
|
||||
datetime = QDateTime::currentDateTime().toUTC();
|
||||
datetime = QDateTime::currentDateTimeUtc();
|
||||
}
|
||||
|
||||
chatlogpiece::chatlogpiece(QString p_name, QString p_showname,
|
||||
|
||||
@ -399,154 +399,154 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
|
||||
|
||||
construct_char_select();
|
||||
|
||||
connect(keepalive_timer, SIGNAL(timeout()), this, SLOT(ping_server()));
|
||||
connect(keepalive_timer, &QTimer::timeout, this, &Courtroom::ping_server);
|
||||
|
||||
connect(ui_vp_objection, SIGNAL(done()), this, SLOT(objection_done()));
|
||||
connect(ui_vp_effect, SIGNAL(done()), this, SLOT(effect_done()));
|
||||
connect(ui_vp_wtce, SIGNAL(done()), this, SLOT(effect_done()));
|
||||
connect(ui_vp_player_char, SIGNAL(done()), this, SLOT(preanim_done()));
|
||||
connect(ui_vp_player_char, SIGNAL(shake()), this, SLOT(do_screenshake()));
|
||||
connect(ui_vp_player_char, SIGNAL(flash()), this, SLOT(do_flash()));
|
||||
connect(ui_vp_player_char, SIGNAL(play_sfx(QString)), this,
|
||||
SLOT(play_char_sfx(QString)));
|
||||
connect(ui_vp_objection, &SplashLayer::done, this, &Courtroom::objection_done);
|
||||
connect(ui_vp_effect, &EffectLayer::done, this, &Courtroom::effect_done);
|
||||
connect(ui_vp_wtce, &SplashLayer::done, this, &Courtroom::effect_done);
|
||||
connect(ui_vp_player_char, &CharLayer::done, this, &Courtroom::preanim_done);
|
||||
connect(ui_vp_player_char, &CharLayer::shake, this, &Courtroom::do_screenshake);
|
||||
connect(ui_vp_player_char, &CharLayer::flash, this, &Courtroom::do_flash);
|
||||
connect(ui_vp_player_char, &CharLayer::play_sfx, this,
|
||||
&Courtroom::play_char_sfx);
|
||||
|
||||
connect(text_delay_timer, SIGNAL(timeout()), this,
|
||||
SLOT(start_chat_ticking()));
|
||||
connect(text_delay_timer, &QTimer::timeout, this,
|
||||
&Courtroom::start_chat_ticking);
|
||||
|
||||
connect(text_queue_timer, SIGNAL(timeout()), this,
|
||||
SLOT(chatmessage_dequeue()));
|
||||
connect(text_queue_timer, &QTimer::timeout, this,
|
||||
&Courtroom::chatmessage_dequeue);
|
||||
|
||||
connect(sfx_delay_timer, SIGNAL(timeout()), this, SLOT(play_sfx()));
|
||||
connect(sfx_delay_timer, &QTimer::timeout, this, &Courtroom::play_sfx);
|
||||
|
||||
connect(chat_tick_timer, SIGNAL(timeout()), this, SLOT(chat_tick()));
|
||||
connect(chat_tick_timer, &QTimer::timeout, this, &Courtroom::chat_tick);
|
||||
|
||||
connect(ui_pos_dropdown, SIGNAL(currentIndexChanged(int)), this,
|
||||
SLOT(on_pos_dropdown_changed(int)));
|
||||
connect(ui_pos_dropdown, SIGNAL(editTextChanged(QString)), this,
|
||||
SLOT(on_pos_dropdown_changed(QString)));
|
||||
connect(ui_pos_remove, SIGNAL(clicked()), this, SLOT(on_pos_remove_clicked()));
|
||||
connect(ui_pos_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||
QOverload<int>::of(&Courtroom::on_pos_dropdown_changed));
|
||||
connect(ui_pos_dropdown, &QComboBox::editTextChanged, this,
|
||||
QOverload<QString>::of(&Courtroom::on_pos_dropdown_changed));
|
||||
connect(ui_pos_remove, &AOButton::clicked, this, &Courtroom::on_pos_remove_clicked);
|
||||
|
||||
connect(ui_iniswap_dropdown, SIGNAL(currentIndexChanged(int)), this,
|
||||
SLOT(on_iniswap_dropdown_changed(int)));
|
||||
connect(ui_iniswap_dropdown, SIGNAL(customContextMenuRequested(QPoint)), this,
|
||||
SLOT(on_iniswap_context_menu_requested(QPoint)));
|
||||
connect(ui_iniswap_remove, SIGNAL(clicked()), this,
|
||||
SLOT(on_iniswap_remove_clicked()));
|
||||
connect(ui_iniswap_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||
&Courtroom::on_iniswap_dropdown_changed);
|
||||
connect(ui_iniswap_dropdown, &QComboBox::customContextMenuRequested, this,
|
||||
&Courtroom::on_iniswap_context_menu_requested);
|
||||
connect(ui_iniswap_remove, &AOButton::clicked, this,
|
||||
&Courtroom::on_iniswap_remove_clicked);
|
||||
|
||||
connect(ui_sfx_dropdown, SIGNAL(currentIndexChanged(int)), this,
|
||||
SLOT(on_sfx_dropdown_changed(int)));
|
||||
connect(ui_sfx_dropdown, SIGNAL(editTextChanged(QString)), this,
|
||||
SLOT(on_sfx_dropdown_custom(QString)));
|
||||
connect(ui_sfx_dropdown, SIGNAL(customContextMenuRequested(QPoint)), this,
|
||||
SLOT(on_sfx_context_menu_requested(QPoint)));
|
||||
connect(ui_sfx_remove, SIGNAL(clicked()), this,
|
||||
SLOT(on_sfx_remove_clicked()));
|
||||
connect(ui_sfx_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||
&Courtroom::on_sfx_dropdown_changed);
|
||||
connect(ui_sfx_dropdown, &QComboBox::editTextChanged, this,
|
||||
&Courtroom::on_sfx_dropdown_custom);
|
||||
connect(ui_sfx_dropdown, &QComboBox::customContextMenuRequested, this,
|
||||
&Courtroom::on_sfx_context_menu_requested);
|
||||
connect(ui_sfx_remove, &AOButton::clicked, this,
|
||||
&Courtroom::on_sfx_remove_clicked);
|
||||
|
||||
connect(ui_effects_dropdown, SIGNAL(currentIndexChanged(int)), this,
|
||||
SLOT(on_effects_dropdown_changed(int)));
|
||||
connect(ui_effects_dropdown, SIGNAL(customContextMenuRequested(QPoint)), this,
|
||||
SLOT(on_effects_context_menu_requested(QPoint)));
|
||||
connect(ui_effects_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||
&Courtroom::on_effects_dropdown_changed);
|
||||
connect(ui_effects_dropdown, &QComboBox::customContextMenuRequested, this,
|
||||
&Courtroom::on_effects_context_menu_requested);
|
||||
|
||||
connect(ui_music_search, SIGNAL(returnPressed()), this,
|
||||
SLOT(on_music_search_return_pressed()));
|
||||
connect(ui_mute_list, SIGNAL(clicked(QModelIndex)), this,
|
||||
SLOT(on_mute_list_clicked(QModelIndex)));
|
||||
connect(ui_music_search, &QLineEdit::returnPressed, this,
|
||||
&Courtroom::on_music_search_return_pressed);
|
||||
connect(ui_mute_list, &QListWidget::clicked, this,
|
||||
&Courtroom::on_mute_list_clicked);
|
||||
|
||||
connect(ui_ic_chat_message, SIGNAL(returnPressed()), this,
|
||||
SLOT(on_chat_return_pressed()));
|
||||
connect(ui_ic_chat_message, &QLineEdit::returnPressed, this,
|
||||
&Courtroom::on_chat_return_pressed);
|
||||
|
||||
connect(ui_ooc_chat_message, SIGNAL(returnPressed()), this,
|
||||
SLOT(on_ooc_return_pressed()));
|
||||
connect(ui_ooc_chat_message, &QLineEdit::returnPressed, this,
|
||||
&Courtroom::on_ooc_return_pressed);
|
||||
|
||||
connect(ui_music_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
|
||||
this, SLOT(on_music_list_double_clicked(QTreeWidgetItem *, int)));
|
||||
connect(ui_music_list, SIGNAL(customContextMenuRequested(QPoint)), this,
|
||||
SLOT(on_music_list_context_menu_requested(QPoint)));
|
||||
connect(ui_music_list, &QTreeWidget::itemDoubleClicked,
|
||||
this, &Courtroom::on_music_list_double_clicked);
|
||||
connect(ui_music_list, &QTreeWidget::customContextMenuRequested, this,
|
||||
&Courtroom::on_music_list_context_menu_requested);
|
||||
|
||||
connect(ui_area_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this,
|
||||
SLOT(on_area_list_double_clicked(QTreeWidgetItem *, int)));
|
||||
connect(ui_area_list, &QTreeWidget::itemDoubleClicked, this,
|
||||
&Courtroom::on_area_list_double_clicked);
|
||||
|
||||
connect(ui_hold_it, SIGNAL(clicked()), this, SLOT(on_hold_it_clicked()));
|
||||
connect(ui_objection, SIGNAL(clicked()), this, SLOT(on_objection_clicked()));
|
||||
connect(ui_take_that, SIGNAL(clicked()), this, SLOT(on_take_that_clicked()));
|
||||
connect(ui_custom_objection, SIGNAL(clicked()), this,
|
||||
SLOT(on_custom_objection_clicked()));
|
||||
connect(ui_hold_it, &AOButton::clicked, this, &Courtroom::on_hold_it_clicked);
|
||||
connect(ui_objection, &AOButton::clicked, this, &Courtroom::on_objection_clicked);
|
||||
connect(ui_take_that, &AOButton::clicked, this, &Courtroom::on_take_that_clicked);
|
||||
connect(ui_custom_objection, &AOButton::clicked, this,
|
||||
&Courtroom::on_custom_objection_clicked);
|
||||
connect(ui_custom_objection,
|
||||
SIGNAL(customContextMenuRequested(const QPoint &)), this,
|
||||
SLOT(show_custom_objection_menu(const QPoint &)));
|
||||
&AOButton::customContextMenuRequested, this,
|
||||
&Courtroom::show_custom_objection_menu);
|
||||
|
||||
connect(ui_realization, SIGNAL(clicked()), this,
|
||||
SLOT(on_realization_clicked()));
|
||||
connect(ui_screenshake, SIGNAL(clicked()), this,
|
||||
SLOT(on_screenshake_clicked()));
|
||||
connect(ui_realization, &AOButton::clicked, this,
|
||||
&Courtroom::on_realization_clicked);
|
||||
connect(ui_screenshake, &AOButton::clicked, this,
|
||||
&Courtroom::on_screenshake_clicked);
|
||||
|
||||
connect(ui_mute, SIGNAL(clicked()), this, SLOT(on_mute_clicked()));
|
||||
connect(ui_mute, &AOButton::clicked, this, &Courtroom::on_mute_clicked);
|
||||
|
||||
connect(ui_defense_minus, SIGNAL(clicked()), this,
|
||||
SLOT(on_defense_minus_clicked()));
|
||||
connect(ui_defense_plus, SIGNAL(clicked()), this,
|
||||
SLOT(on_defense_plus_clicked()));
|
||||
connect(ui_prosecution_minus, SIGNAL(clicked()), this,
|
||||
SLOT(on_prosecution_minus_clicked()));
|
||||
connect(ui_prosecution_plus, SIGNAL(clicked()), this,
|
||||
SLOT(on_prosecution_plus_clicked()));
|
||||
connect(ui_defense_minus, &AOButton::clicked, this,
|
||||
&Courtroom::on_defense_minus_clicked);
|
||||
connect(ui_defense_plus, &AOButton::clicked, this,
|
||||
&Courtroom::on_defense_plus_clicked);
|
||||
connect(ui_prosecution_minus, &AOButton::clicked, this,
|
||||
&Courtroom::on_prosecution_minus_clicked);
|
||||
connect(ui_prosecution_plus, &AOButton::clicked, this,
|
||||
&Courtroom::on_prosecution_plus_clicked);
|
||||
|
||||
connect(ui_text_color, SIGNAL(currentIndexChanged(int)), this,
|
||||
SLOT(on_text_color_changed(int)));
|
||||
connect(ui_text_color, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||
&Courtroom::on_text_color_changed);
|
||||
|
||||
connect(ui_music_slider, SIGNAL(valueChanged(int)), this,
|
||||
SLOT(on_music_slider_moved(int)));
|
||||
connect(ui_sfx_slider, SIGNAL(valueChanged(int)), this,
|
||||
SLOT(on_sfx_slider_moved(int)));
|
||||
connect(ui_blip_slider, SIGNAL(valueChanged(int)), this,
|
||||
SLOT(on_blip_slider_moved(int)));
|
||||
connect(ui_music_slider, &QSlider::valueChanged, this,
|
||||
&Courtroom::on_music_slider_moved);
|
||||
connect(ui_sfx_slider, &QSlider::valueChanged, this,
|
||||
&Courtroom::on_sfx_slider_moved);
|
||||
connect(ui_blip_slider, &QSlider::valueChanged, this,
|
||||
&Courtroom::on_blip_slider_moved);
|
||||
|
||||
connect(ui_ooc_toggle, SIGNAL(clicked()), this,
|
||||
SLOT(on_ooc_toggle_clicked()));
|
||||
connect(ui_ooc_toggle, &AOButton::clicked, this,
|
||||
&Courtroom::on_ooc_toggle_clicked);
|
||||
|
||||
connect(ui_music_search, SIGNAL(textChanged(QString)), this,
|
||||
SLOT(on_music_search_edited(QString)));
|
||||
connect(ui_music_search, &QLineEdit::textChanged, this,
|
||||
&Courtroom::on_music_search_edited);
|
||||
|
||||
connect(ui_witness_testimony, SIGNAL(clicked()), this,
|
||||
SLOT(on_witness_testimony_clicked()));
|
||||
connect(ui_cross_examination, SIGNAL(clicked()), this,
|
||||
SLOT(on_cross_examination_clicked()));
|
||||
connect(ui_guilty, SIGNAL(clicked()), this, SLOT(on_guilty_clicked()));
|
||||
connect(ui_not_guilty, SIGNAL(clicked()), this,
|
||||
SLOT(on_not_guilty_clicked()));
|
||||
connect(ui_witness_testimony, &AOButton::clicked, this,
|
||||
&Courtroom::on_witness_testimony_clicked);
|
||||
connect(ui_cross_examination, &AOButton::clicked, this,
|
||||
&Courtroom::on_cross_examination_clicked);
|
||||
connect(ui_guilty, &AOButton::clicked, this, &Courtroom::on_guilty_clicked);
|
||||
connect(ui_not_guilty, &AOButton::clicked, this,
|
||||
&Courtroom::on_not_guilty_clicked);
|
||||
|
||||
connect(ui_change_character, SIGNAL(clicked()), this,
|
||||
SLOT(on_change_character_clicked()));
|
||||
connect(ui_reload_theme, SIGNAL(clicked()), this,
|
||||
SLOT(on_reload_theme_clicked()));
|
||||
connect(ui_call_mod, SIGNAL(clicked()), this, SLOT(on_call_mod_clicked()));
|
||||
connect(ui_settings, SIGNAL(clicked()), this, SLOT(on_settings_clicked()));
|
||||
connect(ui_announce_casing, SIGNAL(clicked()), this,
|
||||
SLOT(on_announce_casing_clicked()));
|
||||
connect(ui_switch_area_music, SIGNAL(clicked()), this,
|
||||
SLOT(on_switch_area_music_clicked()));
|
||||
connect(ui_change_character, &AOButton::clicked, this,
|
||||
&Courtroom::on_change_character_clicked);
|
||||
connect(ui_reload_theme, &AOButton::clicked, this,
|
||||
&Courtroom::on_reload_theme_clicked);
|
||||
connect(ui_call_mod, &AOButton::clicked, this, &Courtroom::on_call_mod_clicked);
|
||||
connect(ui_settings, &AOButton::clicked, this, &Courtroom::on_settings_clicked);
|
||||
connect(ui_announce_casing, &AOButton::clicked, this,
|
||||
&Courtroom::on_announce_casing_clicked);
|
||||
connect(ui_switch_area_music, &AOButton::clicked, this,
|
||||
&Courtroom::on_switch_area_music_clicked);
|
||||
|
||||
connect(ui_pre, SIGNAL(clicked()), this, SLOT(on_pre_clicked()));
|
||||
connect(ui_flip, SIGNAL(clicked()), this, SLOT(on_flip_clicked()));
|
||||
connect(ui_additive, SIGNAL(clicked()), this, SLOT(on_additive_clicked()));
|
||||
connect(ui_guard, SIGNAL(clicked()), this, SLOT(on_guard_clicked()));
|
||||
connect(ui_casing, SIGNAL(clicked()), this, SLOT(on_casing_clicked()));
|
||||
connect(ui_pre, &AOButton::clicked, this, &Courtroom::on_pre_clicked);
|
||||
connect(ui_flip, &AOButton::clicked, this, &Courtroom::on_flip_clicked);
|
||||
connect(ui_additive, &AOButton::clicked, this, &Courtroom::on_additive_clicked);
|
||||
connect(ui_guard, &AOButton::clicked, this, &Courtroom::on_guard_clicked);
|
||||
connect(ui_casing, &AOButton::clicked, this, &Courtroom::on_casing_clicked);
|
||||
|
||||
connect(ui_showname_enable, SIGNAL(clicked()), this,
|
||||
SLOT(on_showname_enable_clicked()));
|
||||
connect(ui_showname_enable, &AOButton::clicked, this,
|
||||
&Courtroom::on_showname_enable_clicked);
|
||||
|
||||
connect(ui_pair_button, SIGNAL(clicked()), this, SLOT(on_pair_clicked()));
|
||||
connect(ui_pair_list, SIGNAL(clicked(QModelIndex)), this,
|
||||
SLOT(on_pair_list_clicked(QModelIndex)));
|
||||
connect(ui_pair_offset_spinbox, SIGNAL(valueChanged(int)), this,
|
||||
SLOT(on_pair_offset_changed(int)));
|
||||
connect(ui_pair_vert_offset_spinbox, SIGNAL(valueChanged(int)), this,
|
||||
SLOT(on_pair_vert_offset_changed(int)));
|
||||
connect(ui_pair_order_dropdown, SIGNAL(currentIndexChanged(int)), this,
|
||||
SLOT(on_pair_order_dropdown_changed(int)));
|
||||
connect(ui_pair_button, &AOButton::clicked, this, &Courtroom::on_pair_clicked);
|
||||
connect(ui_pair_list, &QListWidget::clicked, this,
|
||||
&Courtroom::on_pair_list_clicked);
|
||||
connect(ui_pair_offset_spinbox, QOverload<int>::of(&QSpinBox::valueChanged), this,
|
||||
&Courtroom::on_pair_offset_changed);
|
||||
connect(ui_pair_vert_offset_spinbox, QOverload<int>::of(&QSpinBox::valueChanged), this,
|
||||
&Courtroom::on_pair_vert_offset_changed);
|
||||
connect(ui_pair_order_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||
&Courtroom::on_pair_order_dropdown_changed);
|
||||
|
||||
connect(ui_evidence_button, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_button_clicked()));
|
||||
connect(ui_evidence_button, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_button_clicked);
|
||||
|
||||
set_widgets();
|
||||
|
||||
@ -586,12 +586,12 @@ void Courtroom::set_mute_list()
|
||||
|
||||
QStringList sorted_mute_list;
|
||||
|
||||
for (char_type i_char : char_list)
|
||||
for (const char_type &i_char : qAsConst(char_list))
|
||||
sorted_mute_list.append(i_char.name);
|
||||
|
||||
sorted_mute_list.sort();
|
||||
|
||||
for (QString i_name : sorted_mute_list) {
|
||||
for (const QString &i_name : sorted_mute_list) {
|
||||
// mute_map.insert(i_name, false);
|
||||
ui_mute_list->addItem(i_name);
|
||||
}
|
||||
@ -601,12 +601,12 @@ void Courtroom::set_pair_list()
|
||||
{
|
||||
QStringList sorted_pair_list;
|
||||
|
||||
for (char_type i_char : char_list)
|
||||
for (const char_type &i_char : qAsConst(char_list))
|
||||
sorted_pair_list.append(i_char.name);
|
||||
|
||||
sorted_pair_list.sort();
|
||||
|
||||
for (QString i_name : sorted_pair_list) {
|
||||
for (const QString &i_name : sorted_pair_list) {
|
||||
ui_pair_list->addItem(i_name);
|
||||
}
|
||||
}
|
||||
@ -1337,7 +1337,7 @@ void Courtroom::set_background(QString p_background, bool display)
|
||||
|
||||
// Populate the dropdown list with all pos that exist on this bg
|
||||
QStringList pos_list = {};
|
||||
for (QString key : default_pos.keys()) {
|
||||
for (const QString &key : default_pos) {
|
||||
if (file_exists(ao_app->get_image_suffix(
|
||||
ao_app->get_background_path(default_pos[key]))) || // if we have 2.8-style positions, e.g. def.png, wit.webp, hld.apng
|
||||
file_exists(
|
||||
@ -1345,7 +1345,7 @@ void Courtroom::set_background(QString p_background, bool display)
|
||||
pos_list.append(default_pos[key]);
|
||||
}
|
||||
}
|
||||
for (QString pos : ao_app->read_design_ini("positions", ao_app->get_background_path("design.ini")).split(",")) {
|
||||
for (const QString &pos : ao_app->read_design_ini("positions", ao_app->get_background_path("design.ini")).split(",")) {
|
||||
if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(pos)))) {
|
||||
pos_list.append(pos);
|
||||
}
|
||||
@ -1762,7 +1762,7 @@ void Courtroom::append_server_chatmessage(QString p_name, QString p_message,
|
||||
ui_server_chatlog->append_chatmessage(p_name, p_message, color);
|
||||
|
||||
if (ao_app->get_auto_logging_enabled() && !ao_app->log_filename.isEmpty()) {
|
||||
QString full = "[OOC][" + QDateTime::currentDateTime().toUTC().toString() + "] " + p_name + ": " + p_message;
|
||||
QString full = "[OOC][" + QDateTime::currentDateTimeUtc().toString() + "] " + p_name + ": " + p_message;
|
||||
ao_app->append_to_file(full, ao_app->log_filename, true);
|
||||
}
|
||||
}
|
||||
@ -2201,7 +2201,7 @@ void Courtroom::log_chatmessage(QString f_message, int f_char_id, QString f_show
|
||||
objection_mod = f_objection_mod.toInt();
|
||||
}
|
||||
|
||||
QString f_custom_theme = ao_app->get_chat(f_char);
|
||||
//QString f_custom_theme = ao_app->get_chat(f_char);
|
||||
if (objection_mod <= 4 && objection_mod >= 1) {
|
||||
QString shout_message;
|
||||
switch (objection_mod) {
|
||||
@ -2763,7 +2763,7 @@ void Courtroom::handle_callwords()
|
||||
// Obtain the current call words (Really? It does File I/O on every single message???)
|
||||
QStringList call_words = ao_app->get_call_words();
|
||||
// Loop through each word in the call words list
|
||||
for (QString word : call_words) {
|
||||
for (const QString &word : qAsConst(call_words)) {
|
||||
// If our message contains that specific call word
|
||||
if (f_message.contains(word, Qt::CaseInsensitive)) {
|
||||
// Play the call word sfx on the modcall_player sound container
|
||||
@ -2783,7 +2783,7 @@ void Courtroom::display_evidence_image()
|
||||
if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) {
|
||||
// shifted by 1 because 0 is no evidence per legacy standards
|
||||
QString f_image = local_evidence_list.at(f_evi_id - 1).image;
|
||||
QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name;
|
||||
//QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name;
|
||||
// def jud and hlp should display the evidence icon on the RIGHT side
|
||||
bool is_left_side = !(side == "def" || side == "hlp" ||
|
||||
side == "jud" || side == "jur");
|
||||
@ -3887,7 +3887,7 @@ void Courtroom::handle_song(QStringList *p_contents)
|
||||
|
||||
void Courtroom::handle_wtce(QString p_wtce, int variant)
|
||||
{
|
||||
QString sfx_file = "courtroom_sounds.ini";
|
||||
//QString sfx_file = "courtroom_sounds.ini";
|
||||
QString bg_misc = ao_app->read_design_ini("misc", ao_app->get_background_path("design.ini"));
|
||||
QString sfx_name;
|
||||
QString filename;
|
||||
@ -4421,7 +4421,7 @@ void Courtroom::set_sfx_dropdown()
|
||||
ao_app->get_base_path() + "soundlist.ini");
|
||||
|
||||
QStringList display_sounds;
|
||||
for (QString sound : sound_list) {
|
||||
for (const QString &sound : qAsConst(sound_list)) {
|
||||
QStringList unpacked = sound.split("=");
|
||||
QString display = unpacked[0].trimmed();
|
||||
if (unpacked.size() > 1)
|
||||
@ -4666,7 +4666,7 @@ void Courtroom::on_pair_list_clicked(QModelIndex p_index)
|
||||
// Redo the character list.
|
||||
QStringList sorted_pair_list;
|
||||
|
||||
for (char_type i_char : char_list)
|
||||
for (const char_type &i_char : qAsConst(char_list))
|
||||
sorted_pair_list.append(i_char.name);
|
||||
|
||||
sorted_pair_list.sort();
|
||||
@ -4703,32 +4703,32 @@ void Courtroom::on_music_list_context_menu_requested(const QPoint &pos)
|
||||
{
|
||||
QMenu *menu = new QMenu(this);
|
||||
menu->setAttribute(Qt::WA_DeleteOnClose);
|
||||
menu->addAction(QString(tr("Stop Current Song")), this, SLOT(music_stop()));
|
||||
menu->addAction(QString(tr("Play Random Song")), this, SLOT(music_random()));
|
||||
menu->addAction(QString(tr("Stop Current Song")), this, &Courtroom::music_stop);
|
||||
menu->addAction(QString(tr("Play Random Song")), this, &Courtroom::music_random);
|
||||
menu->addSeparator();
|
||||
menu->addAction(QString(tr("Expand All Categories")), this,
|
||||
SLOT(music_list_expand_all()));
|
||||
&Courtroom::music_list_expand_all);
|
||||
menu->addAction(QString(tr("Collapse All Categories")), this,
|
||||
SLOT(music_list_collapse_all()));
|
||||
&Courtroom::music_list_collapse_all);
|
||||
menu->addSeparator();
|
||||
|
||||
menu->addAction(new QAction(tr("Fade Out Previous"), this));
|
||||
menu->actions().back()->setCheckable(true);
|
||||
menu->actions().back()->setChecked(music_flags & FADE_OUT);
|
||||
connect(menu->actions().back(), SIGNAL(toggled(bool)), this,
|
||||
SLOT(music_fade_out(bool)));
|
||||
connect(menu->actions().back(), &QAction::toggled, this,
|
||||
&Courtroom::music_fade_out);
|
||||
|
||||
menu->addAction(new QAction(tr("Fade In"), this));
|
||||
menu->actions().back()->setCheckable(true);
|
||||
menu->actions().back()->setChecked(music_flags & FADE_IN);
|
||||
connect(menu->actions().back(), SIGNAL(toggled(bool)), this,
|
||||
SLOT(music_fade_in(bool)));
|
||||
connect(menu->actions().back(), &QAction::toggled, this,
|
||||
&Courtroom::music_fade_in);
|
||||
|
||||
menu->addAction(new QAction(tr("Synchronize"), this));
|
||||
menu->actions().back()->setCheckable(true);
|
||||
menu->actions().back()->setChecked(music_flags & SYNC_POS);
|
||||
connect(menu->actions().back(), SIGNAL(toggled(bool)), this,
|
||||
SLOT(music_synchronize(bool)));
|
||||
connect(menu->actions().back(), &QAction::toggled, this,
|
||||
&Courtroom::music_synchronize);
|
||||
|
||||
menu->popup(ui_music_list->mapToGlobal(pos));
|
||||
}
|
||||
@ -4793,7 +4793,7 @@ void Courtroom::music_stop(bool no_effects)
|
||||
// If the fake song is not present in the music list
|
||||
if (!music_list.contains(fake_song)) {
|
||||
// Loop through our music list
|
||||
for (QString song : music_list) {
|
||||
for (const QString &song : qAsConst(music_list)) {
|
||||
// Pick first song that does not contain a file extension
|
||||
if (!song.contains('.')) {
|
||||
// Use it as a fake song as the server we're working with must recognize song categories
|
||||
|
||||
@ -97,7 +97,7 @@ void DemoServer::recv_data()
|
||||
QStringList packet_list =
|
||||
in_data.split("%", QString::SplitBehavior(QString::SkipEmptyParts));
|
||||
|
||||
for (QString packet : packet_list) {
|
||||
for (const QString &packet : packet_list) {
|
||||
AOPacket ao_packet(packet);
|
||||
handle_packet(ao_packet);
|
||||
}
|
||||
@ -297,7 +297,7 @@ void DemoServer::load_demo(QString filename)
|
||||
QTextStream out(&demo_file);
|
||||
out.setCodec("UTF-8");
|
||||
out << p_demo_data.dequeue();
|
||||
for (QString line : p_demo_data) {
|
||||
for (const QString &line : qAsConst(p_demo_data)) {
|
||||
out << "\n" << line;
|
||||
}
|
||||
demo_file.flush();
|
||||
|
||||
@ -15,13 +15,13 @@ void Courtroom::initialize_emotes()
|
||||
ui_emote_dropdown = new QComboBox(this);
|
||||
ui_emote_dropdown->setObjectName("ui_emote_dropdown");
|
||||
|
||||
connect(ui_emote_left, SIGNAL(clicked()), this,
|
||||
SLOT(on_emote_left_clicked()));
|
||||
connect(ui_emote_right, SIGNAL(clicked()), this,
|
||||
SLOT(on_emote_right_clicked()));
|
||||
connect(ui_emote_left, &AOButton::clicked, this,
|
||||
&Courtroom::on_emote_left_clicked);
|
||||
connect(ui_emote_right, &AOButton::clicked, this,
|
||||
&Courtroom::on_emote_right_clicked);
|
||||
|
||||
connect(ui_emote_dropdown, SIGNAL(activated(int)), this,
|
||||
SLOT(on_emote_dropdown_changed(int)));
|
||||
connect(ui_emote_dropdown, QOverload<int>::of(&QComboBox::activated), this,
|
||||
&Courtroom::on_emote_dropdown_changed);
|
||||
}
|
||||
|
||||
void Courtroom::refresh_emotes()
|
||||
@ -74,8 +74,8 @@ void Courtroom::refresh_emotes()
|
||||
|
||||
f_emote->set_id(n);
|
||||
|
||||
connect(f_emote, SIGNAL(emote_clicked(int)), this,
|
||||
SLOT(on_emote_clicked(int)));
|
||||
connect(f_emote, &AOEmoteButton::emote_clicked, this,
|
||||
&Courtroom::on_emote_clicked);
|
||||
|
||||
++x_mod_count;
|
||||
|
||||
@ -96,7 +96,7 @@ void Courtroom::set_emote_page()
|
||||
ui_emote_left->hide();
|
||||
ui_emote_right->hide();
|
||||
|
||||
for (AOEmoteButton *i_button : ui_emote_list) {
|
||||
for (AOEmoteButton *i_button : qAsConst(ui_emote_list)) {
|
||||
i_button->hide();
|
||||
}
|
||||
|
||||
|
||||
@ -71,41 +71,41 @@ void Courtroom::initialize_evidence()
|
||||
ui_evidence_edit->setToolTip(tr("Edit this piece of evidence."));
|
||||
ui_evidence_edit->setObjectName("ui_evidence_edit");
|
||||
|
||||
connect(ui_evidence_name, SIGNAL(returnPressed()), this,
|
||||
SLOT(on_evidence_name_edited()));
|
||||
connect(ui_evidence_left, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_left_clicked()));
|
||||
connect(ui_evidence_right, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_right_clicked()));
|
||||
connect(ui_evidence_present, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_present_clicked()));
|
||||
connect(ui_evidence_switch, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_switch_clicked()));
|
||||
connect(ui_evidence_transfer, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_transfer_clicked()));
|
||||
connect(ui_evidence_save, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_save_clicked()));
|
||||
connect(ui_evidence_load, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_load_clicked()));
|
||||
connect(ui_evidence_name, &QLineEdit::returnPressed, this,
|
||||
&Courtroom::on_evidence_name_edited);
|
||||
connect(ui_evidence_left, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_left_clicked);
|
||||
connect(ui_evidence_right, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_right_clicked);
|
||||
connect(ui_evidence_present, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_present_clicked);
|
||||
connect(ui_evidence_switch, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_switch_clicked);
|
||||
connect(ui_evidence_transfer, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_transfer_clicked);
|
||||
connect(ui_evidence_save, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_save_clicked);
|
||||
connect(ui_evidence_load, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_load_clicked);
|
||||
|
||||
connect(ui_evidence_delete, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_delete_clicked()));
|
||||
connect(ui_evidence_image_name, SIGNAL(returnPressed()), this,
|
||||
SLOT(on_evidence_image_name_edited()));
|
||||
connect(ui_evidence_image_button, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_image_button_clicked()));
|
||||
connect(ui_evidence_x, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_x_clicked()));
|
||||
connect(ui_evidence_ok, SIGNAL(clicked()), this,
|
||||
SLOT(on_evidence_ok_clicked()));
|
||||
connect(ui_evidence_delete, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_delete_clicked);
|
||||
connect(ui_evidence_image_name, &QLineEdit::returnPressed, this,
|
||||
&Courtroom::on_evidence_image_name_edited);
|
||||
connect(ui_evidence_image_button, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_image_button_clicked);
|
||||
connect(ui_evidence_x, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_x_clicked);
|
||||
connect(ui_evidence_ok, &AOButton::clicked, this,
|
||||
&Courtroom::on_evidence_ok_clicked);
|
||||
|
||||
connect(ui_evidence_name, SIGNAL(textChanged(QString)), this,
|
||||
SLOT(on_evidence_edited()));
|
||||
connect(ui_evidence_image_name, SIGNAL(textChanged(QString)), this,
|
||||
SLOT(on_evidence_edited()));
|
||||
connect(ui_evidence_description, SIGNAL(textChanged()), this,
|
||||
SLOT(on_evidence_edited()));
|
||||
connect(ui_evidence_edit, SIGNAL(clicked()), this, SLOT(on_evidence_edit_clicked()));
|
||||
connect(ui_evidence_name, &QLineEdit::textChanged, this,
|
||||
&Courtroom::on_evidence_edited);
|
||||
connect(ui_evidence_image_name, &QLineEdit::textChanged, this,
|
||||
&Courtroom::on_evidence_image_name_edited);
|
||||
connect(ui_evidence_description, &QPlainTextEdit::textChanged, this,
|
||||
&Courtroom::on_evidence_edited);
|
||||
connect(ui_evidence_edit, &AOButton::clicked, this, &Courtroom::on_evidence_edit_clicked);
|
||||
|
||||
ui_evidence->hide();
|
||||
}
|
||||
@ -236,12 +236,12 @@ void Courtroom::refresh_evidence()
|
||||
|
||||
f_evidence->set_id(n);
|
||||
|
||||
connect(f_evidence, SIGNAL(evidence_clicked(int)), this,
|
||||
SLOT(on_evidence_clicked(int)));
|
||||
connect(f_evidence, SIGNAL(evidence_double_clicked(int)), this,
|
||||
SLOT(on_evidence_double_clicked(int)));
|
||||
connect(f_evidence, SIGNAL(on_hover(int, bool)), this,
|
||||
SLOT(on_evidence_hover(int, bool)));
|
||||
connect(f_evidence, &AOEvidenceButton::evidence_clicked, this,
|
||||
&Courtroom::on_evidence_clicked);
|
||||
connect(f_evidence, &AOEvidenceButton::evidence_double_clicked, this,
|
||||
&Courtroom::on_evidence_double_clicked);
|
||||
connect(f_evidence, &AOEvidenceButton::on_hover, this,
|
||||
&Courtroom::on_evidence_hover);
|
||||
|
||||
++x_mod_count;
|
||||
|
||||
@ -290,7 +290,11 @@ void Courtroom::set_evidence_list(QVector<evi_type> &p_evi_list)
|
||||
msgBox->setDetailedText(tr(
|
||||
"Name: %1\n"
|
||||
"Image: %2\n"
|
||||
"Description:\n%3").arg(local_evidence_list.at(current_evidence).name).arg(local_evidence_list.at(current_evidence).image).arg(local_evidence_list.at(current_evidence).description));
|
||||
"Description:\n%3").arg(
|
||||
local_evidence_list.at(current_evidence).name,
|
||||
local_evidence_list.at(current_evidence).image,
|
||||
local_evidence_list.at(current_evidence).description)
|
||||
);
|
||||
msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
||||
msgBox->setDefaultButton(QMessageBox::LastButton);
|
||||
// msgBox->setWindowModality(Qt::NonModal);
|
||||
@ -318,7 +322,7 @@ void Courtroom::set_evidence_page()
|
||||
ui_evidence_left->hide();
|
||||
ui_evidence_right->hide();
|
||||
|
||||
for (AOEvidenceButton *i_button : ui_evidence_list) {
|
||||
for (AOEvidenceButton *i_button : qAsConst(ui_evidence_list)) {
|
||||
i_button->hide();
|
||||
}
|
||||
|
||||
@ -438,7 +442,7 @@ void Courtroom::on_evidence_clicked(int p_id)
|
||||
|
||||
ui_evidence_name->setText(local_evidence_list.at(f_real_id).name);
|
||||
|
||||
for (AOEvidenceButton *i_button : ui_evidence_list)
|
||||
for (AOEvidenceButton *i_button : qAsConst(ui_evidence_list))
|
||||
i_button->set_selected(false);
|
||||
|
||||
ui_evidence_list.at(p_id)->set_selected(true);
|
||||
|
||||
@ -75,28 +75,28 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
|
||||
ui_cancel = new AOButton(ui_loading_background, ao_app);
|
||||
ui_cancel->setObjectName("ui_cancel");
|
||||
|
||||
connect(ui_public_servers, SIGNAL(clicked()), this,
|
||||
SLOT(on_public_servers_clicked()));
|
||||
connect(ui_favorites, SIGNAL(clicked()), this, SLOT(on_favorites_clicked()));
|
||||
connect(ui_refresh, SIGNAL(pressed()), this, SLOT(on_refresh_pressed()));
|
||||
connect(ui_refresh, SIGNAL(released()), this, SLOT(on_refresh_released()));
|
||||
connect(ui_add_to_fav, SIGNAL(pressed()), this,
|
||||
SLOT(on_add_to_fav_pressed()));
|
||||
connect(ui_add_to_fav, SIGNAL(released()), this,
|
||||
SLOT(on_add_to_fav_released()));
|
||||
connect(ui_connect, SIGNAL(pressed()), this, SLOT(on_connect_pressed()));
|
||||
connect(ui_connect, SIGNAL(released()), this, SLOT(on_connect_released()));
|
||||
connect(ui_about, SIGNAL(clicked()), this, SLOT(on_about_clicked()));
|
||||
connect(ui_settings, SIGNAL(clicked()), this, SLOT(on_settings_clicked()));
|
||||
connect(ui_server_list, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this,
|
||||
SLOT(on_server_list_clicked(QTreeWidgetItem *, int)));
|
||||
connect(ui_server_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
|
||||
this, SLOT(on_server_list_doubleclicked(QTreeWidgetItem *, int)));
|
||||
connect(ui_server_search, SIGNAL(textChanged(QString)), this,
|
||||
SLOT(on_server_search_edited(QString)));
|
||||
connect(ui_chatmessage, SIGNAL(returnPressed()), this,
|
||||
SLOT(on_chatfield_return_pressed()));
|
||||
connect(ui_cancel, SIGNAL(clicked()), ao_app, SLOT(loading_cancelled()));
|
||||
connect(ui_public_servers, &AOButton::clicked, this,
|
||||
&Lobby::on_public_servers_clicked);
|
||||
connect(ui_favorites, &AOButton::clicked, this, &Lobby::on_favorites_clicked);
|
||||
connect(ui_refresh, &AOButton::pressed, this, &Lobby::on_refresh_pressed);
|
||||
connect(ui_refresh, &AOButton::released, this, &Lobby::on_refresh_released);
|
||||
connect(ui_add_to_fav, &AOButton::pressed, this,
|
||||
&Lobby::on_add_to_fav_pressed);
|
||||
connect(ui_add_to_fav, &AOButton::released, this,
|
||||
&Lobby::on_add_to_fav_released);
|
||||
connect(ui_connect, &AOButton::pressed, this, &Lobby::on_connect_pressed);
|
||||
connect(ui_connect, &AOButton::released, this, &Lobby::on_connect_released);
|
||||
connect(ui_about, &AOButton::clicked, this, &Lobby::on_about_clicked);
|
||||
connect(ui_settings, &AOButton::clicked, this, &Lobby::on_settings_clicked);
|
||||
connect(ui_server_list, &QTreeWidget::itemClicked, this,
|
||||
&Lobby::on_server_list_clicked);
|
||||
connect(ui_server_list, &QTreeWidget::itemDoubleClicked,
|
||||
this, &Lobby::on_server_list_doubleclicked);
|
||||
connect(ui_server_search, &QLineEdit::textChanged, this,
|
||||
&Lobby::on_server_search_edited);
|
||||
connect(ui_chatmessage, &QLineEdit::returnPressed, this,
|
||||
&Lobby::on_chatfield_return_pressed);
|
||||
connect(ui_cancel, &AOButton::clicked, ao_app, &AOApplication::loading_cancelled);
|
||||
|
||||
ui_connect->setEnabled(false);
|
||||
|
||||
@ -517,7 +517,7 @@ void Lobby::list_servers()
|
||||
ui_server_search->setText("");
|
||||
|
||||
int i = 0;
|
||||
for (server_type i_server : ao_app->get_server_list()) {
|
||||
for (const server_type &i_server : qAsConst(ao_app->get_server_list())) {
|
||||
QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_server_list);
|
||||
treeItem->setData(0, Qt::DisplayRole, i);
|
||||
treeItem->setText(1, i_server.name);
|
||||
@ -533,7 +533,7 @@ void Lobby::list_favorites()
|
||||
ui_server_list->clear();
|
||||
|
||||
int i = 0;
|
||||
for (server_type i_server : ao_app->get_favorite_list()) {
|
||||
for (const server_type &i_server : qAsConst(ao_app->get_favorite_list())) {
|
||||
QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_server_list);
|
||||
treeItem->setData(0, Qt::DisplayRole, i);
|
||||
treeItem->setText(1, i_server.name);
|
||||
@ -557,9 +557,9 @@ void Lobby::append_error(QString f_message)
|
||||
|
||||
void Lobby::set_player_count(int players_online, int max_players)
|
||||
{
|
||||
QString f_string = tr("Online: %1/%2")
|
||||
.arg(QString::number(players_online))
|
||||
.arg(QString::number(max_players));
|
||||
QString f_string = tr("Online: %1/%2").arg(
|
||||
QString::number(players_online),
|
||||
QString::number(max_players));
|
||||
ui_player_count->setText(f_string);
|
||||
}
|
||||
|
||||
|
||||
@ -13,15 +13,15 @@ NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
|
||||
|
||||
ms_reconnect_timer = new QTimer(this);
|
||||
ms_reconnect_timer->setSingleShot(true);
|
||||
QObject::connect(ms_reconnect_timer, SIGNAL(timeout()), this,
|
||||
SLOT(retry_ms_connect()));
|
||||
connect(ms_reconnect_timer, &QTimer::timeout, this,
|
||||
&NetworkManager::retry_ms_connect);
|
||||
|
||||
QObject::connect(ms_socket, SIGNAL(readyRead()), this,
|
||||
SLOT(handle_ms_packet()));
|
||||
QObject::connect(server_socket, SIGNAL(readyRead()), this,
|
||||
SLOT(handle_server_packet()));
|
||||
QObject::connect(server_socket, SIGNAL(disconnected()), ao_app,
|
||||
SLOT(server_disconnected()));
|
||||
connect(ms_socket, &QTcpSocket::readyRead, this,
|
||||
&NetworkManager::handle_ms_packet);
|
||||
connect(server_socket, &QTcpSocket::readyRead, this,
|
||||
&NetworkManager::handle_server_packet);
|
||||
connect(server_socket, &QTcpSocket::disconnected, ao_app,
|
||||
&AOApplication::server_disconnected);
|
||||
|
||||
QString master_config =
|
||||
ao_app->configini->value("master", "").value<QString>();
|
||||
@ -45,11 +45,11 @@ void NetworkManager::connect_to_master()
|
||||
|
||||
void NetworkManager::connect_to_master_nosrv()
|
||||
{
|
||||
QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
|
||||
SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
|
||||
connect(ms_socket, &QTcpSocket::errorOccurred, this,
|
||||
&NetworkManager::on_ms_socket_error);
|
||||
|
||||
QObject::connect(ms_socket, SIGNAL(connected()), this,
|
||||
SLOT(on_ms_nosrv_connect_success()));
|
||||
connect(ms_socket, &QTcpSocket::connected, this,
|
||||
&NetworkManager::on_ms_nosrv_connect_success);
|
||||
ms_socket->connectToHost(ms_nosrv_hostname, ms_port);
|
||||
}
|
||||
|
||||
@ -110,7 +110,7 @@ void NetworkManager::perform_srv_lookup()
|
||||
#ifdef MS_FAILOVER_SUPPORTED
|
||||
ms_dns = new QDnsLookup(QDnsLookup::SRV, ms_srv_hostname, this);
|
||||
|
||||
connect(ms_dns, SIGNAL(finished()), this, SLOT(on_srv_lookup()));
|
||||
connect(ms_dns, &QDnsLookup::finished, this, &NetworkManager::on_srv_lookup);
|
||||
ms_dns->lookup();
|
||||
#endif
|
||||
}
|
||||
@ -155,9 +155,9 @@ void NetworkManager::on_srv_lookup()
|
||||
if (connected) {
|
||||
// Connect a one-shot signal in case the master server disconnects
|
||||
// randomly
|
||||
QObject::connect(
|
||||
ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
|
||||
SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
|
||||
connect(
|
||||
ms_socket, &QTcpSocket::errorOccurred, this,
|
||||
&NetworkManager::on_ms_socket_error);
|
||||
break;
|
||||
}
|
||||
else {
|
||||
@ -179,11 +179,11 @@ void NetworkManager::on_ms_nosrv_connect_success()
|
||||
{
|
||||
emit ms_connect_finished(true, false);
|
||||
|
||||
QObject::disconnect(ms_socket, SIGNAL(connected()), this,
|
||||
SLOT(on_ms_nosrv_connect_success()));
|
||||
disconnect(ms_socket, &QTcpSocket::connected, this,
|
||||
&NetworkManager::on_ms_nosrv_connect_success);
|
||||
|
||||
QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
|
||||
SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
|
||||
connect(ms_socket, &QTcpSocket::errorOccurred, this,
|
||||
&NetworkManager::on_ms_socket_error);
|
||||
}
|
||||
|
||||
void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
|
||||
@ -193,9 +193,8 @@ void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
|
||||
|
||||
// Disconnect the one-shot signal - this way, failover connect attempts
|
||||
// don't trigger a full retry
|
||||
QObject::disconnect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)),
|
||||
this,
|
||||
SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
|
||||
disconnect(ms_socket, &QTcpSocket::errorOccurred, this,
|
||||
&NetworkManager::on_ms_socket_error);
|
||||
|
||||
emit ms_connect_finished(false, true);
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ ScrollText::ScrollText(QWidget *parent) : QWidget(parent), scrollPos(0)
|
||||
|
||||
setSeparator(" --- ");
|
||||
|
||||
connect(&timer, SIGNAL(timeout()), this, SLOT(timer_timeout()));
|
||||
connect(&timer, &QTimer::timeout, this, &ScrollText::timer_timeout);
|
||||
timer.setInterval(50);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user