[Improve BanEntry clinton@unknownlamer.org**20081116000959 * No longer has any friend classes * BanEntry::getMask returns the actual Mask instead of the internal mask String - Updated all users of BanEntry to use slightly different interface ] { hunk ./source/BanEntry.C 36 -String -BanEntry::getMask() +const Mask& +BanEntry::getMask() const hunk ./source/BanEntry.C 39 - return banMask.getMask(); + return banMask; hunk ./source/BanEntry.H 26 -class Commands; -class UserCommands; - hunk ./source/BanEntry.H 37 - String getMask(); - - friend class Commands; - friend class UserCommands; + const Mask& getMask() const; hunk ./source/Channel.C 180 - if ((*it)->getMask() == mask) { + if ((*it)->getMask().getMask() == mask) { hunk ./source/Channel.C 193 - if (mask == (*it)->getMask()) { + if (mask == (*it)->getMask().getMask()) { hunk ./source/Commands.C 180 - if (m.matches((*it)->banMask) && (*it)->banMask.getMask() != m.getMask()) - QUEUE->sendChannelMode(channel, "-b", (*it)->banMask.getMask()); + if (m.matches((*it)->getMask ()) && (*it)->getMask().getMask() != m.getMask()) + QUEUE->sendChannelMode(channel, "-b", (*it)->getMask().getMask()); hunk ./source/Commands.C 310 - ShitEntry *se = bot->shitList->getShit((*it)->getMask(), channel); + ShitEntry *se = bot->shitList->getShit((*it)->getMask().getMask(), channel); hunk ./source/Commands.C 313 - QUEUE->sendChannelMode(channel, "-b", (*it)->getMask()); + QUEUE->sendChannelMode(channel, "-b", (*it)->getMask().getMask()); hunk ./source/Commands.C 831 - if (m.matches((*it)->banMask)) + if (m.matches((*it)->getMask ())) hunk ./source/Commands.C 833 - QUEUE->sendChannelMode(channel, "-b", (*it)->banMask.getMask()); + QUEUE->sendChannelMode(channel, "-b", (*it)->getMask().getMask()); hunk ./source/UserCommands.C 333 - from->sendNotice((*it)->getMask().pad(30) + " -1"); + from->sendNotice((*it)->getMask().getMask().pad(30) + " -1"); hunk ./source/UserCommands.C 335 - from->sendNotice((*it)->getMask().pad(30) + " " + + from->sendNotice((*it)->getMask().getMask().pad(30) + " " + hunk ./source/UserCommands.C 1403 - if (m.matches((*it)->banMask)) - cnx->queue->sendChannelMode(channel, "-b", (*it)->banMask.getMask()); + if (m.matches((*it)->getMask())) + cnx->queue->sendChannelMode(channel, "-b", (*it)->getMask().getMask()); }