C++ Readability Review for caitkp

base/callback_list.h.pump

 $$ This is a pump file for generating file templates.  Pump is a python
 $$ script that is part of the Google Test suite of utilities.  Description
 $$ can be found here:
 $$
 $$ http://code.google.com/p/googletest/wiki/PumpManual
 $$
 
 $$ See comment for MAX_ARITY in base/bind.h.pump.
 $var MAX_ARITY = 7
 
@@ skipping 32 matching lines @@
 //   RegisterCallback(const OnFooCallback& cb) {
 //     return callback_list_.Add(cb);
 //   }
 //
 //  private:
 //   void NotifyFoo(const Foo& foo) {
 //      callback_list_.Notify(foo);
 //   }
 //
 //   base::CallbackList<void(const Foo&)> callback_list_;
+//
+//   DISALLOW_COPY_AND_ASSIGN(MyWidget);
 // };
 //
 //
 // class MyWidgetListener {
 //  public:
 //   MyWidgetListener::MyWidgetListener() {
 //     foo_subscription_ = MyWidget::GetCurrent()->RegisterCallback(
 //             base::Bind(&MyWidgetListener::OnFoo, this)));
 //   }
 //
 //   MyWidgetListener::~MyWidgetListener() {
 //      // Subscription gets deleted automatically and will deregister
 //      // the callback in the process.
 //   }
 //
 //  private:
 //   void OnFoo(const Foo& foo) {
 //     // Do something.
 //   }
 //
 //   scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
 //       foo_subscription_;
+//
+//   DISALLOW_COPY_AND_ASSIGN(MyWidgetListener);
 // };
 
 namespace base {
 
 namespace internal {
 
 template <typename CallbackType>
 class CallbackListBase {
  public:
   class Subscription {
    public:
     Subscription(CallbackListBase<CallbackType>* list,
                  typename std::list<CallbackType>::iterator iter)
         : list_(list),
-          iter_(iter) {}
+          iter_(iter) {
+    }
 
     ~Subscription() {
       if (list_->active_iterator_count_)
-        (*iter_).Reset();
+        iter_->Reset();
       else
         list_->callbacks_.erase(iter_);
     }
 
    private:
     CallbackListBase<CallbackType>* list_;
     typename std::list<CallbackType>::iterator iter_;
 
     DISALLOW_COPY_AND_ASSIGN(Subscription);
   };
@@ skipping 39 matching lines @@
         ++list_iter_;
       }
       return cb;
     }
 
    private:
     CallbackListBase<CallbackType>* list_;
     typename std::list<CallbackType>::iterator list_iter_;
   };
 
-  CallbackListBase()
-      : active_iterator_count_(0) {}
+  CallbackListBase() : active_iterator_count_(0) {}
 
   ~CallbackListBase() {
     DCHECK_EQ(0, active_iterator_count_);
     DCHECK_EQ(0U, callbacks_.size());
   }
 
   // Returns an instance of a CallbackListBase::Iterator which can be used
   // to run callbacks.
   Iterator GetIterator() {
     return Iterator(this);
@@ skipping 27 matching lines @@
 $for ARITY [[
 $range ARG 1..ARITY
 
 $if ARITY == 0 [[
 template <>
 class CallbackList<void(void)>
     : public internal::CallbackListBase<Callback<void(void)> > {
 ]] $else [[
 template <$for ARG , [[typename A$(ARG)]]>
 class CallbackList<void($for ARG , [[A$(ARG)]])>
-    : public internal::CallbackListBase<
-        Callback<void($for ARG , [[A$(ARG)]])> > {
+    : public internal::CallbackListBase<Callback<void($for ARG , [[A$(ARG)]])> > {
 ]]
 
  public:
 $if ARITY == 0 [[
 
   typedef Callback<void(void)> CallbackType;
 ]] $else [[
 
   typedef Callback<void($for ARG , [[A$(ARG)]])> CallbackType;
 ]]
 
 
   CallbackList() {}
 
   void Notify($for ARG ,
               [[typename internal::CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) {
 $if ARITY == 0 [[
 
     internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
 ]] $else [[
 
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
 ]]
 
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run($for ARG , [[a$(ARG)]]);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 
 ]]  $$ for ARITY
 }  // namespace base
 
 #endif  // BASE_CALLBACK_LIST_H_