Changeset 161 for branches/turbo/avango-core/src/avango/fields/Field.cpp

Timestamp:

05/15/09 17:33:25 (3 years ago)

Author:

rkuck

Message:

Removed all Field callbacks except getter and setter

File:

• branches/turbo/avango-core/src/avango/fields/Field.cpp (modified) (9 diffs)

branches/turbo/avango-core/src/avango/fields/Field.cpp

@@ -182 +182 @@
 
   // copy and reference auditors while in notify because the connection topology may change
-
   FieldPtrVec auditors;
   auditors.reserve(mAuditors.size());
@@ -189 +188 @@
   FieldPtrVec::const_iterator current;
   FieldPtrVec::const_iterator past_of_end = auditors.end();
-
-  // create references to field containers
-  std::vector<Link<FieldContainer> > auditor_containers;
-  auditor_containers.reserve(mAuditors.size());
-  std::transform(auditors.begin(), auditors.end(), std::back_inserter(auditor_containers),
-                 boost::bind(&Field::getContainer, _1));
-
-  // notify
-
   for (current = auditors.begin(); current != past_of_end; ++current)
   {
@@ -344 +334 @@
   if (notifyEnabled())
   {
-    mChangedSignal(ChangedEvent(this, fromNet, triggeredFrom));
+    mContainer->fieldChanged(*this, fromNet);
     notify(triggeredFrom);
     ContainerPool::notifyFieldHasChanged(this);
@@ -370 +360 @@
   mConnectedFrom.push_back(std::make_pair(field, dependent));
   field->addAuditor(this);
-  mConnectedSignal(ConnectedEvent(this, field));
 
   ContainerPool::notifyConnect(this);
@@ -401 +390 @@
   // we can notice disconnects this way
   touch();
-
-  mDisconnectedSignal(DisconnectedEvent(this, disconnected_fields));
 
   ContainerPool::notifyDisconnect(this);
@@ -453 +440 @@
   touch();
 
-  mDisconnectedSignal(DisconnectedEvent(this, std::vector<Field*>(1, field)));
-
   ContainerPool::notifyDisconnect(this);
 }
@@ -505 +490 @@
 
 void
-av::Field::containerFieldChanged(const ChangedEvent& event)
-{
-  AV_ASSERT(this == event.getField());
-  mContainer->fieldChanged(*(event.getField()), event.getChangedFromNet());
-}
-
-void
 av::Field::bind(av::FieldContainer* container, const std::string& name, bool owned)
 {
@@ -526 +504 @@
   unsigned int index = container->addField(this, name);
   setContainer(container, index, owned);
-  addChangedCallback(boost::bind(&Field::containerFieldChanged, this, _1));
 }
 
@@ -708 +685 @@
 }
 
-av::Field::ChangedCallbackHandle
-av::Field::addChangedCallback(const ChangedCallback& callback)
-{
-  return mChangedSignal.connect(callback);
-}
-
-void
-av::Field::removeChangedCallback(const ChangedCallbackHandle& handle)
-{
-  handle.disconnect();
-}
-
-av::Field::ConnectedCallbackHandle
-av::Field::addConnectedCallback(const ConnectedCallback& callback)
-{
-  return mConnectedSignal.connect(callback);
-}
-
-void
-av::Field::removeConnectedCallback(const ConnectedCallbackHandle& handle)
-{
-  handle.disconnect();
-}
-
-av::Field::DisconnectedCallbackHandle
-av::Field::addDisconnectedCallback(const DisconnectedCallback& callback)
-{
-  return mDisconnectedSignal.connect(callback);
-}
-
-void
-av::Field::removeDisconnectedCallback(const DisconnectedCallbackHandle& handle)
-{
-  handle.disconnect();
-}
-
 void
 av::Field::evaluateDependencies(void)