summaryrefslogtreecommitdiff
path: root/src/citron/multiplayer
diff options
context:
space:
mode:
Diffstat (limited to 'src/citron/multiplayer')
-rw-r--r--src/citron/multiplayer/chat_room.cpp6
-rw-r--r--src/citron/multiplayer/client_room.cpp10
-rw-r--r--src/citron/multiplayer/client_room.h2
-rw-r--r--src/citron/multiplayer/direct_connect.cpp20
-rw-r--r--src/citron/multiplayer/direct_connect.h2
-rw-r--r--src/citron/multiplayer/host_room.cpp28
-rw-r--r--src/citron/multiplayer/host_room.h4
-rw-r--r--src/citron/multiplayer/lobby.cpp34
-rw-r--r--src/citron/multiplayer/lobby.h2
-rw-r--r--src/citron/multiplayer/message.cpp6
-rw-r--r--src/citron/multiplayer/moderation_dialog.cpp2
-rw-r--r--src/citron/multiplayer/state.cpp18
12 files changed, 67 insertions, 67 deletions
diff --git a/src/citron/multiplayer/chat_room.cpp b/src/citron/multiplayer/chat_room.cpp
index 4463616b4..75dfdf904 100644
--- a/src/citron/multiplayer/chat_room.cpp
+++ b/src/citron/multiplayer/chat_room.cpp
@@ -18,9 +18,9 @@
#include "common/logging/log.h"
#include "network/announce_multiplayer_session.h"
#include "ui_chat_room.h"
-#include "yuzu/game_list_p.h"
-#include "yuzu/multiplayer/chat_room.h"
-#include "yuzu/multiplayer/message.h"
+#include "citron/game_list_p.h"
+#include "citron/multiplayer/chat_room.h"
+#include "citron/multiplayer/message.h"
#ifdef ENABLE_WEB_SERVICE
#include "web_service/web_backend.h"
#endif
diff --git a/src/citron/multiplayer/client_room.cpp b/src/citron/multiplayer/client_room.cpp
index caf34a414..d6e55f8d4 100644
--- a/src/citron/multiplayer/client_room.cpp
+++ b/src/citron/multiplayer/client_room.cpp
@@ -12,11 +12,11 @@
#include "common/logging/log.h"
#include "network/announce_multiplayer_session.h"
#include "ui_client_room.h"
-#include "yuzu/game_list_p.h"
-#include "yuzu/multiplayer/client_room.h"
-#include "yuzu/multiplayer/message.h"
-#include "yuzu/multiplayer/moderation_dialog.h"
-#include "yuzu/multiplayer/state.h"
+#include "citron/game_list_p.h"
+#include "citron/multiplayer/client_room.h"
+#include "citron/multiplayer/message.h"
+#include "citron/multiplayer/moderation_dialog.h"
+#include "citron/multiplayer/state.h"
ClientRoomWindow::ClientRoomWindow(QWidget* parent, Network::RoomNetwork& room_network_)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),
diff --git a/src/citron/multiplayer/client_room.h b/src/citron/multiplayer/client_room.h
index f338e3c59..8fee509de 100644
--- a/src/citron/multiplayer/client_room.h
+++ b/src/citron/multiplayer/client_room.h
@@ -3,7 +3,7 @@
#pragma once
-#include "yuzu/multiplayer/chat_room.h"
+#include "citron/multiplayer/chat_room.h"
namespace Ui {
class ClientRoom;
diff --git a/src/citron/multiplayer/direct_connect.cpp b/src/citron/multiplayer/direct_connect.cpp
index 74da97e21..3255c7acc 100644
--- a/src/citron/multiplayer/direct_connect.cpp
+++ b/src/citron/multiplayer/direct_connect.cpp
@@ -12,13 +12,13 @@
#include "core/internal_network/network_interface.h"
#include "network/network.h"
#include "ui_direct_connect.h"
-#include "yuzu/main.h"
-#include "yuzu/multiplayer/client_room.h"
-#include "yuzu/multiplayer/direct_connect.h"
-#include "yuzu/multiplayer/message.h"
-#include "yuzu/multiplayer/state.h"
-#include "yuzu/multiplayer/validation.h"
-#include "yuzu/uisettings.h"
+#include "citron/main.h"
+#include "citron/multiplayer/client_room.h"
+#include "citron/multiplayer/direct_connect.h"
+#include "citron/multiplayer/message.h"
+#include "citron/multiplayer/state.h"
+#include "citron/multiplayer/validation.h"
+#include "citron/uisettings.h"
enum class ConnectionType : u8 { TraversalServer, IP };
@@ -36,9 +36,9 @@ DirectConnectWindow::DirectConnectWindow(Core::System& system_, QWidget* parent)
ui->nickname->setValidator(validation.GetNickname());
ui->nickname->setText(
QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue()));
- if (ui->nickname->text().isEmpty() && !Settings::values.yuzu_username.GetValue().empty()) {
- // Use yuzu Web Service user name as nickname by default
- ui->nickname->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue()));
+ if (ui->nickname->text().isEmpty() && !Settings::values.citron_username.GetValue().empty()) {
+ // Use citron Web Service user name as nickname by default
+ ui->nickname->setText(QString::fromStdString(Settings::values.citron_username.GetValue()));
}
ui->ip->setValidator(validation.GetIP());
ui->ip->setText(QString::fromStdString(UISettings::values.multiplayer_ip.GetValue()));
diff --git a/src/citron/multiplayer/direct_connect.h b/src/citron/multiplayer/direct_connect.h
index b8f66cfb2..50046ca9f 100644
--- a/src/citron/multiplayer/direct_connect.h
+++ b/src/citron/multiplayer/direct_connect.h
@@ -6,7 +6,7 @@
#include <memory>
#include <QDialog>
#include <QFutureWatcher>
-#include "yuzu/multiplayer/validation.h"
+#include "citron/multiplayer/validation.h"
namespace Ui {
class DirectConnect;
diff --git a/src/citron/multiplayer/host_room.cpp b/src/citron/multiplayer/host_room.cpp
index ef364ee43..596fb94f3 100644
--- a/src/citron/multiplayer/host_room.cpp
+++ b/src/citron/multiplayer/host_room.cpp
@@ -16,13 +16,13 @@
#include "core/internal_network/network_interface.h"
#include "network/announce_multiplayer_session.h"
#include "ui_host_room.h"
-#include "yuzu/game_list_p.h"
-#include "yuzu/main.h"
-#include "yuzu/multiplayer/host_room.h"
-#include "yuzu/multiplayer/message.h"
-#include "yuzu/multiplayer/state.h"
-#include "yuzu/multiplayer/validation.h"
-#include "yuzu/uisettings.h"
+#include "citron/game_list_p.h"
+#include "citron/main.h"
+#include "citron/multiplayer/host_room.h"
+#include "citron/multiplayer/message.h"
+#include "citron/multiplayer/state.h"
+#include "citron/multiplayer/validation.h"
+#include "citron/uisettings.h"
#ifdef ENABLE_WEB_SERVICE
#include "web_service/verify_user_jwt.h"
#endif
@@ -57,9 +57,9 @@ HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list,
// Restore the settings:
ui->username->setText(
QString::fromStdString(UISettings::values.multiplayer_room_nickname.GetValue()));
- if (ui->username->text().isEmpty() && !Settings::values.yuzu_username.GetValue().empty()) {
- // Use yuzu Web Service user name as nickname by default
- ui->username->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue()));
+ if (ui->username->text().isEmpty() && !Settings::values.citron_username.GetValue().empty()) {
+ // Use citron Web Service user name as nickname by default
+ ui->username->setText(QString::fromStdString(Settings::values.citron_username.GetValue()));
}
ui->room_name->setText(
QString::fromStdString(UISettings::values.multiplayer_room_name.GetValue()));
@@ -165,7 +165,7 @@ void HostRoomWindow::Host() {
const bool created =
room->Create(ui->room_name->text().toStdString(),
ui->room_description->toPlainText().toStdString(), "", port, password,
- ui->max_player->value(), Settings::values.yuzu_username.GetValue(),
+ ui->max_player->value(), Settings::values.citron_username.GetValue(),
game, CreateVerifyBackend(is_public), ban_list);
if (!created) {
NetworkMessage::ErrorManager::ShowError(
@@ -184,7 +184,7 @@ void HostRoomWindow::Host() {
QMessageBox::warning(
this, tr("Error"),
tr("Failed to announce the room to the public lobby. In order to host a "
- "room publicly, you must have a valid yuzu account configured in "
+ "room publicly, you must have a valid citron account configured in "
"Emulation -> Configure -> Web. If you do not want to publish a room in "
"the public lobby, then select Unlisted instead.\nDebug Message: ") +
QString::fromStdString(result.result_string),
@@ -204,8 +204,8 @@ void HostRoomWindow::Host() {
#ifdef ENABLE_WEB_SERVICE
if (is_public) {
WebService::Client client(Settings::values.web_api_url.GetValue(),
- Settings::values.yuzu_username.GetValue(),
- Settings::values.yuzu_token.GetValue());
+ Settings::values.citron_username.GetValue(),
+ Settings::values.citron_token.GetValue());
if (auto room = room_network.GetRoom().lock()) {
token = client.GetExternalJWT(room->GetVerifyUID()).returned_data;
}
diff --git a/src/citron/multiplayer/host_room.h b/src/citron/multiplayer/host_room.h
index ae816e2e0..49208ee3f 100644
--- a/src/citron/multiplayer/host_room.h
+++ b/src/citron/multiplayer/host_room.h
@@ -9,8 +9,8 @@
#include <QStandardItemModel>
#include <QVariant>
#include "network/network.h"
-#include "yuzu/multiplayer/chat_room.h"
-#include "yuzu/multiplayer/validation.h"
+#include "citron/multiplayer/chat_room.h"
+#include "citron/multiplayer/validation.h"
namespace Ui {
class HostRoom;
diff --git a/src/citron/multiplayer/lobby.cpp b/src/citron/multiplayer/lobby.cpp
index 77ac84295..918573d08 100644
--- a/src/citron/multiplayer/lobby.cpp
+++ b/src/citron/multiplayer/lobby.cpp
@@ -11,15 +11,15 @@
#include "core/internal_network/network_interface.h"
#include "network/network.h"
#include "ui_lobby.h"
-#include "yuzu/game_list_p.h"
-#include "yuzu/main.h"
-#include "yuzu/multiplayer/client_room.h"
-#include "yuzu/multiplayer/lobby.h"
-#include "yuzu/multiplayer/lobby_p.h"
-#include "yuzu/multiplayer/message.h"
-#include "yuzu/multiplayer/state.h"
-#include "yuzu/multiplayer/validation.h"
-#include "yuzu/uisettings.h"
+#include "citron/game_list_p.h"
+#include "citron/main.h"
+#include "citron/multiplayer/client_room.h"
+#include "citron/multiplayer/lobby.h"
+#include "citron/multiplayer/lobby_p.h"
+#include "citron/multiplayer/message.h"
+#include "citron/multiplayer/state.h"
+#include "citron/multiplayer/validation.h"
+#include "citron/uisettings.h"
#ifdef ENABLE_WEB_SERVICE
#include "web_service/web_backend.h"
#endif
@@ -64,14 +64,14 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list,
QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue()));
// Try find the best nickname by default
- if (ui->nickname->text().isEmpty() || ui->nickname->text() == QStringLiteral("yuzu")) {
- if (!Settings::values.yuzu_username.GetValue().empty()) {
+ if (ui->nickname->text().isEmpty() || ui->nickname->text() == QStringLiteral("citron")) {
+ if (!Settings::values.citron_username.GetValue().empty()) {
ui->nickname->setText(
- QString::fromStdString(Settings::values.yuzu_username.GetValue()));
+ QString::fromStdString(Settings::values.citron_username.GetValue()));
} else if (!GetProfileUsername().empty()) {
ui->nickname->setText(QString::fromStdString(GetProfileUsername()));
} else {
- ui->nickname->setText(QStringLiteral("yuzu"));
+ ui->nickname->setText(QStringLiteral("citron"));
}
}
@@ -187,11 +187,11 @@ void Lobby::OnJoinRoom(const QModelIndex& source) {
QFuture<void> f = QtConcurrent::run([nickname, ip, port, password, verify_uid, this] {
std::string token;
#ifdef ENABLE_WEB_SERVICE
- if (!Settings::values.yuzu_username.GetValue().empty() &&
- !Settings::values.yuzu_token.GetValue().empty()) {
+ if (!Settings::values.citron_username.GetValue().empty() &&
+ !Settings::values.citron_token.GetValue().empty()) {
WebService::Client client(Settings::values.web_api_url.GetValue(),
- Settings::values.yuzu_username.GetValue(),
- Settings::values.yuzu_token.GetValue());
+ Settings::values.citron_username.GetValue(),
+ Settings::values.citron_token.GetValue());
token = client.GetExternalJWT(verify_uid).returned_data;
if (token.empty()) {
LOG_ERROR(WebService, "Could not get external JWT, verification may fail");
diff --git a/src/citron/multiplayer/lobby.h b/src/citron/multiplayer/lobby.h
index e78c9cae3..91f2a1444 100644
--- a/src/citron/multiplayer/lobby.h
+++ b/src/citron/multiplayer/lobby.h
@@ -11,7 +11,7 @@
#include "common/announce_multiplayer_room.h"
#include "network/announce_multiplayer_session.h"
#include "network/network.h"
-#include "yuzu/multiplayer/validation.h"
+#include "citron/multiplayer/validation.h"
namespace Ui {
class Lobby;
diff --git a/src/citron/multiplayer/message.cpp b/src/citron/multiplayer/message.cpp
index 6d8f18274..1d4dbb5ef 100644
--- a/src/citron/multiplayer/message.cpp
+++ b/src/citron/multiplayer/message.cpp
@@ -4,7 +4,7 @@
#include <QMessageBox>
#include <QString>
-#include "yuzu/multiplayer/message.h"
+#include "citron/multiplayer/message.h"
namespace NetworkMessage {
const ConnectionError ErrorManager::USERNAME_NOT_VALID(
@@ -29,12 +29,12 @@ const ConnectionError ErrorManager::UNABLE_TO_CONNECT(
const ConnectionError ErrorManager::ROOM_IS_FULL(
QT_TR_NOOP("Unable to connect to the room because it is already full."));
const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM(
- QT_TR_NOOP("Creating a room failed. Please retry. Restarting yuzu might be necessary."));
+ QT_TR_NOOP("Creating a room failed. Please retry. Restarting citron might be necessary."));
const ConnectionError ErrorManager::HOST_BANNED(
QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you "
"or try a different room."));
const ConnectionError ErrorManager::WRONG_VERSION(
- QT_TR_NOOP("Version mismatch! Please update to the latest version of yuzu. If the problem "
+ QT_TR_NOOP("Version mismatch! Please update to the latest version of citron. If the problem "
"persists, contact the room host and ask them to update the server."));
const ConnectionError ErrorManager::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password."));
const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP(
diff --git a/src/citron/multiplayer/moderation_dialog.cpp b/src/citron/multiplayer/moderation_dialog.cpp
index c9b8ed397..c3568b347 100644
--- a/src/citron/multiplayer/moderation_dialog.cpp
+++ b/src/citron/multiplayer/moderation_dialog.cpp
@@ -6,7 +6,7 @@
#include "network/network.h"
#include "network/room_member.h"
#include "ui_moderation_dialog.h"
-#include "yuzu/multiplayer/moderation_dialog.h"
+#include "citron/multiplayer/moderation_dialog.h"
namespace Column {
enum {
diff --git a/src/citron/multiplayer/state.cpp b/src/citron/multiplayer/state.cpp
index d82ca9aee..cd3494c55 100644
--- a/src/citron/multiplayer/state.cpp
+++ b/src/citron/multiplayer/state.cpp
@@ -9,15 +9,15 @@
#include "common/announce_multiplayer_room.h"
#include "common/logging/log.h"
#include "core/core.h"
-#include "yuzu/game_list.h"
-#include "yuzu/multiplayer/client_room.h"
-#include "yuzu/multiplayer/direct_connect.h"
-#include "yuzu/multiplayer/host_room.h"
-#include "yuzu/multiplayer/lobby.h"
-#include "yuzu/multiplayer/message.h"
-#include "yuzu/multiplayer/state.h"
-#include "yuzu/uisettings.h"
-#include "yuzu/util/clickable_label.h"
+#include "citron/game_list.h"
+#include "citron/multiplayer/client_room.h"
+#include "citron/multiplayer/direct_connect.h"
+#include "citron/multiplayer/host_room.h"
+#include "citron/multiplayer/lobby.h"
+#include "citron/multiplayer/message.h"
+#include "citron/multiplayer/state.h"
+#include "citron/uisettings.h"
+#include "citron/util/clickable_label.h"
MultiplayerState::MultiplayerState(QWidget* parent, QStandardItemModel* game_list_model_,
QAction* leave_room_, QAction* show_room_, Core::System& system_)
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 22:57:59 +0000