mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-14 02:14:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Pass std::string as result from RemoteTextThread

Browse Source 
RemoteTextThread and WhatsNewInfoThread explicitly convert their results
into QString, but many consumers need std::string, converting them
back. Let's just use std::string directly and only convert to QString
where actually needed.
This commit is contained in:
Sebastian Beckmann
2025-09-17 19:28:30 +02:00
committed by Ryan Foster
parent dba426630a
commit e38e9f8070
10 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/widgets/OBSBasic_MainControls.cpp
View File

@@ -47,6 +47,7 @@
#include <qt-wrappers.hpp>
#include <nlohmann/json.hpp>
#include <QDesktopServices>
#ifdef _WIN32
@@ -287,9 +288,10 @@ void OBSBasic::UploadLog(const char *subdir, const char *file, const LogUploadTy
logUploadThread.reset(thread);
connect(thread, &RemoteTextThread::Result, this, [this, uploadType](const QString &text, const QString &error) {
logUploadFinished(text, error, uploadType);
});
connect(thread, &RemoteTextThread::Result, this,
[this, uploadType](const std::string &text, const std::string &error) {
logUploadFinished(text, error, uploadType);
});
logUploadThread->start();
}
@@ -384,18 +386,17 @@ void OBSBasic::on_actionRestartSafe_triggered()
}
}
void OBSBasic::logUploadFinished(const QString &text, const QString &error, LogUploadType uploadType)
void OBSBasic::logUploadFinished(const std::string &text, const std::string &error, LogUploadType uploadType)
{
OBSApp *app = App();
if (text.isEmpty()) {
emit app->logUploadFailed(uploadType, error);
if (text.empty()) {
emit app->logUploadFailed(uploadType, QString::fromStdString(error));
} else {
OBSDataAutoRelease returnData = obs_data_create_from_json(QT_TO_UTF8(text));
string resURL = obs_data_get_string(returnData, "url");
QString logURL = resURL.c_str();
nlohmann::json parsed = nlohmann::json::parse(text);
std::string logURL = parsed["url"];
emit app->logUploadFinished(uploadType, logURL);
emit app->logUploadFinished(uploadType, QString::fromStdString(logURL));
}
}