More cleanup

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 437da4026f5c727134136345191a5498a22d1b67..f5129c83724389877f26ce08bb6cf0133fa9b262 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -451,12 +451,9 @@ chanuserlist Server::GetUsers(chanrec* chan)
 {
        chanuserlist userl;
        userl.clear();
-       std::map<char*,char*> *list = chan->GetUsers();
-       for (std::map<char*,char*>::iterator i = list->begin(); i != list->end(); i++)
-       {
-               char* o = i->second;
-               userl.push_back((userrec*)o);
-       }
+       CUList *list = chan->GetUsers();
+       for (CUList::iterator i = list->begin(); i != list->end(); i++)
+               userl.push_back(i->second);
        return userl;
 }
 void Server::ChangeUserNick(userrec* user, std::string nickname)
@@ -634,11 +631,6 @@ std::string Server::ChanMode(userrec* User, chanrec* Chan)
        return cmode(User,Chan);
 }
 
-bool Server::IsOnChannel(userrec* User, chanrec* Chan)
-{
-       return has_channel(User,Chan);
-}
-
 std::string Server::GetServerName()
 {
        return Config->ServerName;