Fix a bunch of weird indentation and spacing issues.

16 files changed, 41 insertions, 41 deletions

diff --git a/include/channels.h b/include/channels.h
index 0b38958cc..aa025d4e7 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 29035250d..decb2fcf4 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 d1a9d5e03..64981c634 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -34,7 +34,7 @@
 class CoreExport CommandParser
 {
  public:
- 	typedef TR1NS::unordered_map<std::string, Command*, irc::insensitive, irc::StrHashComp> CommandMap;
+	typedef TR1NS::unordered_map<std::string, Command*, irc::insensitive, irc::StrHashComp> CommandMap;
 
  private:
 	/** Process a command from a user.
diff --git a/include/cull_list.h b/include/cull_list.h
index d29b7b267..41dab5187 100644
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -49,7 +49,7 @@ class CoreExport CullList
 class CoreExport ActionBase : public classbase
 {
  public:
-	 /** Executes this action. */
+	/** Executes this action. */
 	virtual void Call() = 0;
 };
 
diff --git a/include/inspsocket.h b/include/inspsocket.h
index f9cc87b1d..45fa46a5b 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -216,7 +216,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;
 
@@ -276,7 +276,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 dd5acda12..1985ea891 100644
--- a/include/iohook.h
+++ b/include/iohook.h
@@ -24,7 +24,7 @@ class StreamSocket;
 
 class IOHookProvider : public refcountbase, public ServiceProvider
 {
- 	const bool middlehook;
+	const bool middlehook;
 
  public:
 	enum Type
diff --git a/include/message.h b/include/message.h
index 068f31246..ed44868ee 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;
 
-	 /** 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 82dd75770..940ed2144 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
 	{
@@ -579,7 +579,7 @@ class CoreExport ModeParser : public fakederef<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 bce842bd8..aa6092788 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -162,8 +162,8 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	RequestId id;
-	 	/* Creator of this request */
+		RequestId id;
+		/* 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 5a0ea4903..6d036e148 100644
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -59,9 +59,9 @@ class RegexFactory : public DataProvider
 class RegexException : public ModuleException
 {
  public:
-	 RegexException(const std::string& regex, const std::string& error)
-		 : ModuleException("Error in regex '" + regex + "': " + error) { }
+	RegexException(const std::string& regex, const std::string& error)
+		: ModuleException("Error in regex '" + regex + "': " + error) { }
 
-	 RegexException(const std::string& regex, const std::string& error, int offset)
-		 : ModuleException("Error in regex '" + regex + "' at offset " + ConvToStr(offset) + ": " + error) { }
+	RegexException(const std::string& regex, const std::string& error, int offset)
+		: ModuleException("Error in regex '" + regex + "' at offset " + ConvToStr(offset) + ": " + error) { }
 };
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index c9229cf9d..ec16a56c3 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -250,7 +250,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 (SSL)
 	 * @return The TLS (SSL) client certificate information, NULL if the peer is not using TLS (SSL)
@@ -283,7 +283,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 06f127e11..002246d9b 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 192fd29d3..df0cbd5d5 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/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 77999e541..1b88179b6 100644
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -51,11 +51,11 @@ class CoreExport ThreadEngine
 	static DWORD WINAPI Entry(void* parameter);
 
 	/** Create a new thread. This takes an already allocated
-	  * Thread* pointer and initializes it to use this threading
-	  * engine. On failure, this function may throw a CoreException.
-	  * @param thread_to_init Pointer to a newly allocated Thread
-	  * derived object.
-	  */
+	 * Thread* pointer and initializes it to use this threading
+	 * engine. On failure, this function may throw a CoreException.
+	 * @param thread_to_init Pointer to a newly allocated Thread
+	 * derived object.
+	 */
 	void Start(Thread* thread_to_init);
 
 	/** Stop a thread gracefully.
diff --git a/include/users.h b/include/users.h
index 8045d5705..1283d9fb3 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 */
 };
 
 enum UserType {
@@ -712,7 +712,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)