Improve X-line text consistency.

[user/henk/code/inspircd.git] / include / bancache.h

diff --git a/include/bancache.h b/include/bancache.h
index 450f711c4e2bcb00695d478ad2db41ed446f4d34..e0c84ab5487ba0c69621df3b2802f2706a0ee768 100644 (file)
--- a/include/bancache.h
+++ b/include/bancache.h
@@ -40,24 +40,20 @@ class CoreExport BanCacheHit
         */
        time_t Expiry;
 
-       BanCacheHit(const std::string &type, const std::string &reason, time_t seconds)
-               : Type(type), Reason(reason), Expiry(ServerInstance->Time() + seconds)
-       {
-       }
+       BanCacheHit(const std::string& type, const std::string& reason, time_t seconds);
 
        bool IsPositive() const { return (!Reason.empty()); }
 };
 
-/* A container of ban cache items.
- * must be defined after class BanCacheHit.
- */
-typedef std::tr1::unordered_map<std::string, BanCacheHit*, std::tr1::hash<std::string> > BanCacheHash;
-
 /** A manager for ban cache, which allocates and deallocates and checks cached bans.
  */
 class CoreExport BanCacheManager
 {
-       BanCacheHash* BanHash;
+       /** A container of ban cache items.
+        */
+       typedef TR1NS::unordered_map<std::string, BanCacheHit*, TR1NS::hash<std::string> > BanCacheHash;
+
+       BanCacheHash BanHash;
        bool RemoveIfExpired(BanCacheHash::iterator& it);
 
  public:
@@ -66,7 +62,7 @@ class CoreExport BanCacheManager
         * @param ip The IP the item is for.
         * @param type The type of ban cache item. std::string. .empty() means it's a negative match (user is allowed freely).
         * @param reason The reason for the ban. Left .empty() if it's a negative match.
-        * @param seconds Number of seconds before nuking the bancache entry, the default is a day. This might seem long, but entries will be removed as glines/etc expire.
+        * @param seconds Number of seconds before nuking the bancache entry, the default is a day. This might seem long, but entries will be removed as G-lines/etc expire.
         */
        BanCacheHit *AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds = 0);
        BanCacheHit *GetHit(const std::string &ip);
@@ -77,9 +73,5 @@ class CoreExport BanCacheManager
         */
        void RemoveEntries(const std::string& type, bool positive);
 
-       BanCacheManager()
-       {
-               this->BanHash = new BanCacheHash();
-       }
        ~BanCacheManager();
 };