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
This commit is contained in:
parent
3c7f9586ae
commit
cbfe2f2fa5
|
@ -38,6 +38,7 @@ GUIObjectState::get_node (const XMLNode* parent, const string& id)
|
||||||
{
|
{
|
||||||
XMLNodeList const & children = parent->children ();
|
XMLNodeList const & children = parent->children ();
|
||||||
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
|
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
|
||||||
|
|
||||||
if ((*i)->name() != X_("Object")) {
|
if ((*i)->name() != X_("Object")) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -81,6 +82,7 @@ string
|
||||||
GUIObjectState::get_string (const string& id, const string& prop_name, bool* empty)
|
GUIObjectState::get_string (const string& id, const string& prop_name, bool* empty)
|
||||||
{
|
{
|
||||||
XMLNode* child = get_node (&_state, id);
|
XMLNode* child = get_node (&_state, id);
|
||||||
|
|
||||||
if (!child) {
|
if (!child) {
|
||||||
if (empty) {
|
if (empty) {
|
||||||
*empty = true;
|
*empty = true;
|
||||||
|
@ -126,13 +128,6 @@ GUIObjectState::load (const XMLNode& node)
|
||||||
(void) set_state (node);
|
(void) set_state (node);
|
||||||
}
|
}
|
||||||
|
|
||||||
GUIObjectState&
|
|
||||||
GUIObjectState::operator= (const GUIObjectState& other)
|
|
||||||
{
|
|
||||||
_state = other._state;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::list<string>
|
std::list<string>
|
||||||
GUIObjectState::all_ids () const
|
GUIObjectState::all_ids () const
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,15 +34,13 @@ class GUIObjectState
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GUIObjectState ();
|
GUIObjectState ();
|
||||||
|
|
||||||
XMLNode& get_state () const;
|
XMLNode& get_state () const;
|
||||||
int set_state (const XMLNode&);
|
int set_state (const XMLNode&);
|
||||||
|
|
||||||
static const std::string xml_node_name;
|
static const std::string xml_node_name;
|
||||||
void load (const XMLNode&);
|
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);
|
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) {
|
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 &);
|
static XMLNode* get_or_add_node (XMLNode *, const std::string &);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
XMLNode _state;
|
XMLNode _state;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user