diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-03-07 02:08:46 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-03-07 02:08:46 +0000 |
commit | cbfe2f2fa56bd44536e1dbf9dbd3419b5be5f535 (patch) | |
tree | 4f08d52bd71fe5c0e4f92a08a0ad027f5b9cdaab /gtk2_ardour/gui_object.cc | |
parent | 3c7f9586aec6d1e26966c4b836fb2ee9505e0146 (diff) |
remove operator= from GUIObjectState since its no longer required (the default will do the right thing)
git-svn-id: svn://localhost/ardour2/branches/3.0@11613 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gui_object.cc')
-rw-r--r-- | gtk2_ardour/gui_object.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc index 84c9fe7c67..3e21f82fa4 100644 --- a/gtk2_ardour/gui_object.cc +++ b/gtk2_ardour/gui_object.cc @@ -38,6 +38,7 @@ GUIObjectState::get_node (const XMLNode* parent, const string& id) { XMLNodeList const & children = parent->children (); for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { + if ((*i)->name() != X_("Object")) { continue; } @@ -81,6 +82,7 @@ string GUIObjectState::get_string (const string& id, const string& prop_name, bool* empty) { XMLNode* child = get_node (&_state, id); + if (!child) { if (empty) { *empty = true; @@ -126,13 +128,6 @@ GUIObjectState::load (const XMLNode& node) (void) set_state (node); } -GUIObjectState& -GUIObjectState::operator= (const GUIObjectState& other) -{ - _state = other._state; - return *this; -} - std::list<string> GUIObjectState::all_ids () const { |