Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log: replace all NGLOG with LOG

Browse source
This commit is contained in:
wwylele 2018-06-29 14:18:07 +03:00
parent fde415968e
commit 7c5a76e58b
152 changed files with 1541 additions and 1541 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/citra_qt/camera/qt_camera_base.cpp
View file

@ -31,7 +31,7 @@ void QtCameraInterface::SetFlip(Service::CAM::Flip flip) {
void QtCameraInterface::SetEffect(Service::CAM::Effect effect) {
if (effect != Service::CAM::Effect::None) {
NGLOG_ERROR(Service_CAM, "Unimplemented effect {}", static_cast<int>(effect));
LOG_ERROR(Service_CAM, "Unimplemented effect {}", static_cast<int>(effect));
}
}

10
src/citra_qt/camera/qt_multimedia_camera.cpp
View file

@ -133,13 +133,13 @@ std::shared_ptr<QtMultimediaCameraHandler> QtMultimediaCameraHandler::GetHandler
}
for (int i = 0; i < handlers.size(); i++) {
if (!status[i]) {
NGLOG_INFO(Service_CAM, "Successfully got handler {}", i);
LOG_INFO(Service_CAM, "Successfully got handler {}", i);
status[i] = true;
loaded.emplace(camera_name, handlers[i]);
return handlers[i];
}
}
NGLOG_CRITICAL(Service_CAM, "All handlers taken up");
LOG_CRITICAL(Service_CAM, "All handlers taken up");
return nullptr;
}
@ -147,7 +147,7 @@ void QtMultimediaCameraHandler::ReleaseHandler(
const std::shared_ptr<Camera::QtMultimediaCameraHandler>& handler) {
for (int i = 0; i < handlers.size(); i++) {
if (handlers[i] == handler) {
NGLOG_INFO(Service_CAM, "Successfully released handler {}", i);
LOG_INFO(Service_CAM, "Successfully released handler {}", i);
status[i] = false;
handlers[i]->started = false;
for (auto it = loaded.begin(); it != loaded.end(); it++) {
@ -192,7 +192,7 @@ bool QtMultimediaCameraHandler::CameraAvailable() const {
}
void QtMultimediaCameraHandler::StopCameras() {
NGLOG_INFO(Service_CAM, "Stopping all cameras");
LOG_INFO(Service_CAM, "Stopping all cameras");
for (auto& handler : handlers) {
if (handler && handler->started) {
handler->StopCamera();
@ -210,7 +210,7 @@ void QtMultimediaCameraHandler::ResumeCameras() {
void QtMultimediaCameraHandler::ReleaseHandlers() {
StopCameras();
NGLOG_INFO(Service_CAM, "Releasing all handlers");
LOG_INFO(Service_CAM, "Releasing all handlers");
for (int i = 0; i < handlers.size(); i++) {
status[i] = false;
handlers[i]->started = false;

2
src/citra_qt/camera/still_image_camera.cpp
View file

@ -62,7 +62,7 @@ std::unique_ptr<CameraInterface> StillImageCameraFactory::Create(const std::stri
}
QImage image(QString::fromStdString(real_config));
if (image.isNull()) {
NGLOG_ERROR(Service_CAM, "Couldn't load image \"{}\"", real_config.c_str());
LOG_ERROR(Service_CAM, "Couldn't load image \"{}\"", real_config.c_str());
}
return std::make_unique<StillImageCamera>(image, flip);
}

4
src/citra_qt/compatdb.cpp
View file

@ -42,7 +42,7 @@ void CompatDB::Submit() {
}
break;
case CompatDBPage::Final:
NGLOG_DEBUG(Frontend, "Compatibility Rating: {}", compatibility->checkedId());
LOG_DEBUG(Frontend, "Compatibility Rating: {}", compatibility->checkedId());
Core::Telemetry().AddField(Telemetry::FieldType::UserFeedback, "Compatibility",
compatibility->checkedId());
// older versions of QT don't support the "NoCancelButtonOnLastPage" option, this is a
@ -50,7 +50,7 @@ void CompatDB::Submit() {
button(QWizard::CancelButton)->setVisible(false);
break;
default:
NGLOG_ERROR(Frontend, "Unexpected page: {}", currentId());
LOG_ERROR(Frontend, "Unexpected page: {}", currentId());
}
}

4
src/citra_qt/configuration/configure_camera.cpp
View file

@ -139,7 +139,7 @@ void ConfigureCamera::updateImageSourceUI() {
}
break;
default:
NGLOG_ERROR(Service_CAM, "Unknown image source {}", image_source);
LOG_ERROR(Service_CAM, "Unknown image source {}", image_source);
}
ui->system_camera_label->setHidden(image_source != 2);
ui->system_camera->setHidden(image_source != 2);
@ -302,7 +302,7 @@ ConfigureCamera::CameraPosition ConfigureCamera::getCameraSelection() {
: CameraPosition::RearRight;
}
default:
NGLOG_ERROR(Frontend, "Unknown camera selection");
LOG_ERROR(Frontend, "Unknown camera selection");
return CameraPosition::Front;
}
}

8
src/citra_qt/game_list.cpp
View file

@ -533,18 +533,18 @@ void GameList::LoadCompatibilityList() {
QFile compat_list{":compatibility_list/compatibility_list.json"};
if (!compat_list.open(QFile::ReadOnly | QFile::Text)) {
NGLOG_ERROR(Frontend, "Unable to open game compatibility list");
LOG_ERROR(Frontend, "Unable to open game compatibility list");
return;
}
if (compat_list.size() == 0) {
NGLOG_ERROR(Frontend, "Game compatibility list is empty");
LOG_ERROR(Frontend, "Game compatibility list is empty");
return;
}
const QByteArray content = compat_list.readAll();
if (content.isEmpty()) {
NGLOG_ERROR(Frontend, "Unable to completely read game compatibility list");
LOG_ERROR(Frontend, "Unable to completely read game compatibility list");
return;
}
@ -624,7 +624,7 @@ static bool HasSupportedFileExtension(const std::string& file_name) {
void GameList::RefreshGameDirectory() {
if (!UISettings::values.game_dirs.isEmpty() && current_worker != nullptr) {
NGLOG_INFO(Frontend, "Change detected in the games directory. Reloading game list.");
LOG_INFO(Frontend, "Change detected in the games directory. Reloading game list.");
PopulateAsync(UISettings::values.game_dirs);
}
}

2
src/citra_qt/game_list_p.h
View file

@ -232,7 +232,7 @@ public:
auto iterator = status_data.find(compatiblity);
if (iterator == status_data.end()) {
NGLOG_WARNING(Frontend, "Invalid compatibility number {}", compatiblity.toStdString());
LOG_WARNING(Frontend, "Invalid compatibility number {}", compatiblity.toStdString());
return;
}
CompatStatus status = iterator->second;

28
src/citra_qt/main.cpp
View file

@ -137,7 +137,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
ConnectWidgetEvents();
SetupUIStrings();
NGLOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname,
LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname,
Common::g_scm_branch, Common::g_scm_desc);
show();
@ -528,20 +528,20 @@ void GMainWindow::OnCheckForUpdates() {
void GMainWindow::CheckForUpdates() {
if (updater->CheckForUpdates()) {
NGLOG_INFO(Frontend, "Update check started");
LOG_INFO(Frontend, "Update check started");
} else {
NGLOG_WARNING(Frontend, "Unable to start check for updates");
LOG_WARNING(Frontend, "Unable to start check for updates");
}
}
void GMainWindow::OnUpdateFound(bool found, bool error) {
if (error) {
NGLOG_WARNING(Frontend, "Update check failed");
LOG_WARNING(Frontend, "Update check failed");
return;
}
if (!found) {
NGLOG_INFO(Frontend, "No updates found");
LOG_INFO(Frontend, "No updates found");
// If the user explicitly clicked the "Check for Updates" button, we are
// going to want to show them a prompt anyway.
@ -553,12 +553,12 @@ void GMainWindow::OnUpdateFound(bool found, bool error) {
}
if (emulation_running && !explicit_update_check) {
NGLOG_INFO(Frontend, "Update found, deferring as game is running");
LOG_INFO(Frontend, "Update found, deferring as game is running");
defer_update_prompt = true;
return;
}
NGLOG_INFO(Frontend, "Update found!");
LOG_INFO(Frontend, "Update found!");
explicit_update_check = false;
ShowUpdatePrompt();
@ -610,13 +610,13 @@ bool GMainWindow::LoadROM(const QString& filename) {
if (result != Core::System::ResultStatus::Success) {
switch (result) {
case Core::System::ResultStatus::ErrorGetLoader:
NGLOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filename.toStdString());
LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filename.toStdString());
QMessageBox::critical(this, tr("Error while loading ROM!"),
tr("The ROM format is not supported."));
break;
case Core::System::ResultStatus::ErrorSystemMode:
NGLOG_CRITICAL(Frontend, "Failed to load ROM!");
LOG_CRITICAL(Frontend, "Failed to load ROM!");
QMessageBox::critical(this, tr("Error while loading ROM!"),
tr("Could not determine the system mode."));
break;
@ -672,7 +672,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
}
void GMainWindow::BootGame(const QString& filename) {
NGLOG_INFO(Frontend, "Citra starting...");
LOG_INFO(Frontend, "Citra starting...");
StoreRecentFile(filename); // Put the filename on top of the list
if (!LoadROM(filename))
@ -825,7 +825,7 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target
"content/";
break;
default:
NGLOG_ERROR(Frontend, "Unexpected target {}", static_cast<int>(target));
LOG_ERROR(Frontend, "Unexpected target {}", static_cast<int>(target));
return;
}
@ -839,7 +839,7 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target
return;
}
NGLOG_INFO(Frontend, "Opening {} path for program_id={:016x}", open_target, program_id);
LOG_INFO(Frontend, "Opening {} path for program_id={:016x}", open_target, program_id);
QDesktopServices::openUrl(QUrl::fromLocalFile(qpath));
}
@ -894,7 +894,7 @@ void GMainWindow::OnGameListAddDirectory() {
UISettings::values.game_dirs.append(game_dir);
game_list->PopulateAsync(UISettings::values.game_dirs);
} else {
NGLOG_WARNING(Frontend, "Selected directory is already in the game list");
LOG_WARNING(Frontend, "Selected directory is already in the game list");
}
}
@ -1362,7 +1362,7 @@ void GMainWindow::UpdateUITheme() {
QString theme_uri(":" + UISettings::values.theme + "/style.qss");
QFile f(theme_uri);
if (!f.exists()) {
NGLOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
} else {
f.open(QFile::ReadOnly | QFile::Text);
QTextStream ts(&f);

4
src/citra_qt/multiplayer/chat_room.cpp
View file

@ -150,7 +150,7 @@ void ChatRoom::OnChatReceive(const Network::ChatEntry& chat) {
return member.nickname == chat.nickname;
});
if (it == members.end()) {
NGLOG_INFO(Network, "Chat message received from unknown player. Ignoring it.");
LOG_INFO(Network, "Chat message received from unknown player. Ignoring it.");
return;
}
auto player = std::distance(members.begin(), it);
@ -177,7 +177,7 @@ void ChatRoom::OnSendChat() {
return member.nickname == chat.nickname;
});
if (it == members.end()) {
NGLOG_INFO(Network, "Cannot find self in the player list when sending a message.");
LOG_INFO(Network, "Cannot find self in the player list when sending a message.");
}
auto player = std::distance(members.begin(), it);
ChatMessage m(chat);

4
src/citra_qt/multiplayer/host_room.cpp
View file

@ -103,7 +103,7 @@ void HostRoomWindow::Host() {
ui->max_player->value(), game_name.toStdString(), game_id);
if (!created) {
NetworkMessage::ShowError(NetworkMessage::COULD_NOT_CREATE_ROOM);
NGLOG_ERROR(Network, "Could not create room!");
LOG_ERROR(Network, "Could not create room!");
ui->host->setEnabled(true);
return;
}
@ -136,7 +136,7 @@ void HostRoomWindow::OnConnection() {
if (auto session = announce_multiplayer_session.lock()) {
session->Start();
} else {
NGLOG_ERROR(Network, "Starting announce session failed");
LOG_ERROR(Network, "Starting announce session failed");
}
}
close();

6
src/citra_qt/multiplayer/state.cpp
View file

@ -66,7 +66,7 @@ void MultiplayerState::Close() {
}
void MultiplayerState::OnNetworkStateChanged(const Network::RoomMember::State& state) {
NGLOG_DEBUG(Frontend, "Network State: {}", Network::GetStateStr(state));
LOG_DEBUG(Frontend, "Network State: {}", Network::GetStateStr(state));
bool is_connected = false;
switch (state) {
case Network::RoomMember::State::LostConnection:
@ -147,7 +147,7 @@ bool MultiplayerState::OnCloseRoom() {
// if you are in a room, leave it
if (auto member = Network::GetRoomMember().lock()) {
member->Leave();
NGLOG_DEBUG(Frontend, "Left the room (as a client)");
LOG_DEBUG(Frontend, "Left the room (as a client)");
}
// if you are hosting a room, also stop hosting
@ -156,7 +156,7 @@ bool MultiplayerState::OnCloseRoom() {
}
room->Destroy();
announce_multiplayer_session->Stop();
NGLOG_DEBUG(Frontend, "Closed the room (as a server)");
LOG_DEBUG(Frontend, "Closed the room (as a server)");
}
return true;
}

8
src/citra_qt/updater/updater.cpp
View file

@ -211,7 +211,7 @@ XMLParseResult UpdaterPrivate::ParseResult(const QByteArray& output,
}
if (reader.hasError()) {
NGLOG_ERROR(Frontend, "Cannot read xml for update: {}", reader.errorString().toStdString());
LOG_ERROR(Frontend, "Cannot read xml for update: {}", reader.errorString().toStdString());
return XMLParseResult::InvalidXML;
}
@ -275,18 +275,18 @@ void UpdaterPrivate::LaunchWithArguments(const QStringList& args) {
QFileInfo tool_info(QCoreApplication::applicationDirPath(), tool_path);
if (!QProcess::startDetached(tool_info.absoluteFilePath(), args, tool_info.absolutePath())) {
NGLOG_WARNING(Frontend, "Unable to start program {}",
LOG_WARNING(Frontend, "Unable to start program {}",
tool_info.absoluteFilePath().toStdString());
}
}
void UpdaterPrivate::LaunchUI() {
NGLOG_INFO(Frontend, "Launching update UI...");
LOG_INFO(Frontend, "Launching update UI...");
LaunchWithArguments(run_arguments);
}
void UpdaterPrivate::SilentlyUpdate() {
NGLOG_INFO(Frontend, "Launching silent update...");
LOG_INFO(Frontend, "Launching silent update...");
LaunchWithArguments(silent_arguments);
}