Merge branch 'insp3' into master.

17 files changed, 35 insertions, 35 deletions

diff --git a/include/channels.h b/include/channels.h
index fc63bf2fc..bb3c56238 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -42,7 +42,7 @@ class CoreExport Channel : public Extensible
  public:
 	/** A map of Memberships on a channel keyed by User pointers
 	 */
- 	typedef std::map<User*, insp::aligned_storage<Membership> > MemberMap;
+	typedef std::map<User*, insp::aligned_storage<Membership> > MemberMap;
 
  private:
 	/** Set default modes for the channel on creation
@@ -117,23 +117,23 @@ class CoreExport Channel : public Extensible
 	void SetMode(ModeHandler* mode, bool value);
 
 	/** Returns true if a mode is set on a channel
-	  * @param mode The mode character you wish to query
-	  * @return True if the custom mode is set, false if otherwise
-	  */
+	 * @param mode The mode character you wish to query
+	 * @return True if the custom mode is set, false if otherwise
+	 */
 	bool IsModeSet(ModeHandler* mode) { return ((mode->GetId() != ModeParser::MODEID_MAX) && (modes[mode->GetId()])); }
 	bool IsModeSet(ModeHandler& mode) { return IsModeSet(&mode); }
 	bool IsModeSet(ChanModeReference& mode);
 
 	/** Returns the parameter for a custom mode on a channel.
-	  * @param mode The mode character you wish to query
-	  *
-	  * For example if "+L #foo" is set, and you pass this method
-	  * 'L', it will return '\#foo'. If the mode is not set on the
-	  * channel, or the mode has no parameters associated with it,
-	  * it will return an empty string.
-	  *
-	  * @return The parameter for this mode is returned, or an empty string
-	  */
+	 * @param mode The mode character you wish to query
+	 *
+	 * For example if "+L #foo" is set, and you pass this method
+	 * 'L', it will return '\#foo'. If the mode is not set on the
+	 * channel, or the mode has no parameters associated with it,
+	 * it will return an empty string.
+	 *
+	 * @return The parameter for this mode is returned, or an empty string
+	 */
 	std::string GetModeParameter(ModeHandler* mode);
 	std::string GetModeParameter(ChanModeReference& mode);
 	std::string GetModeParameter(ParamModeBase* pm);
diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index c02c54ef6..c70e61def 100644
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -249,7 +249,7 @@ class ClientProtocol::Message : public ClientProtocol::MessageSource
 			: ptr(NULL)
 			, owned(true)
 		{
-			 new(str) std::string(s);
+			new(str) std::string(s);
 		}
 
 		Param(const Param& other)
diff --git a/include/command_parse.h b/include/command_parse.h
index cc02f03ba..9411a6ea5 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -34,7 +34,7 @@
 class CoreExport CommandParser
 {
  public:
- 	typedef std::unordered_map<std::string, Command*, irc::insensitive, irc::StrHashComp> CommandMap;
+	typedef std::unordered_map<std::string, Command*, irc::insensitive, irc::StrHashComp> CommandMap;
 
  private:
 	/** Process a command from a user.
diff --git a/include/configreader.h b/include/configreader.h
index a0ecde6b5..c45cb0d95 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -44,7 +44,7 @@ public:
 	Items items;
 
  public:
- 	/** The name of the configuration tag (e.g. "foo" for \<foo bar="baz">). */
+	/** The name of the configuration tag (e.g. "foo" for \<foo bar="baz">). */
 	const std::string name;
 
 	/** The position within the source file that this tag was read from. */
diff --git a/include/cull.h b/include/cull.h
index 7660f2109..bcda9ccd7 100644
--- a/include/cull.h
+++ b/include/cull.h
@@ -73,7 +73,7 @@ class CoreExport CullList
 class CoreExport ActionBase : public Cullable
 {
  public:
-	 /** Executes this action. */
+	/** Executes this action. */
 	virtual void Call() = 0;
 };
 
diff --git a/include/inspsocket.h b/include/inspsocket.h
index bcffc8511..612f0399e 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -214,7 +214,7 @@ class CoreExport StreamSocket : public EventHandler
 		}
 
 	 private:
-	 	/** Private send queue. Note that individual strings may be shared.
+		/** Private send queue. Note that individual strings may be shared.
 		 */
 		Container data;
 
@@ -274,7 +274,7 @@ class CoreExport StreamSocket : public EventHandler
 	 * @param hook Next IOHook in the chain, can be NULL
 	 * @param rq Receive queue to put incoming data into
 	 * @return < 0 on error or close, 0 if no new data is ready (but the socket is still connected), > 0 if data was read from
-	 the socket and put into the recvq
+	 * the socket and put into the recvq
 	 */
 	int HookChainRead(IOHook* hook, std::string& rq);
 
