Changeset 1486 for code/branches/network/src/core/InputBuffer.cc

Timestamp:

May 30, 2008, 3:02:03 PM (16 years ago)

Author:

rgrieder

Message:

• fixed the InputBufferListener bug in a proper way It looks a little bit ugly, but at least it's got a new feature: You don't need to derive from InputBufferListener (removed it)
• commented the shader hack in Model.cc

File:

• code/branches/network/src/core/InputBuffer.cc (modified) (4 diffs)

code/branches/network/src/core/InputBuffer.cc

@@ -88 +88 @@
     }
 
-    void InputBuffer::unregisterListener(InputBufferListener* listener)
-    {
-        for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); )
-        {
-            if ((*it).listener_ == listener)
-                this->listeners_.erase(it++);
-            else
-                ++it;
-        }
-    }
-
     void InputBuffer::set(const std::string& input, bool update)
     {
@@ -165 +154 @@
     void InputBuffer::updated()
     {
-        for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
-        {
-            if ((*it).bListenToAllChanges_)
-                (*(*it).listener_.*(*it).function_)();
+        for (std::list<BaseInputBufferListenerTuple*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
+        {
+            if ((*it)->bListenToAllChanges_)
+                (*it)->callFunction();
         }
     }
@@ -174 +163 @@
     void InputBuffer::updated(const char& update, bool bSingleInput)
     {
-        for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
-        {
-            if ((!(*it).trueKeyFalseChar_) && ((*it).bListenToAllChanges_ || ((*it).char_ == update)) && (!(*it).bOnlySingleInput_ || bSingleInput))
-                (*(*it).listener_.*(*it).function_)();
+        for (std::list<BaseInputBufferListenerTuple*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
+        {
+            if ((!(*it)->trueKeyFalseChar_) && ((*it)->bListenToAllChanges_ || ((*it)->char_ == update)) && (!(*it)->bOnlySingleInput_ || bSingleInput))
+                (*it)->callFunction();
         }
     }
@@ -195 +184 @@
             return;
 
-        for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
-        {
-            if ((*it).trueKeyFalseChar_ && ((*it).key_ == evt.key))
-                (*(*it).listener_.*(*it).function_)();
+        for (std::list<BaseInputBufferListenerTuple*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
+        {
+            if ((*it)->trueKeyFalseChar_ && ((*it)->key_ == evt.key))
+                (*it)->callFunction();
         }