From 17ace643e4edbec1e5bd7b446d039f8c94beef75 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 4 May 2016 23:09:37 -0400 Subject: OMNIBUS COMMIT: prefer const XMLNode::property method (and provide a real one) --- gtk2_ardour/ardour_ui.cc | 2 +- gtk2_ardour/ardour_ui_dependents.cc | 2 +- gtk2_ardour/audio_clock.cc | 2 +- gtk2_ardour/automation_time_axis.cc | 2 +- gtk2_ardour/editor.cc | 4 ++-- gtk2_ardour/editor_rulers.cc | 2 +- gtk2_ardour/engine_dialog.cc | 6 ++--- gtk2_ardour/export_video_dialog.cc | 2 +- gtk2_ardour/gui_object.cc | 4 ++-- gtk2_ardour/keyboard.cc | 2 +- gtk2_ardour/location_ui.cc | 2 +- gtk2_ardour/meterbridge.cc | 4 ++-- gtk2_ardour/mixer_ui.cc | 4 ++-- gtk2_ardour/processor_box.cc | 8 +++---- gtk2_ardour/route_time_axis.cc | 4 ++-- gtk2_ardour/selection.cc | 44 ++++++++++++++++++------------------- gtk2_ardour/selection_memento.cc | 2 +- gtk2_ardour/ui_config.cc | 21 ++++++++++-------- gtk2_ardour/video_timeline.cc | 20 ++++++++--------- 19 files changed, 70 insertions(+), 67 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index fd384ecf81..32d14144fb 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -741,7 +741,7 @@ ARDOUR_UI::configure_handler (GdkEventConfigure* /*conf*/) void ARDOUR_UI::set_transport_controllable_state (const XMLNode& node) { - const XMLProperty* prop; + XMLProperty const * prop; if ((prop = node.property ("roll")) != 0) { roll_controllable->set_id (prop->value()); diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 55d352bd0b..1453732a11 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -331,7 +331,7 @@ ARDOUR_UI::setup_windows () const XMLNode* mnode = main_window_settings (); if (mnode) { - const XMLProperty* prop; + XMLProperty const * prop; gint x = -1; gint y = -1; gint w = -1; diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 834f7f31f7..a44c32a10a 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1301,7 +1301,7 @@ AudioClock::set_session (Session *s) _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context()); _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context()); - const XMLProperty* prop; + XMLProperty const * prop; XMLNode* node = _session->extra_xml (X_("ClockModes")); AudioClock::Mode amode; diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index cb2a3b44ea..ae0a691710 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -873,7 +873,7 @@ AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptrextra_xml ("GUI"); if (gui_node) { - const XMLProperty* prop = gui_node->property ("shown"); + XMLProperty const * prop = gui_node->property ("shown"); if (prop) { if (string_is_affirmative (prop->value())) { visible.insert (i->first); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index b267eae670..77a0261be1 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2287,7 +2287,7 @@ Editor::set_edit_point_preference (EditPoint ep, bool force) int Editor::set_state (const XMLNode& node, int version) { - const XMLProperty* prop; + XMLProperty const * prop; set_id (node); Tabbable::set_state (node, version); @@ -3873,7 +3873,7 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) */ int pos; - XMLProperty* prop; + XMLProperty const * prop; char buf[32]; XMLNode* node = ARDOUR_UI::instance()->editor_settings(); diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 45f91a681f..bb45e97bb3 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -313,7 +313,7 @@ Editor::store_ruler_visibility () void Editor::restore_ruler_visibility () { - XMLProperty* prop; + XMLProperty const * prop; XMLNode * node = _session->extra_xml (X_("RulerVisibility")); no_ruler_shown_update = true; diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index d9f92d80e5..cc85bda878 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -1970,9 +1970,9 @@ EngineControl::set_state (const XMLNode& root) { XMLNodeList clist, cclist; XMLNodeConstIterator citer, cciter; - XMLNode* child; - XMLNode* grandchild; - XMLProperty* prop = NULL; + XMLNode const * child; + XMLNode const * grandchild; + XMLProperty const * prop = NULL; fprintf (stderr, "EngineControl::set_state\n"); diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index f09306db0d..fc7c3d52be 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -402,7 +402,7 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range) node = _session->extra_xml (X_("Videoexport")); if (node) { - const XMLProperty* prop; + XMLProperty const * prop; prop = node->property (X_("ChangeGeometry")); if (prop) { scale_checkbox.set_active(atoi(prop->value())?true:false); } prop = node->property (X_("KeepAspect")); diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc index 5ea94f9c0c..c073a3aaf0 100644 --- a/gtk2_ardour/gui_object.cc +++ b/gtk2_ardour/gui_object.cc @@ -94,7 +94,7 @@ GUIObjectState::get_string (const string& id, const string& prop_name, bool* emp return string (); } - const XMLProperty* p (i->second->property (prop_name)); + XMLProperty const * p (i->second->property (prop_name)); if (!p) { if (empty) { *empty = true; @@ -130,7 +130,7 @@ GUIObjectState::set_state (const XMLNode& node) if ((*i)->name() != X_("Object")) { continue; } - const XMLProperty* prop = (*i)->property (X_("id")); + XMLProperty const * prop = (*i)->property (X_("id")); if (!prop) { continue; } diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index bdf40e680c..a84f647806 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -227,7 +227,7 @@ ArdourKeyboard::get_state (void) int ArdourKeyboard::set_state (const XMLNode& node, int version) { - const XMLProperty* prop; + XMLProperty const * prop; if ((prop = node.property ("constraint-modifier")) != 0) { sscanf (prop->value().c_str(), "%d", &constraint_mod); diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 1d54622c93..07ed9c41d8 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -1143,7 +1143,7 @@ LocationUI::clock_mode_from_session_instant_xml () const return AudioClock::Frames; } - XMLProperty* p = node->property (X_("clock-mode")); + XMLProperty const * p = node->property (X_("clock-mode")); if (!p) { return ARDOUR_UI::instance()->secondary_clock->mode(); } diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index aa2046a948..5906d7343a 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -463,7 +463,7 @@ Meterbridge::session_going_away () int Meterbridge::set_state (const XMLNode& node) { - const XMLProperty* prop; + XMLProperty const * prop; XMLNode* geometry; m_width = default_width; @@ -473,7 +473,7 @@ Meterbridge::set_state (const XMLNode& node) if ((geometry = find_named_node (node, "geometry")) != 0) { - XMLProperty* prop; + XMLProperty const * prop; if ((prop = geometry->property("x_size")) == 0) { prop = geometry->property ("x-size"); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index a848ede49e..c39ae33470 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1652,7 +1652,7 @@ private: int Mixer_UI::set_state (const XMLNode& node, int version) { - const XMLProperty* prop; + XMLProperty const * prop; Tabbable::set_state (node, version); @@ -1754,7 +1754,7 @@ void Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which) { int pos; - XMLProperty* prop = 0; + XMLProperty const * prop = 0; XMLNode* node = ARDOUR_UI::instance()->mixer_settings(); XMLNode* geometry; int height; diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index f3997203fd..51b8f3f885 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -657,7 +657,7 @@ ProcessorEntry::set_control_state (XMLNode const * node) if (_plugin_display) { XMLNode* n = GUIObjectState::get_node (node, X_("InlineDisplay")); - XMLProperty* p = n ? n->property (X_("visible")) : NULL; + XMLProperty const * p = n ? n->property (X_("visible")) : NULL; if (p) { if (string_is_affirmative (p->value ())) { _plugin_display->show(); @@ -947,7 +947,7 @@ ProcessorEntry::Control::set_state (XMLNode const * node) { XMLNode* n = GUIObjectState::get_node (node, state_id ()); if (n) { - XMLProperty* p = n->property (X_("visible")); + XMLProperty const * p = n->property (X_("visible")); set_visible (p && string_is_affirmative (p->value ())); } else { set_visible (false); @@ -4160,7 +4160,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/) XMLNodeList children = node.children (); XMLNodeList::const_iterator i = children.begin (); while (i != children.end()) { - XMLProperty* prop = (*i)->property (X_("name")); + XMLProperty const * prop = (*i)->property (X_("name")); if ((*i)->name() == X_("Window") && prop && prop->value() == _name) { break; } @@ -4168,7 +4168,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/) } if (i != children.end()) { - XMLProperty* prop; + XMLProperty const * prop; if ((prop = (*i)->property (X_("custom-ui"))) != 0) { want_custom = PBD::string_is_affirmative (prop->value ()); } diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 986a274ee6..e480485d84 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -2646,7 +2646,7 @@ RouteTimeAxisView::set_underlay_state() continue; } - XMLProperty* prop = child_node->property ("id"); + XMLProperty const * prop = child_node->property ("id"); if (prop) { PBD::ID id (prop->value()); @@ -2688,7 +2688,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/) } XMLNode* node = underlay_xml_node->add_child("Underlay"); - XMLProperty* prop = node->add_property("id"); + XMLProperty const * prop = node->add_property("id"); prop->set_value(v->trackview().route()->id().to_s()); } #endif diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index d5fadb9cbb..2e5b8b84e0 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -1365,7 +1365,7 @@ Selection::set_state (XMLNode const & node, int) for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == X_("RouteView")) { - XMLProperty* prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_id = (*i)->property (X_("id")); assert (prop_id); PBD::ID id (prop_id->value ()); RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id); @@ -1374,7 +1374,7 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("Region")) { - XMLProperty* prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_id = (*i)->property (X_("id")); assert (prop_id); PBD::ID id (prop_id->value ()); @@ -1392,7 +1392,7 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("MIDINote")) { - XMLProperty* prop_region_id = (*i)->property (X_("region-id")); + XMLProperty const * prop_region_id = (*i)->property (X_("region-id")); assert (prop_region_id); @@ -1405,12 +1405,12 @@ Selection::set_state (XMLNode const & node, int) XMLNodeList children = (*i)->children (); for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) { - XMLProperty* prop_channel = (*ci)->property (X_("channel")); - XMLProperty* prop_time = (*ci)->property (X_("time")); - XMLProperty* prop_note = (*ci)->property (X_("note")); - XMLProperty* prop_length = (*ci)->property (X_("length")); - XMLProperty* prop_velocity = (*ci)->property (X_("velocity")); - XMLProperty* prop_off_velocity = (*ci)->property (X_("off-velocity")); + XMLProperty const * prop_channel = (*ci)->property (X_("channel")); + XMLProperty const * prop_time = (*ci)->property (X_("time")); + XMLProperty const * prop_note = (*ci)->property (X_("note")); + XMLProperty const * prop_length = (*ci)->property (X_("length")); + XMLProperty const * prop_velocity = (*ci)->property (X_("velocity")); + XMLProperty const * prop_off_velocity = (*ci)->property (X_("off-velocity")); assert (prop_channel); assert (prop_time); @@ -1445,16 +1445,16 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("ControlPoint")) { - XMLProperty* prop_type = (*i)->property (X_("type")); + XMLProperty const * prop_type = (*i)->property (X_("type")); assert(prop_type); if (prop_type->value () == "track") { - XMLProperty* prop_route_id = (*i)->property (X_("route-id")); - XMLProperty* prop_alist_id = (*i)->property (X_("automation-list-id")); - XMLProperty* prop_parameter = (*i)->property (X_("parameter")); - XMLProperty* prop_view_index = (*i)->property (X_("view-index")); + XMLProperty const * prop_route_id = (*i)->property (X_("route-id")); + XMLProperty const * prop_alist_id = (*i)->property (X_("automation-list-id")); + XMLProperty const * prop_parameter = (*i)->property (X_("parameter")); + XMLProperty const * prop_view_index = (*i)->property (X_("view-index")); assert (prop_route_id); assert (prop_alist_id); @@ -1484,8 +1484,8 @@ Selection::set_state (XMLNode const & node, int) add (cps); } } else if (prop_type->value () == "region") { - XMLProperty* prop_region_id = (*i)->property (X_("region-id")); - XMLProperty* prop_view_index = (*i)->property (X_("view-index")); + XMLProperty const * prop_region_id = (*i)->property (X_("region-id")); + XMLProperty const * prop_view_index = (*i)->property (X_("view-index")); if (!prop_region_id || !prop_view_index) { continue; @@ -1515,8 +1515,8 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("AudioRange")) { - XMLProperty* prop_start = (*i)->property (X_("start")); - XMLProperty* prop_end = (*i)->property (X_("end")); + XMLProperty const * prop_start = (*i)->property (X_("start")); + XMLProperty const * prop_end = (*i)->property (X_("end")); assert (prop_start); assert (prop_end); @@ -1528,8 +1528,8 @@ Selection::set_state (XMLNode const & node, int) } else if ((*i)->name() == X_("AutomationView")) { - XMLProperty* prop_id = (*i)->property (X_("id")); - XMLProperty* prop_parameter = (*i)->property (X_("parameter")); + XMLProperty const * prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_parameter = (*i)->property (X_("parameter")); assert (prop_id); assert (prop_parameter); @@ -1552,8 +1552,8 @@ Selection::set_state (XMLNode const & node, int) } else if ((*i)->name() == X_("Marker")) { - XMLProperty* prop_id = (*i)->property (X_("id")); - XMLProperty* prop_start = (*i)->property (X_("start")); + XMLProperty const * prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_start = (*i)->property (X_("start")); assert (prop_id); assert (prop_start); diff --git a/gtk2_ardour/selection_memento.cc b/gtk2_ardour/selection_memento.cc index ae3ad730ad..ffce0790f8 100644 --- a/gtk2_ardour/selection_memento.cc +++ b/gtk2_ardour/selection_memento.cc @@ -54,7 +54,7 @@ SelectionMemento::get_state () { int SelectionMemento::set_state (const XMLNode& node, int /*version*/) { - const XMLProperty* prop; + XMLProperty const * prop; PublicEditor& editor = PublicEditor::instance(); if (node.name() != X_("SelectionMemento")) { return -1; diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index c001e5c5b1..931030180c 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -534,11 +534,12 @@ UIConfiguration::load_color_aliases (XMLNode const & node) color_aliases.clear (); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() != X_("ColorAlias")) { + XMLNode const * child = *niter; + if (child->name() != X_("ColorAlias")) { continue; } - name = (*niter)->property (X_("name")); - alias = (*niter)->property (X_("alias")); + name = child->property (X_("name")); + alias = child->property (X_("alias")); if (name && alias) { color_aliases.insert (make_pair (name->value(), alias->value())); @@ -557,11 +558,12 @@ UIConfiguration::load_colors (XMLNode const & node) colors.clear (); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() != X_("Color")) { + XMLNode const * child = *niter; + if (child->name() != X_("Color")) { continue; } - name = (*niter)->property (X_("name")); - color = (*niter)->property (X_("value")); + name = child->property (X_("name")); + color = child->property (X_("value")); if (name && color) { ArdourCanvas::Color c; @@ -583,12 +585,13 @@ UIConfiguration::load_modifiers (XMLNode const & node) modifiers.clear (); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() != X_("Modifier")) { + XMLNode const * child = *niter; + if (child->name() != X_("Modifier")) { continue; } - name = (*niter)->property (X_("name")); - mod = (*niter)->property (X_("modifier")); + name = child->property (X_("name")); + mod = child->property (X_("modifier")); if (name && mod) { SVAModifier svam (mod->value()); diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 713ca1ca12..53336fa507 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -155,38 +155,38 @@ VideoTimeLine::set_session (ARDOUR::Session *s) set_id(*node); - const XMLProperty* proph = node->property (X_("Height")); + XMLProperty const * proph = node->property (X_("Height")); if (proph) { editor->set_video_timeline_height(atoi(proph->value())); } #if 0 /* TODO THINK: set FPS first time only ?! */ - const XMLProperty* propasfps = node->property (X_("AutoFPS")); + XMLProperty const * propasfps = node->property (X_("AutoFPS")); if (propasfps) { auto_set_session_fps = atoi(propasfps->value())?true:false; } #endif - const XMLProperty* propoffset = node->property (X_("VideoOffset")); + XMLProperty const * propoffset = node->property (X_("VideoOffset")); if (propoffset) { video_offset = atoll(propoffset->value()); video_offset_p = video_offset; } - const XMLProperty* proplock = node->property (X_("VideoOffsetLock")); + XMLProperty const * proplock = node->property (X_("VideoOffsetLock")); if (proplock) { video_offset_lock = atoi(proplock->value())?true:false; } - const XMLProperty* localfile = node->property (X_("LocalFile")); + XMLProperty const * localfile = node->property (X_("LocalFile")); if (localfile) { local_file = atoi(localfile->value())?true:false; } - const XMLProperty* propf = node->property (X_("Filename")); + XMLProperty const * propf = node->property (X_("Filename")); video_file_info(propf->value(), local_file); if ((node = _session->extra_xml (X_("Videomonitor")))) { - const XMLProperty* prop = node->property (X_("active")); + XMLProperty const * prop = node->property (X_("active")); if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) { open_video_monitor(); } @@ -225,7 +225,7 @@ int VideoTimeLine::set_state (const XMLNode& node, int /*version*/) { LocaleGuard lg (X_("C")); - const XMLProperty* propoffset = node.property (X_("VideoOffset")); + XMLProperty const * propoffset = node.property (X_("VideoOffset")); if (propoffset) { video_offset = atoll(propoffset->value()); } @@ -804,7 +804,7 @@ VideoTimeLine::open_video_monitor() { /* load mask from Session */ XMLNode* node = _session->extra_xml (X_("XJRestoreSettings")); if (node) { - const XMLProperty* prop = node->property (X_("mask")); + XMLProperty const * prop = node->property (X_("mask")); if (prop) { xj_settings_mask = atoi(prop->value()); } @@ -825,7 +825,7 @@ VideoTimeLine::open_video_monitor() { if (_session) { XMLNode* node = _session->extra_xml (X_("Videomonitor")); if (node) { - const XMLProperty* prop = node->property (X_("active")); + XMLProperty const * prop = node->property (X_("active")); if (prop && prop->value() != "yes") _session->set_dirty (); } else { _session->set_dirty (); -- cgit v1.2.3