diff --git a/modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp b/modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp index 04087ff0096c..4e2173ea0df1 100644 --- a/modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp +++ b/modules/sharing/mod-cloud-audiocom/CloudProjectFileIOExtensions.cpp @@ -94,7 +94,7 @@ class IOExtension final : public ProjectFileIOExtension // Errors would be handled by the UI extension return OnSaveAction::Cancelled; - if (!projectSaveCallback(audacity::ToUTF8(filePath), fileRenamed)) + if (!projectSaveCallback(filePath, fileRenamed)) { if (result.Operation) result.Operation->Abort(); @@ -205,7 +205,7 @@ class IOExtension final : public ProjectFileIOExtension const auto filePath = sync::MakeSafeProjectPath(dir, result.second); return PerformCloudSave( - project, result.second, audacity::ToUTF8(filePath), + project, audacity::ToUTF8(result.second), audacity::ToUTF8(filePath), projectSaveCallback, true, mAudiocomTrace); } diff --git a/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp index 5a3aa521d8a0..5315356b1868 100644 --- a/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp +++ b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.cpp @@ -76,7 +76,7 @@ CloudProjectPropertiesDialog::~CloudProjectPropertiesDialog() GetAuthorizationHandler().PopSuppressDialogs(); } -std::pair +std::pair CloudProjectPropertiesDialog::Show( const ServiceConfig& serviceConfig, OAuthService& authService, UserService& userService, const wxString& projectName, wxWindow* parent, @@ -201,11 +201,11 @@ void CloudProjectPropertiesDialog::SetupEvents() mProjectName->Bind(wxEVT_TEXT_ENTER, [this](auto&) { OnSubmit(); }); } -std::string CloudProjectPropertiesDialog::GetProjectName() const +wxString CloudProjectPropertiesDialog::GetProjectName() const { wxString result { mProjectName->GetValue() }; result.Trim(true).Trim(false); - return audacity::ToUTF8(result); + return result; } void CloudProjectPropertiesDialog::OnUpdateCloudSaveState() diff --git a/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h index f8589fab743f..75befd5db540 100644 --- a/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h +++ b/modules/sharing/mod-cloud-audiocom/ui/dialogs/CloudProjectPropertiesDialog.h @@ -50,7 +50,7 @@ class CloudProjectPropertiesDialog final : public wxDialogWrapper SaveLocally }; - static std::pair Show( + static std::pair Show( const ServiceConfig& serviceConfig, OAuthService& authService, UserService& userService, const wxString& projectName, wxWindow* parent, bool allowLocalSave, AudiocomTrace); @@ -60,7 +60,7 @@ class CloudProjectPropertiesDialog final : public wxDialogWrapper void LayoutControls(); void SetupEvents(); - std::string GetProjectName() const; + wxString GetProjectName() const; void OnUpdateCloudSaveState(); UserPanel* mUserPanel {};