ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove operator= from GUIObjectState since its no longer required (the default will do the right thing)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11613 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-03-07 02:08:46 +00:00
parent 3c7f9586ae
commit cbfe2f2fa5
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/gui_object.cc
View File

@ -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
{

5
gtk2_ardour/gui_object.h
View File

@ -34,15 +34,13 @@ class GUIObjectState
{
public:
GUIObjectState ();
XMLNode& get_state () const;
int set_state (const XMLNode&);
static const std::string xml_node_name;
void load (const XMLNode&);
GUIObjectState& operator= (const GUIObjectState& other);
std::string get_string (const std::string& id, const std::string& prop_name, bool* empty = 0);
template<typename T> void set (const std::string& id, const std::string& prop_name, const T& val) {
@ -59,7 +57,6 @@ public:
static XMLNode* get_or_add_node (XMLNode *, const std::string &);
private:
XMLNode _state;
};