diff options
| author | Adam <Adam@anope.org> | 2011-10-24 16:37:29 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-10-24 16:37:29 -0400 |
| commit | 7c62de1f27ee21e41b7655e9d82a227f6e2cf2b5 (patch) | |
| tree | 9393c1c5b18c3d34da786556f960fe5cc010ee98 /include/regchannel.h | |
| parent | ccf29c013465ba4b9709c04ba4452f4454b1ebdc (diff) | |
| parent | 377a7a968b6a906f262a45abea9a563ffc471938 (diff) | |
Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
Diffstat (limited to 'include/regchannel.h')
| -rw-r--r-- | include/regchannel.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/regchannel.h b/include/regchannel.h index 680be5b44..62d3eeccc 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -152,7 +152,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, std::vector<ChanAccess *> access; /* List of authorized users */ std::vector<AutoKick *> akick; /* List of users to kickban */ std::vector<BadWord *> badwords; /* List of badwords */ - std::map<Anope::string, int16> levels; + std::map<Anope::string, int16_t> levels; public: typedef std::multimap<ChannelModeName, ModeLock> ModeList; @@ -184,7 +184,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, Anope::string last_topic_setter; /* Setter */ time_t last_topic_time; /* Time */ - int16 bantype; + int16_t bantype; MemoInfo memos; @@ -193,11 +193,11 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, /* For BotServ */ BotInfo *bi; /* Bot used on this channel */ Flags<BotServFlag> botflags; - int16 ttb[TTB_SIZE]; /* Times to ban for each kicker */ + int16_t ttb[TTB_SIZE]; /* Times to ban for each kicker */ - int16 capsmin, capspercent; /* For CAPS kicker */ - int16 floodlines, floodsecs; /* For FLOOD kicker */ - int16 repeattimes; /* For REPEAT kicker */ + int16_t capsmin, capspercent; /* For CAPS kicker */ + int16_t floodlines, floodsecs; /* For FLOOD kicker */ + int16_t repeattimes; /* For REPEAT kicker */ serialized_data serialize(); static void unserialize(serialized_data &); @@ -377,7 +377,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, ModeLock *GetMLock(ChannelModeName mname, const Anope::string ¶m = ""); /** Get the current mode locks as a string - * @param complete True to show mlock parameters aswell + * @param complete True to show mlock parameters aswell * @return A string of mode locks, eg: +nrt */ Anope::string GetMLockAsString(bool complete) const; @@ -393,7 +393,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, * the new topic in the ChannelInfo */ void CheckTopic(); - + /** Restore the channel topic, used on channel creation when not syncing with the uplink * and after uplink sync */ @@ -404,13 +404,13 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, * @return the level * @throws CoreException if priv is not a valid privilege */ - int16 GetLevel(const Anope::string &priv); + int16_t GetLevel(const Anope::string &priv); /** Set the level for a privilege * @param priv The privilege priv * @param level The new level */ - void SetLevel(const Anope::string &priv, int16 level); + void SetLevel(const Anope::string &priv, int16_t level); /** Remove a privilege from the channel * @param priv The privilege |