From 9b1d1493abb7807eff97ffbc649f380a6f059e7b Mon Sep 17 00:00:00 2001 From: gxalpha Date: Sat, 18 Jan 2025 20:22:57 +0100 Subject: [PATCH] frontend,shared: Replace and disable QByteArray to char * casts --- frontend/OBSApp.cpp | 2 +- frontend/settings/OBSBasicSettings.cpp | 8 ++++---- frontend/utility/GoLiveAPI_Network.cpp | 2 +- frontend/utility/YoutubeApiWrappers.cpp | 3 ++- frontend/widgets/OBSBasic_ContextToolbar.cpp | 6 +++--- shared/properties-view/properties-view.cpp | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/frontend/OBSApp.cpp b/frontend/OBSApp.cpp index 3e66fba22..1403eb816 100644 --- a/frontend/OBSApp.cpp +++ b/frontend/OBSApp.cpp @@ -802,7 +802,7 @@ bool LoadBranchesFile(vector &out) goto fail; } - branchesText = branchesFile.readAll(); + branchesText = branchesFile.readAll().toStdString(); if (branchesText.empty()) { error = "File empty."; goto fail; diff --git a/frontend/settings/OBSBasicSettings.cpp b/frontend/settings/OBSBasicSettings.cpp index fa8b46364..f36c72b71 100644 --- a/frontend/settings/OBSBasicSettings.cpp +++ b/frontend/settings/OBSBasicSettings.cpp @@ -1178,8 +1178,8 @@ void OBSBasicSettings::LoadLanguageList() #if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER) void TranslateBranchInfo(const QString &name, QString &displayName, QString &description) { - QString translatedName = QTStr("Basic.Settings.General.ChannelName." + name.toUtf8()); - QString translatedDesc = QTStr("Basic.Settings.General.ChannelDescription." + name.toUtf8()); + QString translatedName = QTStr(QT_TO_UTF8(("Basic.Settings.General.ChannelName." + name))); + QString translatedDesc = QTStr(QT_TO_UTF8(("Basic.Settings.General.ChannelDescription." + name))); if (!translatedName.startsWith("Basic.Settings.")) displayName = translatedName; @@ -4536,7 +4536,7 @@ void OBSBasicSettings::AdvOutRecCheckCodecs() QString recFormatName = ui->advOutRecFormat->currentText(); /* Set tooltip if available */ - QString tooltip = QTStr("Basic.Settings.Output.Format.TT." + recFormat.toUtf8()); + QString tooltip = QTStr(QT_TO_UTF8(("Basic.Settings.Output.Format.TT." + recFormat))); if (!tooltip.startsWith("Basic.Settings.Output")) ui->advOutRecFormat->setToolTip(tooltip); @@ -5199,7 +5199,7 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged() QString format = ui->simpleOutRecFormat->currentData().toString(); /* Set tooltip if available */ - QString tooltip = QTStr("Basic.Settings.Output.Format.TT." + format.toUtf8()); + QString tooltip = QTStr(QT_TO_UTF8(("Basic.Settings.Output.Format.TT." + format))); if (!tooltip.startsWith("Basic.Settings.Output")) ui->simpleOutRecFormat->setToolTip(tooltip); diff --git a/frontend/utility/GoLiveAPI_Network.cpp b/frontend/utility/GoLiveAPI_Network.cpp index b0688a006..652996cca 100644 --- a/frontend/utility/GoLiveAPI_Network.cpp +++ b/frontend/utility/GoLiveAPI_Network.cpp @@ -81,7 +81,7 @@ GoLiveApi::Config DownloadGoLiveConfig(QWidget *parent, QString url, const GoLiv std::vector headers; headers.push_back("Content-Type: application/json"); - bool encodeConfigDownloadedOk = GetRemoteFile(url.toLocal8Bit(), encodeConfigText, + bool encodeConfigDownloadedOk = GetRemoteFile(url.toUtf8().constData(), encodeConfigText, libraryError, // out params nullptr, nullptr, // out params (response code and content type) diff --git a/frontend/utility/YoutubeApiWrappers.cpp b/frontend/utility/YoutubeApiWrappers.cpp index 74ad3b5a0..4d1a2a1ea 100644 --- a/frontend/utility/YoutubeApiWrappers.cpp +++ b/frontend/utility/YoutubeApiWrappers.cpp @@ -51,7 +51,8 @@ bool IsUserSignedIntoYT() bool YoutubeApiWrappers::GetTranslatedError(QString &error_message) { - QString translated = QTStr("YouTube.Errors." + lastErrorReason.toUtf8()); + const QString errorKey = "YouTube.Errors." + lastErrorReason.toUtf8(); + const QString translated = QTStr(QT_TO_UTF8(errorKey)); // No translation found if (translated.startsWith("YouTube.Errors.")) return false; diff --git a/frontend/widgets/OBSBasic_ContextToolbar.cpp b/frontend/widgets/OBSBasic_ContextToolbar.cpp index ccb3474a3..02ea7bcde 100644 --- a/frontend/widgets/OBSBasic_ContextToolbar.cpp +++ b/frontend/widgets/OBSBasic_ContextToolbar.cpp @@ -43,7 +43,7 @@ void OBSBasic::copyActionsDynamicProperties() continue; for (QByteArray &y : x->dynamicPropertyNames()) { - temp->setProperty(y, x->property(y)); + temp->setProperty(y.constData(), x->property(y.constData())); } } @@ -54,7 +54,7 @@ void OBSBasic::copyActionsDynamicProperties() continue; for (QByteArray &y : x->dynamicPropertyNames()) { - temp->setProperty(y, x->property(y)); + temp->setProperty(y.constData(), x->property(y.constData())); } } @@ -65,7 +65,7 @@ void OBSBasic::copyActionsDynamicProperties() continue; for (QByteArray &y : x->dynamicPropertyNames()) { - temp->setProperty(y, x->property(y)); + temp->setProperty(y.constData(), x->property(y.constData())); } } } diff --git a/shared/properties-view/properties-view.cpp b/shared/properties-view/properties-view.cpp index 3e939d730..60796a351 100644 --- a/shared/properties-view/properties-view.cpp +++ b/shared/properties-view/properties-view.cpp @@ -733,7 +733,7 @@ void OBSPropertiesView::AddEditableList(obs_property_t *prop, QFormLayout *layou /* for backwards compatibility */ if (uuid.isEmpty()) { uuid = QUuid::createUuid().toString(QUuid::WithoutBraces); - obs_data_set_string(item, "uuid", uuid.toUtf8()); + obs_data_set_string(item, "uuid", QT_TO_UTF8(uuid)); } list_item->setData(Qt::UserRole, uuid); }