ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: clean up logging output

This commit is contained in:
Adam Higerd 2025-05-04 13:28:16 -05:00
parent f3663c86ad
commit 6250c2d946
20 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/qt/AudioDevice.cpp
View File

@ -31,7 +31,7 @@ AudioDevice::~AudioDevice() {
void AudioDevice::setFormat(const QAudioFormat& format) {
if (!m_context || !mCoreThreadIsActive(m_context)) {
qInfo() << tr("Can't set format of context-less audio device");
qInfo().noquote() << tr("Can't set format of context-less audio device");
return;
}
mCoreSyncLockAudio(&m_context->impl->sync);
@ -52,7 +52,7 @@ void AudioDevice::setInput(mCoreThread* input) {
qint64 AudioDevice::readData(char* data, qint64 maxSize) {
if (!m_context->core) {
qWarning() << tr("Audio device is missing its core");
qWarning().noquote() << tr("Audio device is missing its core");
return 0;
}
@ -80,7 +80,7 @@ qint64 AudioDevice::readData(char* data, qint64 maxSize) {
}
qint64 AudioDevice::writeData(const char*, qint64) {
qWarning() << tr("Writing data to read-only audio device");
qWarning().noquote() << tr("Writing data to read-only audio device");
return 0;
}

4
src/platform/qt/AudioProcessorQt.cpp
View File

@ -53,7 +53,7 @@ void AudioProcessorQt::stop() {
bool AudioProcessorQt::start() {
if (!input()) {
qWarning() << tr("Can't start an audio processor without input");
qWarning().noquote() << tr("Can't start an audio processor without input");
return false;
}
@ -78,7 +78,7 @@ bool AudioProcessorQt::start() {
QAudioDevice device(QMediaDevices::defaultAudioOutput());
m_audioOutput = std::make_unique<QAudioSink>(device, format);
qInfo() << "Audio outputting to " << device.description();
qInfo().noquote() << tr("Audio outputting to %1").arg(device.description());
connect(m_audioOutput.get(), &QAudioSink::stateChanged, this, [this](QAudio::State state) {
if (state != QAudio::IdleState) {
return;

2
src/platform/qt/AudioProcessorSDL.cpp
View File

@ -31,7 +31,7 @@ void AudioProcessorSDL::stop() {
bool AudioProcessorSDL::start() {
if (!input()) {
qWarning() << tr("Can't start an audio processor without input");
qWarning().noquote() << tr("Can't start an audio processor without input");
return false;
}

2
src/platform/qt/CheatsModel.cpp
View File

@ -208,7 +208,7 @@ void CheatsModel::endAppendRow() {
void CheatsModel::loadFile(const QString& path) {
VFile* vf = VFileDevice::open(path, O_RDONLY);
if (!vf) {
qWarning() << tr("Failed to open cheats file: %1").arg(path);
qWarning().noquote() << tr("Failed to open cheats file: %1").arg(path);
return;
}
beginResetModel();

2
src/platform/qt/CheatsView.cpp
View File

@ -183,7 +183,7 @@ void CheatsView::enterCheat() {
set->refresh(set, m_controller->cheatDevice());
}
if (failure) {
qCritical() << tr("Some cheats could not be added. Please ensure they're formatted correctly and/or try other cheat types.");
qCritical().noquote() << tr("Some cheats could not be added. Please ensure they're formatted correctly and/or try other cheat types.");
}
m_ui.codeEntry->clear();
}

10
src/platform/qt/CoreController.cpp
View File

@ -824,7 +824,7 @@ void CoreController::loadSave(const QString& path, bool temporary) {
m_resetActions.append([this, path, temporary]() {
VFile* vf = VFileDevice::open(path, temporary ? O_RDONLY : O_RDWR);
if (!vf) {
qCritical() << tr("Failed to open save file: %1").arg(path);
qCritical().noquote() << tr("Failed to open save file: %1").arg(path);
return;
}
@ -882,7 +882,7 @@ void CoreController::loadPatch(const QString& patchPath) {
void CoreController::replaceGame(const QString& path) {
QFileInfo info(path);
if (!info.isReadable()) {
qCritical() << tr("Failed to open game file: %1").arg(path);
qCritical().noquote() << tr("Failed to open game file: %1").arg(path);
return;
}
QString fname = info.canonicalFilePath();
@ -912,7 +912,7 @@ void CoreController::yankPak() {
break;
#endif
case mPLATFORM_NONE:
qCritical() << tr("Can't yank pack in unexpected platform!");
qCritical().noquote() << tr("Can't yank pack in unexpected platform!");
break;
}
}
@ -1027,7 +1027,7 @@ void CoreController::importSharkport(const QString& path) {
}
VFile* vf = VFileDevice::open(path, O_RDONLY);
if (!vf) {
qCritical() << tr("Failed to open snapshot file for reading: %1").arg(path);
qCritical().noquote() << tr("Failed to open snapshot file for reading: %1").arg(path);
return;
}
Interrupter interrupter(this);
@ -1044,7 +1044,7 @@ void CoreController::exportSharkport(const QString& path) {
}
VFile* vf = VFileDevice::open(path, O_WRONLY | O_CREAT | O_TRUNC);
if (!vf) {
qCritical() << tr("Failed to open snapshot file for writing: %1").arg(path);
qCritical().noquote() << tr("Failed to open snapshot file for writing: %1").arg(path);
return;
}
Interrupter interrupter(this);

6
src/platform/qt/CoreManager.cpp
View File

@ -49,7 +49,7 @@ CoreController* CoreManager::loadGame(const QString& path) {
dir->close(dir);
return loadGame(vf, fname, base);
} else {
qCritical() << tr("Failed to open game file: %1").arg(path);
qCritical().noquote() << tr("Failed to open game file: %1").arg(path);
}
return nullptr;
}
@ -87,7 +87,7 @@ CoreController* CoreManager::loadGame(VFile* vf, const QString& path, const QStr
mCore* core = mCoreFindVF(vf);
if (!core) {
vf->close(vf);
qCritical() << tr("Could not load game. Are you sure it's in the correct format?");
qCritical().noquote() << tr("Could not load game. Are you sure it's in the correct format?");
return nullptr;
}
@ -114,7 +114,7 @@ CoreController* CoreManager::loadGame(VFile* vf, const QString& path, const QStr
bytes = info.dir().canonicalPath().toUtf8();
mDirectorySetAttachBase(&core->dirs, VDirOpen(bytes.constData()));
if (!mCoreAutoloadSave(core)) {
qCritical() << tr("Failed to open save file; in-game saves cannot be updated. Please ensure the save directory is writable without additional privileges (e.g. UAC on Windows).");
qCritical().noquote() << tr("Failed to open save file; in-game saves cannot be updated. Please ensure the save directory is writable without additional privileges (e.g. UAC on Windows).");
}
mCoreAutoloadCheats(core);

2
src/platform/qt/DebuggerConsoleController.cpp
View File

@ -173,7 +173,7 @@ void DebuggerConsoleController::historyLoad() {
void DebuggerConsoleController::historySave() {
QFile log(ConfigController::configDir() + "/cli_history.log");
if (!log.open(QIODevice::WriteOnly | QIODevice::Text)) {
qWarning() << tr("Could not open CLI history for writing");
qWarning().noquote() << tr("Could not open CLI history for writing");
return;
}
for (const QString& line : m_history) {

2
src/platform/qt/DisplayGL.cpp
View File

@ -310,7 +310,7 @@ bool DisplayGL::highestCompatible(QSurfaceFormat& format) {
#ifdef BUILD_GL
#if defined(BUILD_GLES2) || defined(BUILD_GLES3) || defined(USE_EPOXY)
qWarning() << tr("Failed to create an OpenGL 3 context, trying old-style...");
qWarning().noquote() << tr("Failed to create an OpenGL 3 context, trying old-style...");
#endif
if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
format.setVersion(1, 4);

2
src/platform/qt/GIFView.cpp
View File

@ -60,7 +60,7 @@ void GIFView::startRecording() {
}
FFmpegEncoderSetLooping(&m_encoder, m_ui.loop->isChecked());
if (!FFmpegEncoderOpen(&m_encoder, m_filename.toUtf8().constData())) {
qCritical() << tr("Failed to open output file: %1").arg(m_filename);
qCritical().noquote() << tr("Failed to open output file: %1").arg(m_filename);
return;
}
m_ui.start->setEnabled(false);

8
src/platform/qt/InputController.cpp
View File

@ -583,7 +583,7 @@ int InputController::claimPlayer() {
return i;
}
}
qFatal("Can't claim 5th player. Please report this bug.");
qFatal(qPrintable(tr("Can't claim 5th player. Please report this bug.")));
}
void InputController::freePlayer(int player) {
@ -724,9 +724,9 @@ void InputController::prepareCamFormat() {
}
}
if (!goodFormatFound) {
qWarning() << "Could not find a valid camera format!";
qWarning().noquote() << tr("Could not find a valid camera format!");
for (const auto& format : cameraFormats) {
qWarning() << "Camera supported format: " << QString::number(format);
qWarning().noquote() << tr("Camera supported format: %1").arg(format);
}
}
m_camera->setViewfinderSettings(settings);
@ -745,7 +745,7 @@ void InputController::prepareCamFormat() {
}
}
if (!goodFormatFound) {
qWarning() << "Could not find a valid camera format!";
qWarning().noquote() << tr("Could not find a valid camera format!");
}
m_camera->setCameraFormat(bestFormat);
#endif

4
src/platform/qt/MemoryAccessLogController.cpp
View File

@ -114,7 +114,7 @@ void MemoryAccessLogController::load(bool loadExisting) {
}
VFile* vf = VFileDevice::open(m_path, flags);
if (!vf) {
qCritical() << tr("Failed to open memory log file");
qCritical().noquote() << tr("Failed to open memory log file");
return;
}
@ -123,7 +123,7 @@ void MemoryAccessLogController::load(bool loadExisting) {
m_controller->attachDebuggerModule(&m_logger.d);
if (!mDebuggerAccessLoggerOpen(&m_logger, vf, flags)) {
mDebuggerAccessLoggerDeinit(&m_logger);
qCritical() << tr("Failed to open memory log file");
qCritical().noquote() << tr("Failed to open memory log file");
return;
}
emit loaded(true);

2
src/platform/qt/MemoryDump.cpp
View File

@ -27,7 +27,7 @@ void MemoryDump::save() {
}
QFile outfile(filename);
if (!outfile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
qWarning() << tr("Failed to open output file: %1").arg(filename);
qWarning().noquote() << tr("Failed to open output file: %1").arg(filename);
return;
}
QByteArray out(serialize());

4
src/platform/qt/MemoryModel.cpp
View File

@ -219,7 +219,7 @@ void MemoryModel::save() {
}
QFile outfile(filename);
if (!outfile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
qWarning() << tr("Failed to open output file: %1").arg(filename);
qWarning().noquote() << tr("Failed to open output file: %1").arg(filename);
return;
}
QByteArray out(serialize());
@ -233,7 +233,7 @@ void MemoryModel::load() {
}
QFile infile(filename);
if (!infile.open(QIODevice::ReadOnly)) {
qWarning() << tr("Failed to open input file: %1").arg(filename);
qWarning().noquote() << tr("Failed to open input file: %1").arg(filename);
return;
}
QByteArray bytestring(infile.readAll());

12
src/platform/qt/MultiplayerController.cpp
View File

@ -310,7 +310,7 @@ bool MultiplayerController::attachGame(CoreController* controller) {
break;
}
if (!player.saveId) {
qCritical() << "Couldn't find available save ID";
qCritical().noquote() << "Couldn't find available save ID";
player.saveId = 1;
}
} else if (saveId) {
@ -364,7 +364,7 @@ void MultiplayerController::detachGame(CoreController* controller) {
interrupters.append(playerController);
}
if (pid < 0) {
qWarning() << tr("Trying to detach a multiplayer player that's not attached");
qWarning().noquote() << tr("Trying to detach a multiplayer player that's not attached");
return;
}
switch (controller->platform()) {
@ -404,7 +404,7 @@ void MultiplayerController::detachGame(CoreController* controller) {
QPair<QString, QString> path(controller->path(), controller->baseDirectory());
Player& p = m_pids.find(pid).value();
if (!p.saveId) {
qWarning() << tr("Clearing invalid save ID");
qWarning().noquote() << tr("Clearing invalid save ID");
} else {
m_claimedSaves[path] &= ~(1 << (p.saveId - 1));
if (!m_claimedSaves[path]) {
@ -413,7 +413,7 @@ void MultiplayerController::detachGame(CoreController* controller) {
}
if (p.preferredId < 0) {
qWarning() << tr("Clearing invalid preferred ID");
qWarning().noquote() << tr("Clearing invalid preferred ID");
} else {
m_claimedIds &= ~(1 << p.preferredId);
}
@ -434,7 +434,7 @@ int MultiplayerController::playerId(CoreController* controller) const {
for (int i = 0; i < m_players.count(); ++i) {
const Player* p = player(i);
if (!p) {
qCritical() << tr("Trying to get player ID for a multiplayer player that's not attached");
qCritical().noquote() << tr("Trying to get player ID for a multiplayer player that's not attached");
return -1;
}
if (p->controller == controller) {
@ -448,7 +448,7 @@ int MultiplayerController::saveId(CoreController* controller) const {
for (int i = 0; i < m_players.count(); ++i) {
const Player* p = player(i);
if (!p) {
qCritical() << tr("Trying to get save ID for a multiplayer player that's not attached");
qCritical().noquote() << tr("Trying to get save ID for a multiplayer player that's not attached");
return -1;
}
if (p->controller == controller) {

2
src/platform/qt/PaletteView.cpp
View File

@ -139,7 +139,7 @@ void PaletteView::exportPalette(int start, int length) {
}
VFile* vf = VFileDevice::open(filename, O_WRONLY | O_CREAT | O_TRUNC);
if (!vf) {
qCritical() << tr("Failed to open output palette file: %1").arg(filename);
qCritical().noquote() << tr("Failed to open output palette file: %1").arg(filename);
return;
}
if (filename.endsWith(".pal", Qt::CaseInsensitive)) {

2
src/platform/qt/SaveConverter.cpp
View File

@ -656,7 +656,7 @@ QByteArray SaveConverter::AnnotatedSave::convertTo(const SaveConverter::Annotate
}
if (platform != target.platform) {
qCritical() << tr("Cannot convert save games between platforms");
qCritical().noquote() << tr("Cannot convert save games between platforms");
return {};
}

2
src/platform/qt/VideoView.cpp
View File

@ -223,7 +223,7 @@ void VideoView::startRecording() {
return;
}
if (!FFmpegEncoderOpen(&m_encoder, m_filename.toUtf8().constData())) {
qCritical() << tr("Failed to open output video file: %1").arg(m_filename);
qCritical().noquote() << tr("Failed to open output video file: %1").arg(m_filename);
return;
}
m_ui.start->setEnabled(false);

4
src/platform/qt/Window.cpp
View File

@ -1055,7 +1055,7 @@ void Window::reloadDisplayDriver() {
}
m_display = std::unique_ptr<QGBA::Display>(Display::create(this));
if (!m_display) {
qCritical() << tr("Failed to create an appropriate display device, falling back to software display. "
qCritical().noquote() << tr("Failed to create an appropriate display device, falling back to software display. "
"Games may run slowly, especially with larger windows.");
Display::setDriver(Display::Driver::QT);
m_display = std::unique_ptr<Display>(Display::create(this));
@ -1128,7 +1128,7 @@ void Window::reloadAudioDriver() {
m_audioProcessor->setInput(m_controller);
m_audioProcessor->configure(m_config);
if (!m_audioProcessor->start()) {
qWarning() << "Failed to start audio processor";
qWarning().noquote() << "Failed to start audio processor";
}
}

2
src/platform/qt/scripting/AutorunScriptModel.cpp
View File

@ -23,7 +23,7 @@ QDataStream& operator>>(QDataStream& stream, QGBA::AutorunScriptModel::ScriptInf
stream >> filename;
object.filename = QString::fromUtf8(filename);
} else {
qCritical() << QGBA::AutorunScriptModel::tr("Could not load autorun script settings: unknown script info format %1").arg(version);
qCritical().noquote() << QGBA::AutorunScriptModel::tr("Could not load autorun script settings: unknown script info format %1").arg(version);
stream.setStatus(QDataStream::ReadCorruptData);
return stream;
}