diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-04 23:09:37 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-04 23:09:45 -0400 |
commit | 17ace643e4edbec1e5bd7b446d039f8c94beef75 (patch) | |
tree | dfd1d426f61cdb8bb5dd7d0dc0114c8960b761e8 /libs/gtkmm2ext/window_proxy.cc | |
parent | 9b3b1d945f72324a5ee38b7053a54e9d257c41db (diff) |
OMNIBUS COMMIT: prefer const XMLNode::property method (and provide a real one)
Diffstat (limited to 'libs/gtkmm2ext/window_proxy.cc')
-rw-r--r-- | libs/gtkmm2ext/window_proxy.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libs/gtkmm2ext/window_proxy.cc b/libs/gtkmm2ext/window_proxy.cc index d859c730c0..28ec4fb28d 100644 --- a/libs/gtkmm2ext/window_proxy.cc +++ b/libs/gtkmm2ext/window_proxy.cc @@ -84,12 +84,13 @@ int WindowProxy::set_state (const XMLNode& node, int /* version */) { XMLNodeList children = node.children (); - + XMLNode const * child; XMLNodeList::const_iterator i = children.begin (); while (i != children.end()) { - XMLProperty* prop = (*i)->property (X_("name")); - if ((*i)->name() == X_("Window") && prop && prop->value() == _name) { + child = *i; + XMLProperty const * prop = child->property (X_("name")); + if (child->name() == X_("Window") && prop && prop->value() == _name) { break; } @@ -98,22 +99,23 @@ WindowProxy::set_state (const XMLNode& node, int /* version */) if (i != children.end()) { - XMLProperty* prop; + XMLProperty const * prop; + child = *i; - if ((prop = (*i)->property (X_("visible"))) != 0) { + if ((prop = child->property (X_("visible"))) != 0) { _visible = PBD::string_is_affirmative (prop->value ()); } - if ((prop = (*i)->property (X_("x-off"))) != 0) { + if ((prop = child->property (X_("x-off"))) != 0) { _x_off = atoi (prop->value()); } - if ((prop = (*i)->property (X_("y-off"))) != 0) { + if ((prop = child->property (X_("y-off"))) != 0) { _y_off = atoi (prop->value()); } - if ((prop = (*i)->property (X_("x-size"))) != 0) { + if ((prop = child->property (X_("x-size"))) != 0) { _width = atoi (prop->value()); } - if ((prop = (*i)->property (X_("y-size"))) != 0) { + if ((prop = child->property (X_("y-size"))) != 0) { _height = atoi (prop->value()); } } |