Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-25 15:53:52 +02:00
Code Issues Releases Wiki Activity

Simplify GuardedCall and default its return type to void

Browse Source
This commit is contained in:
Paul Licameli
2018-01-13 01:32:41 -05:00
parent 5407079c62
commit 8e0cffb7f2
11 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/export/ExportFFmpegDialogs.cpp
View File

@@ -494,7 +494,7 @@ FFmpegPresets::FFmpegPresets()
FFmpegPresets::~FFmpegPresets()
{
// We're in a destructor! Don't let exceptions out!
GuardedCall< void >( [&] {
GuardedCall( [&] {
wxFileName xmlFileName{ FileNames::DataDir(), wxT("ffmpeg_presets.xml") };
XMLFileWriter writer{
xmlFileName.GetFullPath(), _("Error Saving FFmpeg Presets") };
@@ -520,7 +520,7 @@ void FFmpegPresets::ImportPresets(wxString &filename)
void FFmpegPresets::ExportPresets(wxString &filename)
{
GuardedCall< void >( [&] {
GuardedCall( [&] {
XMLFileWriter writer{ filename, _("Error Saving FFmpeg Presets") };
WriteXMLHeader(writer);
WriteXML(writer);

2
src/export/ExportMultiple.cpp
View File

@@ -585,7 +585,7 @@ void ExportMultiple::OnExport(wxCommandEvent& WXUNUSED(event))
FileList += '\n';
}
GuardedCall<void>( [&] {
GuardedCall( [&] {
// This results dialog is a child of this dialog.
HelpSystem::ShowInfoDialog( this,
_("Export Multiple"),