big batch of progress

[chaz/yoink] / src / dispatcher.cc

diff --git a/src/dispatcher.cc b/src/dispatcher.cc
index 509b69d151bd039e5bf85d8f1d717e172c6321e7..d42077a2ec8b20a300051ae6f69e87b43ee4d775 100644 (file)
--- a/src/dispatcher.cc
+++ b/src/dispatcher.cc
@@ -37,7 +37,7 @@ namespace dc {
 notification::~notification() {}
 
 
-class dispatcher_impl
+class dispatcher::dispatcher_impl
 {
 public:
        dispatcher_impl() : id(1) {}
@@ -62,9 +62,11 @@ public:
 };
 
 
-dispatcher::dispatcher() : impl(new dispatcher_impl) {}
+dispatcher::dispatcher() : impl(new dispatcher::dispatcher_impl) {}
 
 
+// TODO these methods are ugly
+
 dispatcher::handler dispatcher::addHandler(const std::string& message,
                const function& callback)
 {
@@ -74,8 +76,8 @@ dispatcher::handler dispatcher::addHandler(const std::string& message,
 dispatcher::handler dispatcher::addHandler(const std::string& message,
                const function& callback, handler id)
 {
-       std::pair<std::string,dispatcher_impl::callback_t>
-               callbackPair(message, dispatcher_impl::callback_t(id, callback));
+       std::pair<std::string,dispatcher::dispatcher_impl::callback_t>
+               callbackPair(message, dispatcher::dispatcher_impl::callback_t(id, callback));
 
        std::pair<handler,std::string> handlerPair(id, message);
 
@@ -88,16 +90,16 @@ dispatcher::handler dispatcher::addHandler(const std::string& message,
 
 void dispatcher::removeHandler(handler id)
 {
-       std::pair<dispatcher_impl::handler_it_t,dispatcher_impl::handler_it_t>
+       std::pair<dispatcher::dispatcher_impl::handler_it_t,dispatcher::dispatcher_impl::handler_it_t>
                handlers(impl->handlers.equal_range(id));
 
-       dispatcher_impl::handler_it_t i;
+       dispatcher::dispatcher_impl::handler_it_t i;
        for (i = handlers.first; i != handlers.second; i++)
        {
-               dispatcher_impl::callback_it_t it = impl->callbacks.find((*i).second);
-               dispatcher_impl::callback_it_t last = impl->callbacks.end();
+               dispatcher::dispatcher_impl::callback_it_t it = impl->callbacks.find((*i).second);
+               dispatcher::dispatcher_impl::callback_it_t last = impl->callbacks.end();
 
-               dispatcher_impl::callback_it_t j;
+               dispatcher::dispatcher_impl::callback_it_t j;
                for (j = it; j != last; j++)
                {
                        if (((*j).second).first == id)
@@ -119,10 +121,10 @@ void dispatcher::dispatch(const std::string& message)
 
 void dispatcher::dispatch(const std::string& message, const notification& param)
 {
-       std::pair<dispatcher_impl::callback_it_t,dispatcher_impl::callback_it_t>
+       std::pair<dispatcher::dispatcher_impl::callback_it_t,dispatcher::dispatcher_impl::callback_it_t>
                callbacks(impl->callbacks.equal_range(message));
 
-       dispatcher_impl::callback_it_t i;
+       dispatcher::dispatcher_impl::callback_it_t i;
        for (i = callbacks.first; i != callbacks.second; i++)
        {
                function callback = ((*i).second).second;
@@ -133,3 +135,5 @@ void dispatcher::dispatch(const std::string& message, const notification& param)
 
 } // namespace dc
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+