remove operator= from GUIObjectState since its no longer required (the default will...

git-svn-id: svn://localhost/ardour2/branches/3.0@11613 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc
index 84c9fe7c673088e6a847c372c6756fa42d557c03..3e21f82fa424280bd76d56991081b0c5bc7453f3 100644 (file)
--- 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
 {

diff --git a/gtk2_ardour/gui_object.h b/gtk2_ardour/gui_object.h
index 694a5e9212cdb7d4b99b5d4e100751d757085afa..dd56f4b34ca44ff8229aa478498d79ff41f9d8f8 100644 (file)
--- a/gtk2_ardour/gui_object.h
+++ b/gtk2_ardour/gui_object.h
@@ -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;
 };