NO-OP: name-change (_list and _lock are also used in other places)

Derived classes need to explicitly specify namespace and class
to avoid ambiguities (even for private members)

diff --git a/libs/pbd/pbd/signals.h b/libs/pbd/pbd/signals.h
index df4c9cef29331c5d3b0477143d932e0c7fc4df8e..9640008591a484a1c06a5bea566e5c5df1753329 100644 (file)
--- a/libs/pbd/pbd/signals.h
+++ b/libs/pbd/pbd/signals.h
@@ -191,10 +191,10 @@ class LIBPBD_API ScopedConnectionList  : public boost::noncopyable
               one from another.
         */
 
-       Glib::Threads::Mutex _lock;
+       Glib::Threads::Mutex _scoped_connection_lock;
 
        typedef std::list<ScopedConnection*> ConnectionList;
-       ConnectionList _list;
+       ConnectionList _scoped_connection_list;
 };
 
 #include "pbd/signals_generated.h"

diff --git a/libs/pbd/signals.cc b/libs/pbd/signals.cc
index e01351a86733c139e9cf52deb7ce6908bab4ddda..54bd1f6797066452d42b64fdf683418b73c73dcc 100644 (file)
--- a/libs/pbd/signals.cc
+++ b/libs/pbd/signals.cc
@@ -34,19 +34,19 @@ ScopedConnectionList::~ScopedConnectionList()
 void
 ScopedConnectionList::add_connection (const UnscopedConnection& c)
 {
-       Glib::Threads::Mutex::Lock lm (_lock);
-       _list.push_back (new ScopedConnection (c));
+       Glib::Threads::Mutex::Lock lm (_scoped_connection_lock);
+       _scoped_connection_list.push_back (new ScopedConnection (c));
 }
 
 void
 ScopedConnectionList::drop_connections ()
 {
-       Glib::Threads::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_scoped_connection_lock);
 
-       for (ConnectionList::iterator i = _list.begin(); i != _list.end(); ++i) {
+       for (ConnectionList::iterator i = _scoped_connection_list.begin(); i != _scoped_connection_list.end(); ++i) {
                delete *i;
        }
 
-       _list.clear ();
+       _scoped_connection_list.clear ();
 }