Convert more modules

[user/henk/code/inspircd.git] / src / modules / m_watch.cpp

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 77bbf90a1a818f8c10b394b9cd75516a2b0716de..5eda2d0e23c0ef14842916ce8b4b45c629bbc2ed 100644 (file)
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -70,7 +70,7 @@ typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash_compare
 #else
 typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> > watchentries;
 #endif
-typedef std::map<irc::string, std::string>watchlist;
+typedef std::map<irc::string, std::string> watchlist;
 
 /* Who's watching each nickname.
  * NOTE: We do NOT iterate this to display a user's WATCH list!
@@ -445,7 +445,7 @@ class Modulewatch : public Module
                                {
                                        if (!user->Visibility || user->Visibility->VisibleTo(user))
                                                (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, user->age);
-                                       (*wl)[user->nick] = "";
+                                       (*wl)[oldnick.c_str()] = "";
                                }
                        }
                }
@@ -468,28 +468,5 @@ class Modulewatch : public Module
        }
 };
 
-
-class ModulewatchFactory : public ModuleFactory
-{
- public:
-       ModulewatchFactory()
-       {
-       }
-       
-       ~ModulewatchFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new Modulewatch(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModulewatchFactory;
-}
+MODULE_INIT(Modulewatch);