diff --git a/cockatrice/src/client/tabs/tab_admin.cpp b/cockatrice/src/client/tabs/tab_admin.cpp index 7ef059423..f8745fa4e 100644 --- a/cockatrice/src/client/tabs/tab_admin.cpp +++ b/cockatrice/src/client/tabs/tab_admin.cpp @@ -191,7 +191,7 @@ void TabAdmin::actForceActivateUser() client->sendCommand(pend); } -void TabAdmin::grantReplayAccessProcessResponse(const Response &response, const CommandContainer &, const QVariant &) +void TabAdmin::grantReplayAccessProcessResponse(const Response &response) { auto *event = new Event_ReplayAdded(); @@ -209,7 +209,7 @@ void TabAdmin::grantReplayAccessProcessResponse(const Response &response, const } } -void TabAdmin::activateUserProcessResponse(const Response &response, const CommandContainer &, const QVariant &) +void TabAdmin::activateUserProcessResponse(const Response &response) { switch (response.response_code()) { case Response::RespActivationAccepted: diff --git a/cockatrice/src/client/tabs/tab_admin.h b/cockatrice/src/client/tabs/tab_admin.h index f360c01d6..9034718e2 100644 --- a/cockatrice/src/client/tabs/tab_admin.h +++ b/cockatrice/src/client/tabs/tab_admin.h @@ -47,8 +47,8 @@ private slots: void actReloadConfig(); void actGrantReplayAccess(); void actForceActivateUser(); - void grantReplayAccessProcessResponse(const Response &resp, const CommandContainer &, const QVariant &); - void activateUserProcessResponse(const Response &response, const CommandContainer &, const QVariant &); + void grantReplayAccessProcessResponse(const Response &response); + void activateUserProcessResponse(const Response &response); void actUnlock(); void actLock(); diff --git a/cockatrice/src/game/game_selector.cpp b/cockatrice/src/game/game_selector.cpp index 62d3957a7..67d938554 100644 --- a/cockatrice/src/game/game_selector.cpp +++ b/cockatrice/src/game/game_selector.cpp @@ -194,9 +194,7 @@ void GameSelector::actCreate() updateTitle(); } -void GameSelector::checkResponse(const Response &response, - const CommandContainer & /* commandContainer */, - const QVariant & /* extraData */) +void GameSelector::checkResponse(const Response &response) { // NB: We re-enable buttons for the currently selected game, which may not // be the same game as the one for which we are processing a response. diff --git a/cockatrice/src/game/game_selector.h b/cockatrice/src/game/game_selector.h index e43c03692..b65ceb3f3 100644 --- a/cockatrice/src/game/game_selector.h +++ b/cockatrice/src/game/game_selector.h @@ -29,7 +29,7 @@ private slots: void actCreate(); void actJoin(); void actSelectedGameChanged(const QModelIndex ¤t, const QModelIndex &previous); - void checkResponse(const Response &response, const CommandContainer &, const QVariant &); + void checkResponse(const Response &response); void ignoreListReceived(const QList &_ignoreList); void processAddToListEvent(const Event_AddToList &event); diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index 7edabfeb5..21669e87a 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -91,9 +91,7 @@ void ZoneViewZone::initializeCards(const QList &cardLis } } -void ZoneViewZone::zoneDumpReceived(const Response &r, - const CommandContainer & /* commandContainer */, - const QVariant & /* extraData */) +void ZoneViewZone::zoneDumpReceived(const Response &r) { const Response_DumpZone &resp = r.GetExtension(Response_DumpZone::ext); const int respCardListSize = resp.zone_info().card_list_size(); diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h index d5c3233c4..140cd35d4 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -95,7 +95,7 @@ public slots: void setSortBy(CardList::SortOption _sortBy); void setPileView(int _pileView); private slots: - void zoneDumpReceived(const Response &r, const CommandContainer &, const QVariant &); + void zoneDumpReceived(const Response &r); signals: void beingDeleted(); void optimumRectChanged(); diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index fe9b6c7b2..53c1881ad 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/cockatrice/src/server/user/user_info_box.cpp @@ -250,15 +250,14 @@ void UserInfoBox::actPassword() cmd.set_user_name(client->getUserName().toStdString()); PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, - [=, this](const Response &response, const CommandContainer &, const QVariant &) { - if (response.response_code() == Response::RespOk) { - changePassword(oldPassword, newPassword); - } else { - QMessageBox::critical(this, tr("Error"), - tr("An error occurred while trying to update your user information.")); - } - }); + connect(pend, &PendingCommand::finished, this, [=, this](const Response &response) { + if (response.response_code() == Response::RespOk) { + changePassword(oldPassword, newPassword); + } else { + QMessageBox::critical(this, tr("Error"), + tr("An error occurred while trying to update your user information.")); + } + }); client->sendCommand(pend); } else { changePassword(oldPassword, newPassword);