diff --git a/include/iohook.h b/include/iohook.h
index 83d752620..717099c61 100644
--- a/include/iohook.h
+++ b/include/iohook.h
@@ -26,7 +26,7 @@ class IOHookProvider
 	: public std::enable_shared_from_this<IOHookProvider>
 	, public ServiceProvider
 {
- 	const bool middlehook;
+	const bool middlehook;
 
  public:
 	enum Type
diff --git a/include/message.h b/include/message.h
index 3bbe50da6..e7765d5d0 100644
--- a/include/message.h
+++ b/include/message.h
@@ -42,7 +42,7 @@ class CoreExport MessageDetails
 	/** Whether to update the source user's idle time. */
 	bool update_idle = true;
 
-	 /** The users who are exempted from receiving this message. */
+	/** The users who are exempted from receiving this message. */
 	CUList exemptions;
 
 	/* The original message as sent by the user. */
diff --git a/include/mode.h b/include/mode.h
index 1d6b36901..a7abd1814 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -99,7 +99,7 @@ class ParamModeBase;
 class CoreExport ModeHandler : public ServiceProvider
 {
  public:
-  	typedef size_t Id;
+	typedef size_t Id;
 
 	enum Class
 	{
@@ -570,7 +570,7 @@ class CoreExport ModeParser
  private:
 	/** Type of the container that maps mode names to ModeWatchers
 	 */
- 	typedef insp::flat_multimap<std::string, ModeWatcher*> ModeWatcherMap;
+	typedef insp::flat_multimap<std::string, ModeWatcher*> ModeWatcherMap;
 
 	/** Last item in the ModeType enum
 	 */
diff --git a/include/modules/callerid.h b/include/modules/callerid.h
index eda930d28..989a5918c 100644
--- a/include/modules/callerid.h
+++ b/include/modules/callerid.h
@@ -28,7 +28,7 @@ namespace CallerID
 class CallerID::APIBase : public DataProvider
 {
  public:
- 	APIBase(Module* parent)
+	APIBase(Module* parent)
 		: DataProvider(parent, "m_callerid_api")
 	{
 	}
diff --git a/include/modules/dns.h b/include/modules/dns.h
index 179aa778d..70473a475 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -174,8 +174,8 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	RequestId id = 0;
-	 	/* Creator of this request */
+		RequestId id = 0;
+		/* Creator of this request */
 		Module* const creator;
 
 		Request(Manager* mgr, Module* mod, const std::string& addr, QueryType qt, bool usecache = true, unsigned int timeout = 0)
diff --git a/include/modules/regex.h b/include/modules/regex.h
index 549b00918..2bf7763e6 100644
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -84,7 +84,7 @@ class Regex::SimpleEngine final
 	: public Regex::Engine
 {
  public:
- 	/** @copydoc Regex::Engine::Engine */
+	/** @copydoc Regex::Engine::Engine */
 	SimpleEngine(Module* Creator, const std::string& Name)
 		: Regex::Engine(Creator, Name)
 	{
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index fc1bcfb1a..0328967df 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -239,7 +239,7 @@ class SSLIOHook : public IOHook
 class SSLClientCert
 {
  public:
- 	/**
+	/**
 	 * Get the client certificate from a socket
 	 * @param sock The socket to get the certificate from, the socket does not have to use TLS
 	 * @return The TLS client certificate information, NULL if the peer is not using TLS
@@ -272,7 +272,7 @@ class SSLClientCert
 class UserCertificateAPIBase : public DataProvider
 {
  public:
- 	UserCertificateAPIBase(Module* parent)
+	UserCertificateAPIBase(Module* parent)
 		: DataProvider(parent, "m_sslinfo_api")
 	{
 	}
diff --git a/include/parammode.h b/include/parammode.h
index 4c5b78ee0..260f56cfd 100644
--- a/include/parammode.h
+++ b/include/parammode.h
@@ -23,7 +23,7 @@
 class CoreExport ParamModeBase : public ModeHandler
 {
  private:
- 	virtual void OnUnsetInternal(User* source, Channel* chan) = 0;
+	virtual void OnUnsetInternal(User* source, Channel* chan) = 0;
 
  public:
 	ParamModeBase(Module* Creator, const std::string& Name, char modeletter, ParamSpec ps)
diff --git a/include/serialize.h b/include/serialize.h
index 9c7c700cd..36c4dd284 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -44,7 +44,7 @@ class CoreExport Serializable
 		EntryMap entries;
 
 	 public:
-		 /** Retrieves the child elements. */
+		/** Retrieves the child elements. */
 		const ChildMap& GetChildren() const { return children; }
 		ChildMap& GetChildren() { return children; }
 
diff --git a/include/users.h b/include/users.h
index 690e2df09..7597e581e 100644
--- a/include/users.h
+++ b/include/users.h
@@ -61,8 +61,8 @@ enum RegistrationState {
 
 	REG_USER = 1,		/* Has sent USER */
 	REG_NICK = 2,		/* Has sent NICK */
-	REG_NICKUSER = 3, 	/* Bitwise combination of REG_NICK and REG_USER */
-	REG_ALL = 7	  	/* REG_NICKUSER plus next bit along */
+	REG_NICKUSER = 3,	/* Bitwise combination of REG_NICK and REG_USER */
+	REG_ALL = 7			/* REG_NICKUSER plus next bit along */
 };
 
 /** Holds information relevant to &lt;connect allow&gt; and &lt;connect deny&gt; tags in the config file.
@@ -632,7 +632,7 @@ class CoreExport User : public Extensible
 class CoreExport UserIOHandler : public StreamSocket
 {
  private:
-	 size_t checked_until;
+	size_t checked_until;
  public:
 	LocalUser* const user;
 	UserIOHandler(LocalUser* me)
diff --git a/include/utility/uncopiable.h b/include/utility/uncopiable.h
index 73f658238..937306f94 100644
--- a/include/utility/uncopiable.h
+++ b/include/utility/uncopiable.h
@@ -28,7 +28,7 @@ namespace insp
 class insp::uncopiable
 {
  private:
- 	/** Prevents copying via the copy constructor. */
+	/** Prevents copying via the copy constructor. */
 	uncopiable(const uncopiable&) = delete;
 
 	/** Prevents copying via the assignment operator. */