From 12a510271306df4af7a7db241ed7cf07f35fdf06 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 23 Nov 2017 10:38:52 +0100 Subject: Catch exceptions by const reference --- gtk2_ardour/ardour_ui.cc | 8 ++++---- gtk2_ardour/luainstance.cc | 4 ++-- gtk2_ardour/luawindow.cc | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 3e3f3effb3..251bd31431 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1969,7 +1969,7 @@ ARDOUR_UI::open_session () string default_session_folder = Config->get_default_session_parent_dir(); open_session_selector.add_shortcut_folder (default_session_folder); } - catch (Glib::Error & e) { + catch (Glib::Error const& e) { std::cerr << "open_session_selector.add_shortcut_folder() threw Glib::Error " << e.what() << std::endl; } @@ -3642,7 +3642,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, /* this one is special */ - catch (AudioEngine::PortRegistrationFailure& err) { + catch (AudioEngine::PortRegistrationFailure const& err) { MessageDialog msg (err.what(), true, @@ -3667,7 +3667,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, } goto out; } - catch (SessionException e) { + catch (SessionException const& e) { MessageDialog msg (string_compose( _("Session \"%1 (snapshot %2)\" did not load successfully:\n%3"), path, snap_name, e.what()), @@ -3803,7 +3803,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name, new_session = new Session (*AudioEngine::instance(), path, snap_name, bus_profile); } - catch (SessionException e) { + catch (SessionException const& e) { cerr << "Here are the errors associated with this failed session:\n"; dump_errors (cerr); cerr << "---------\n"; diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index a37270e112..156ad11d34 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -1323,7 +1323,7 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) try { script = Glib::file_get_contents (spi->path); - } catch (Glib::FileError e) { + } catch (Glib::FileError const& e) { string msg = string_compose (_("Cannot read script '%1': %2"), spi->path, e.what()); Gtk::MessageDialog am (msg); am.run (); @@ -1360,7 +1360,7 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) string msg = string_compose (_("Session script '%1' instantiation failed: %2"), spd.name(), e.what ()); Gtk::MessageDialog am (msg); am.run (); - } catch (SessionException e) { + } catch (SessionException const& e) { string msg = string_compose (_("Loading Session script '%1' failed: %2"), spd.name(), e.what ()); Gtk::MessageDialog am (msg); am.run (); diff --git a/gtk2_ardour/luawindow.cc b/gtk2_ardour/luawindow.cc index 4e02cd2b20..76f20178ec 100644 --- a/gtk2_ardour/luawindow.cc +++ b/gtk2_ardour/luawindow.cc @@ -464,7 +464,7 @@ LuaWindow::save_script () update_gui_state (); // XXX here? append_text (X_("> ") + string_compose (_("Saved as %1"), sb.path)); return; // OK - } catch (Glib::FileError e) { + } catch (Glib::FileError const& e) { msg = string_compose (_("Error saving file: %1"), e.what()); goto errorout; } @@ -516,7 +516,7 @@ LuaWindow::save_script () LuaScripting::instance().refresh (true); append_text (X_("> ") + string_compose (_("Saved as %1"), path)); return; // OK - } catch (Glib::FileError e) { + } catch (Glib::FileError const& e) { msg = string_compose (_("Error saving file: %1"), e.what()); goto errorout; } @@ -743,7 +743,7 @@ LuaWindow::ScriptBuffer::load () script = Glib::file_get_contents (path); flags |= Buffer_Valid; flags &= BufferFlags(~Buffer_Dirty); - } catch (Glib::FileError e) { + } catch (Glib::FileError const& e) { return false; } return true; -- cgit v1.2.3