Merge pull request #86 from lioncash/vertical-alignments2-electric-boogaloo

Second and final pass of clearing out tabs.

26 files changed, 229 insertions, 238 deletions

diff --git a/Source/Core/Common/ArmEmitter.cpp b/Source/Core/Common/ArmEmitter.cpp
index 00b64606db..7bcd6e8f68 100644
--- a/Source/Core/Common/ArmEmitter.cpp
+++ b/Source/Core/Common/ArmEmitter.cpp
@@ -412,7 +412,7 @@ FixupBranch ARMXEmitter::BL_CC(CCFlags Cond)
 void ARMXEmitter::SetJumpTarget(FixupBranch const &branch)
 {
 	s32 distance =  (s32(code) - 8)  - (s32)branch.ptr;
-     _dbg_assert_msg_(DYNA_REC, distance > -33554432
+	_dbg_assert_msg_(DYNA_REC, distance > -33554432
                      && distance <=  33554432,
                      "SetJumpTarget out of range (%p calls %p)", code,
 					 branch.ptr);
@@ -420,13 +420,13 @@ void ARMXEmitter::SetJumpTarget(FixupBranch const &branch)
 		*(u32*)branch.ptr = (u32)(branch.condition | (10 << 24) | ((distance >> 2) &
 		0x00FFFFFF));
 	else // BL
-		*(u32*)branch.ptr =	(u32)(branch.condition | 0x0B000000 | ((distance >> 2)
+		*(u32*)branch.ptr = (u32)(branch.condition | 0x0B000000 | ((distance >> 2)
 		& 0x00FFFFFF));
 }
 void ARMXEmitter::B (const void *fnptr)
 {
 	s32 distance = (s32)fnptr - (s32(code) + 8);
-        _dbg_assert_msg_(DYNA_REC, distance > -33554432
+	_dbg_assert_msg_(DYNA_REC, distance > -33554432
                      && distance <=  33554432,
                      "B out of range (%p calls %p)", code, fnptr);
 
@@ -553,19 +553,19 @@ void ARMXEmitter::SBC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(6,
 void ARMXEmitter::SBCS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(6, Rd, Rn, Rm, true); }
 void ARMXEmitter::RSC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(7, Rd, Rn, Rm); }
 void ARMXEmitter::RSCS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(7, Rd, Rn, Rm, true); }
-void ARMXEmitter::TST (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(8, R0, Rn, Rm, true); }
-void ARMXEmitter::TEQ (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(9, R0, Rn, Rm, true); }
-void ARMXEmitter::CMP (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(10, R0, Rn, Rm, true); }
-void ARMXEmitter::CMN (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(11, R0, Rn, Rm, true); }
+void ARMXEmitter::TST (           ARMReg Rn, Operand2 Rm) { WriteInstruction(8, R0, Rn, Rm, true); }
+void ARMXEmitter::TEQ (           ARMReg Rn, Operand2 Rm) { WriteInstruction(9, R0, Rn, Rm, true); }
+void ARMXEmitter::CMP (           ARMReg Rn, Operand2 Rm) { WriteInstruction(10, R0, Rn, Rm, true); }
+void ARMXEmitter::CMN (           ARMReg Rn, Operand2 Rm) { WriteInstruction(11, R0, Rn, Rm, true); }
 void ARMXEmitter::ORR (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(12, Rd, Rn, Rm); }
 void ARMXEmitter::ORRS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(12, Rd, Rn, Rm, true); }
-void ARMXEmitter::MOV (ARMReg Rd,			 Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm); }
-void ARMXEmitter::MOVS(ARMReg Rd,			 Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm, true); }
+void ARMXEmitter::MOV (ARMReg Rd,            Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm); }
+void ARMXEmitter::MOVS(ARMReg Rd,            Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm, true); }
 void ARMXEmitter::BIC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(14, Rd, Rn, Rm); }
 void ARMXEmitter::BICS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(14, Rd, Rn, Rm, true); }
-void ARMXEmitter::MVN (ARMReg Rd,			 Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm); }
-void ARMXEmitter::MVNS(ARMReg Rd,			 Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm, true); }
-void ARMXEmitter::MOVW(ARMReg Rd,			 Operand2 Rm) { WriteInstruction(16, Rd, R0, Rm); }
+void ARMXEmitter::MVN (ARMReg Rd,            Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm); }
+void ARMXEmitter::MVNS(ARMReg Rd,            Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm, true); }
+void ARMXEmitter::MOVW(ARMReg Rd,            Operand2 Rm) { WriteInstruction(16, Rd, R0, Rm); }
 void ARMXEmitter::MOVT(ARMReg Rd, Operand2 Rm, bool TopBits) { WriteInstruction(17, Rd, R0, TopBits ? Rm.Value >> 16 : Rm); }
 
 void ARMXEmitter::WriteInstruction (u32 Op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags) // This can get renamed later
@@ -614,11 +614,11 @@ void ARMXEmitter::LSRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedData
 void ARMXEmitter::ASR (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, false, dest, src, op2);}
 void ARMXEmitter::ASRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, true, dest, src, op2);}
 
-void ARMXEmitter::MUL (ARMReg dest,	ARMReg src, ARMReg op2)
+void ARMXEmitter::MUL (ARMReg dest, ARMReg src, ARMReg op2)
 {
 	Write32(condition | (dest << 16) | (src << 8) | (9 << 4) | op2);
 }
-void ARMXEmitter::MULS(ARMReg dest,	ARMReg src, ARMReg op2)
+void ARMXEmitter::MULS(ARMReg dest, ARMReg src, ARMReg op2)
 {
 	Write32(condition | (1 << 20) | (dest << 16) | (src << 8) | (9 << 4) | op2);
 }
@@ -697,11 +697,11 @@ void ARMXEmitter::REV16(ARMReg dest, ARMReg src)
 	Write32(condition | (0x6BF << 16) | (dest << 12) | (0xFB << 4) | src);
 }
 
-void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g,		Operand2 op2)
+void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, Operand2 op2)
 {
 	Write32(condition | (0x320F << 12) | (write_nzcvq << 19) | (write_g << 18) | op2.Imm12Mod());
 }
-void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g,		ARMReg src)
+void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, ARMReg src)
 {
 	Write32(condition | (0x120F << 12) | (write_nzcvq << 19) | (write_g << 18) | src);
 }
diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h
index 9c53cb66f3..836a1072b8 100644
--- a/Source/Core/Common/ArmEmitter.h
+++ b/Source/Core/Common/ArmEmitter.h
@@ -118,7 +118,7 @@ private:
 	OpType Type;
 
 	// IMM types
-	u8	Rotation; // Only for u8 values
+	u8 Rotation; // Only for u8 values
 
 	// Register types
 	u8 IndexOrShift;
@@ -302,9 +302,9 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated);
 // Use this only when you know imm can be made into an Operand2.
 Operand2 AssumeMakeOperand2(u32 imm);
 
-inline Operand2 R(ARMReg Reg)	{ return Operand2(Reg, TYPE_REG); }
-inline Operand2 IMM(u32 Imm)	{ return Operand2(Imm, TYPE_IMM); }
-inline Operand2 Mem(void *ptr)	{ return Operand2((u32)ptr, TYPE_IMM); }
+inline Operand2 R(ARMReg Reg)  { return Operand2(Reg, TYPE_REG); }
+inline Operand2 IMM(u32 Imm)   { return Operand2(Imm, TYPE_IMM); }
+inline Operand2 Mem(void *ptr) { return Operand2((u32)ptr, TYPE_IMM); }
 //usage: struct {int e;} s; STRUCT_OFFSET(s,e)
 #define STRUCT_OFF(str,elem) ((u32)((u32)&(str).elem-(u32)&(str)))
 
@@ -474,8 +474,8 @@ public:
 	void UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor);
 	void SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor);
 
-	void MUL (ARMReg dest,	ARMReg src, ARMReg op2);
-	void MULS(ARMReg dest,	ARMReg src, ARMReg op2);
+	void MUL (ARMReg dest, ARMReg src, ARMReg op2);
+	void MULS(ARMReg dest, ARMReg src, ARMReg op2);
 
 	void UMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
 	void UMULLS(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
@@ -599,7 +599,7 @@ private:
 
 	void VREVX(u32 size, u32 Size, ARMReg Vd, ARMReg Vm);
 
-public:		
+public:
 	NEONXEmitter(ARMXEmitter *emit)
 		: _emit(emit)
 	{}
diff --git a/Source/Core/Common/BreakPoints.cpp b/Source/Core/Common/BreakPoints.cpp
index bd96e2cefc..912afd7fee 100644
--- a/Source/Core/Common/BreakPoints.cpp
+++ b/Source/Core/Common/BreakPoints.cpp
@@ -132,11 +132,11 @@ void MemChecks::AddFromStrings(const TMemChecksStr& mcstrs)
 		std::stringstream ss;
 		ss << std::hex << mcstr;
 		ss >> mc.StartAddress;
-		mc.bRange	= mcstr.find("n") != mcstr.npos;
-		mc.OnRead	= mcstr.find("r") != mcstr.npos;
-		mc.OnWrite	= mcstr.find("w") != mcstr.npos;
-		mc.Log		= mcstr.find("l") != mcstr.npos;
-		mc.Break	= mcstr.find("p") != mcstr.npos;
+		mc.bRange  = mcstr.find("n") != mcstr.npos;
+		mc.OnRead  = mcstr.find("r") != mcstr.npos;
+		mc.OnWrite = mcstr.find("w") != mcstr.npos;
+		mc.Log     = mcstr.find("l") != mcstr.npos;
+		mc.Break   = mcstr.find("p") != mcstr.npos;
 		if (mc.bRange)
 			ss >> mc.EndAddress;
 		else
diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp
index cd9d881fb7..37b5f281c5 100644
--- a/Source/Core/Common/CDUtils.cpp
+++ b/Source/Core/Common/CDUtils.cpp
@@ -47,7 +47,7 @@ std::vector<std::string> cdio_get_devices()
 			if (is_cdrom(drive))
 			{
 				std::string str(TStrToUTF8(drive));
-				str.pop_back();	// we don't want the final backslash
+				str.pop_back(); // we don't want the final backslash
 				drives.push_back(std::move(str));
 			}
 
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h
index b6592e3ea1..611e1a1641 100644
--- a/Source/Core/Common/CommonFuncs.h
+++ b/Source/Core/Common/CommonFuncs.h
@@ -105,13 +105,13 @@ inline u64 _rotr64(u64 x, unsigned int shift){
 	#define freelocale _free_locale
 	#define newlocale(mask, locale, base) _create_locale(mask, locale)
 
-	#define LC_GLOBAL_LOCALE	((locale_t)-1)
-	#define LC_ALL_MASK			LC_ALL
-	#define LC_COLLATE_MASK		LC_COLLATE
-	#define LC_CTYPE_MASK		LC_CTYPE
-	#define LC_MONETARY_MASK	LC_MONETARY
-	#define LC_NUMERIC_MASK		LC_NUMERIC
-	#define LC_TIME_MASK		LC_TIME
+	#define LC_GLOBAL_LOCALE    ((locale_t)-1)
+	#define LC_ALL_MASK         LC_ALL
+	#define LC_COLLATE_MASK     LC_COLLATE
+	#define LC_CTYPE_MASK       LC_CTYPE
+	#define LC_MONETARY_MASK    LC_MONETARY
+	#define LC_NUMERIC_MASK     LC_NUMERIC
+	#define LC_TIME_MASK        LC_TIME
 
 	inline locale_t uselocale(locale_t new_locale)
 	{
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
index 3481aca00f..633afbd755 100644
--- a/Source/Core/Common/CommonPaths.h
+++ b/Source/Core/Common/CommonPaths.h
@@ -55,63 +55,63 @@
 #define JAP_DIR "JAP"
 
 // Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
-#define GC_USER_DIR			"GC"
-#define WII_USER_DIR		"Wii"
-#define CONFIG_DIR			"Config"
-#define GAMESETTINGS_DIR	"GameSettings"
-#define MAPS_DIR			"Maps"
-#define CACHE_DIR			"Cache"
-#define SHADERCACHE_DIR		"ShaderCache"
-#define STATESAVES_DIR		"StateSaves"
-#define SCREENSHOTS_DIR		"ScreenShots"
-#define LOAD_DIR 			"Load"
-#define HIRES_TEXTURES_DIR	LOAD_DIR DIR_SEP "Textures"
-#define DUMP_DIR			"Dump"
-#define DUMP_TEXTURES_DIR	"Textures"
-#define DUMP_FRAMES_DIR		"Frames"
-#define DUMP_AUDIO_DIR		"Audio"
-#define DUMP_DSP_DIR		"DSP"
-#define LOGS_DIR			"Logs"
-#define MAIL_LOGS_DIR		"Mail"
-#define SHADERS_DIR 		"Shaders"
-#define WII_SYSCONF_DIR		"shared2" DIR_SEP "sys"
-#define WII_WC24CONF_DIR	"shared2" DIR_SEP "wc24"
-#define THEMES_DIR			"Themes"
+#define GC_USER_DIR         "GC"
+#define WII_USER_DIR        "Wii"
+#define CONFIG_DIR          "Config"
+#define GAMESETTINGS_DIR    "GameSettings"
+#define MAPS_DIR            "Maps"
+#define CACHE_DIR           "Cache"
+#define SHADERCACHE_DIR     "ShaderCache"
+#define STATESAVES_DIR      "StateSaves"
+#define SCREENSHOTS_DIR     "ScreenShots"
+#define LOAD_DIR            "Load"
+#define HIRES_TEXTURES_DIR  LOAD_DIR DIR_SEP "Textures"
+#define DUMP_DIR            "Dump"
+#define DUMP_TEXTURES_DIR   "Textures"
+#define DUMP_FRAMES_DIR     "Frames"
+#define DUMP_AUDIO_DIR      "Audio"
+#define DUMP_DSP_DIR        "DSP"
+#define LOGS_DIR            "Logs"
+#define MAIL_LOGS_DIR       "Mail"
+#define SHADERS_DIR         "Shaders"
+#define WII_SYSCONF_DIR     "shared2" DIR_SEP "sys"
+#define WII_WC24CONF_DIR    "shared2" DIR_SEP "wc24"
+#define THEMES_DIR          "Themes"
 
 // Filenames
 // Files in the directory returned by GetUserPath(D_CONFIG_IDX)
-#define DOLPHIN_CONFIG	"Dolphin.ini"
-#define DEBUGGER_CONFIG	"Debugger.ini"
-#define LOGGER_CONFIG	"Logger.ini"
+#define DOLPHIN_CONFIG  "Dolphin.ini"
+#define DEBUGGER_CONFIG "Debugger.ini"
+#define LOGGER_CONFIG   "Logger.ini"
 
 // Files in the directory returned by GetUserPath(D_LOGS_IDX)
-#define MAIN_LOG	"dolphin.log"
+#define MAIN_LOG    "dolphin.log"
 
 // Files in the directory returned by GetUserPath(D_WIISYSCONF_IDX)
-#define WII_SYSCONF	"SYSCONF"
+#define WII_SYSCONF "SYSCONF"
 
 // Files in the directory returned by GetUserPath(D_DUMP_IDX)
-#define RAM_DUMP	"ram.raw"
-#define ARAM_DUMP	"aram.raw"
-#define FAKEVMEM_DUMP	"fakevmem.raw"
+#define RAM_DUMP      "ram.raw"
+#define ARAM_DUMP     "aram.raw"
+#define FAKEVMEM_DUMP "fakevmem.raw"
 
 // Sys files
-#define TOTALDB		"totaldb.dsy"
+#define TOTALDB     "totaldb.dsy"
 
-#define FONT_ANSI	"font_ansi.bin"
-#define FONT_SJIS	"font_sjis.bin"
+#define FONT_ANSI   "font_ansi.bin"
+#define FONT_SJIS   "font_sjis.bin"
 
-#define DSP_IROM	"dsp_rom.bin"
-#define DSP_COEF	"dsp_coef.bin"
+#define DSP_IROM    "dsp_rom.bin"
+#define DSP_COEF    "dsp_coef.bin"
 
-#define GC_IPL		"IPL.bin"
-#define GC_SRAM		"SRAM.raw"
-#define GC_MEMCARDA	"MemoryCardA"
-#define GC_MEMCARDB	"MemoryCardB"
+#define GC_IPL      "IPL.bin"
+#define GC_SRAM     "SRAM.raw"
+#define GC_MEMCARDA "MemoryCardA"
+#define GC_MEMCARDB "MemoryCardB"
 
-#define WII_STATE	"state.dat"
+#define WII_STATE   "state.dat"
 
-#define WII_SETTING		"setting.txt"
+#define WII_SETTING "setting.txt"
 
 #define GECKO_CODE_HANDLER "codehandler.bin"
 
diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp
index d360a5b659..e1eb617406 100644
--- a/Source/Core/Common/Crypto/ec.cpp
+++ b/Source/Core/Common/Crypto/ec.cpp
@@ -307,7 +307,7 @@ static void point_add(u8 *r, u8 *p, u8 *q)
 	elt_add(ry, s, rx);
 }
 
-void point_mul(u8 *d, const u8 *a, u8 *b)	// a is bignum
+void point_mul(u8 *d, const u8 *a, u8 *b) // a is bignum
 {
 	u32 i;
 	u8 mask;
diff --git a/Source/Core/Common/Crypto/tools.h b/Source/Core/Common/Crypto/tools.h
index d97995c093..0e4d49be1a 100644
--- a/Source/Core/Common/Crypto/tools.h
+++ b/Source/Core/Common/Crypto/tools.h
@@ -11,7 +11,7 @@ int bn_compare(u8 *a, u8 *b, u32 n);
 void bn_sub_modulus(u8 *a, u8 *N, u32 n);
 void bn_add(u8 *d, u8 *a, u8 *b, u8 *N, u32 n);
 void bn_mul(u8 *d, u8 *a, u8 *b, u8 *N, u32 n);
-void bn_inv(u8 *d, u8 *a, u8 *N, u32 n);	// only for prime N
+void bn_inv(u8 *d, u8 *a, u8 *N, u32 n); // only for prime N
 void bn_exp(u8 *d, u8 *a, u8 *N, u32 n, u8 *e, u32 en);
 void point_mul(u8 *d, const u8 *a, u8 *b);
 
diff --git a/Source/Core/Common/FifoQueue.h b/Source/Core/Common/FifoQueue.h
index 0e0ada1397..9cae0f5f1d 100644
--- a/Source/Core/Common/FifoQueue.h
+++ b/Source/Core/Common/FifoQueue.h
@@ -63,7 +63,7 @@ public:
 		m_read_ptr = AtomicLoad(tmpptr->next);
 		// set the next element to NULL to stop the recursive deletion
 		tmpptr->next = NULL;
-		delete tmpptr;	// this also deletes the element
+		delete tmpptr; // this also deletes the element
 	}
 
 	bool Pop(T& t)
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index ae2d87496a..02c2b2aec5 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -803,37 +803,37 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
 				getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
 #endif
 
-		paths[D_GCUSER_IDX]			= paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
-		paths[D_WIIROOT_IDX]		= paths[D_USER_IDX] + WII_USER_DIR;
-		paths[D_WIIUSER_IDX]		= paths[D_WIIROOT_IDX] + DIR_SEP;
-		paths[D_CONFIG_IDX]			= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
-		paths[D_GAMESETTINGS_IDX]	= paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
-		paths[D_MAPS_IDX]			= paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
-		paths[D_CACHE_IDX]			= paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
-		paths[D_SHADERCACHE_IDX]	= paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
-		paths[D_SHADERS_IDX]		= paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
-		paths[D_STATESAVES_IDX]		= paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
-		paths[D_SCREENSHOTS_IDX]	= paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
-		paths[D_HIRESTEXTURES_IDX]	= paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
-		paths[D_DUMP_IDX]			= paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
-		paths[D_DUMPFRAMES_IDX]		= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
-		paths[D_DUMPAUDIO_IDX]		= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
-		paths[D_DUMPTEXTURES_IDX]	= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
-		paths[D_DUMPDSP_IDX]		= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
-		paths[D_LOGS_IDX]			= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
-		paths[D_MAILLOGS_IDX]		= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
-		paths[D_WIISYSCONF_IDX]		= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
-		paths[D_WIIWC24_IDX]		= paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP;
-		paths[D_THEMES_IDX]			= paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
-		paths[F_DOLPHINCONFIG_IDX]	= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
-		paths[F_DEBUGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
-		paths[F_LOGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
-		paths[F_MAINLOG_IDX]		= paths[D_LOGS_IDX] + MAIN_LOG;
-		paths[F_WIISYSCONF_IDX]		= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
-		paths[F_RAMDUMP_IDX]		= paths[D_DUMP_IDX] + RAM_DUMP;
-		paths[F_ARAMDUMP_IDX]		= paths[D_DUMP_IDX] + ARAM_DUMP;
-		paths[F_FAKEVMEMDUMP_IDX]	= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
-		paths[F_GCSRAM_IDX]			= paths[D_GCUSER_IDX] + GC_SRAM;
+		paths[D_GCUSER_IDX]         = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
+		paths[D_WIIROOT_IDX]        = paths[D_USER_IDX] + WII_USER_DIR;
+		paths[D_WIIUSER_IDX]        = paths[D_WIIROOT_IDX] + DIR_SEP;
+		paths[D_CONFIG_IDX]         = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
+		paths[D_GAMESETTINGS_IDX]   = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
+		paths[D_MAPS_IDX]           = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
+		paths[D_CACHE_IDX]          = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
+		paths[D_SHADERCACHE_IDX]    = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
+		paths[D_SHADERS_IDX]        = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
+		paths[D_STATESAVES_IDX]     = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
+		paths[D_SCREENSHOTS_IDX]    = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
+		paths[D_HIRESTEXTURES_IDX]  = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
+		paths[D_DUMP_IDX]           = paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
+		paths[D_DUMPFRAMES_IDX]     = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
+		paths[D_DUMPAUDIO_IDX]      = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
+		paths[D_DUMPTEXTURES_IDX]   = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
+		paths[D_DUMPDSP_IDX]        = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
+		paths[D_LOGS_IDX]           = paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
+		paths[D_MAILLOGS_IDX]       = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
+		paths[D_WIISYSCONF_IDX]     = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
+		paths[D_WIIWC24_IDX]        = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP;
+		paths[D_THEMES_IDX]         = paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
+		paths[F_DOLPHINCONFIG_IDX]  = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
+		paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
+		paths[F_LOGGERCONFIG_IDX]   = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
+		paths[F_MAINLOG_IDX]        = paths[D_LOGS_IDX] + MAIN_LOG;
+		paths[F_WIISYSCONF_IDX]     = paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
+		paths[F_RAMDUMP_IDX]        = paths[D_DUMP_IDX] + RAM_DUMP;
+		paths[F_ARAMDUMP_IDX]       = paths[D_DUMP_IDX] + ARAM_DUMP;
+		paths[F_FAKEVMEMDUMP_IDX]   = paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
+		paths[F_GCSRAM_IDX]         = paths[D_GCUSER_IDX] + GC_SRAM;
 	}
 
 	if (!newPath.empty())
@@ -851,72 +851,72 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
 		switch (DirIDX)
 		{
 		case D_WIIROOT_IDX:
-			paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP;
-			paths[D_WIISYSCONF_IDX]	= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP;
-			paths[F_WIISYSCONF_IDX]	= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
+			paths[D_WIIUSER_IDX]    = paths[D_WIIROOT_IDX] + DIR_SEP;
+			paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP;
+			paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
 			break;
 
 		case D_USER_IDX:
-			paths[D_GCUSER_IDX]				= paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
-			paths[D_WIIROOT_IDX]			= paths[D_USER_IDX] + WII_USER_DIR;
-			paths[D_WIIUSER_IDX]			= paths[D_WIIROOT_IDX] + DIR_SEP;
-			paths[D_CONFIG_IDX]				= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
-			paths[D_GAMESETTINGS_IDX]		= paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
-			paths[D_MAPS_IDX]				= paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
-			paths[D_CACHE_IDX]				= paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
-			paths[D_SHADERCACHE_IDX]		= paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
-			paths[D_SHADERS_IDX]			= paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
-			paths[D_STATESAVES_IDX]			= paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
-			paths[D_SCREENSHOTS_IDX]		= paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
-			paths[D_HIRESTEXTURES_IDX]		= paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMP_IDX]				= paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
-			paths[D_DUMPFRAMES_IDX]			= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
-			paths[D_DUMPAUDIO_IDX]			= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
-			paths[D_DUMPTEXTURES_IDX]		= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMPDSP_IDX]			= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
-			paths[D_LOGS_IDX]				= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
-			paths[D_MAILLOGS_IDX]			= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
-			paths[D_WIISYSCONF_IDX]			= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
-			paths[D_THEMES_IDX]				= paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
-			paths[F_DOLPHINCONFIG_IDX]		= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
-			paths[F_DEBUGGERCONFIG_IDX]		= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
-			paths[F_LOGGERCONFIG_IDX]		= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
-			paths[F_MAINLOG_IDX]			= paths[D_LOGS_IDX] + MAIN_LOG;
-			paths[F_WIISYSCONF_IDX]			= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
-			paths[F_RAMDUMP_IDX]			= paths[D_DUMP_IDX] + RAM_DUMP;
-			paths[F_ARAMDUMP_IDX]			= paths[D_DUMP_IDX] + ARAM_DUMP;
-			paths[F_FAKEVMEMDUMP_IDX]		= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
-			paths[F_GCSRAM_IDX]				= paths[D_GCUSER_IDX] + GC_SRAM;
+			paths[D_GCUSER_IDX]         = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
+			paths[D_WIIROOT_IDX]        = paths[D_USER_IDX] + WII_USER_DIR;
+			paths[D_WIIUSER_IDX]        = paths[D_WIIROOT_IDX] + DIR_SEP;
+			paths[D_CONFIG_IDX]         = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
+			paths[D_GAMESETTINGS_IDX]   = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
+			paths[D_MAPS_IDX]           = paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
+			paths[D_CACHE_IDX]          = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
+			paths[D_SHADERCACHE_IDX]    = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
+			paths[D_SHADERS_IDX]        = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
+			paths[D_STATESAVES_IDX]     = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
+			paths[D_SCREENSHOTS_IDX]    = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
+			paths[D_HIRESTEXTURES_IDX]  = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
+			paths[D_DUMP_IDX]           = paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
+			paths[D_DUMPFRAMES_IDX]     = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
+			paths[D_DUMPAUDIO_IDX]      = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
+			paths[D_DUMPTEXTURES_IDX]   = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
+			paths[D_DUMPDSP_IDX]        = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
+			paths[D_LOGS_IDX]           = paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
+			paths[D_MAILLOGS_IDX]       = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
+			paths[D_WIISYSCONF_IDX]     = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
+			paths[D_THEMES_IDX]         = paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
+			paths[F_DOLPHINCONFIG_IDX]  = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
+			paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
+			paths[F_LOGGERCONFIG_IDX]   = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
+			paths[F_MAINLOG_IDX]        = paths[D_LOGS_IDX] + MAIN_LOG;
+			paths[F_WIISYSCONF_IDX]     = paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
+			paths[F_RAMDUMP_IDX]        = paths[D_DUMP_IDX] + RAM_DUMP;
+			paths[F_ARAMDUMP_IDX]       = paths[D_DUMP_IDX] + ARAM_DUMP;
+			paths[F_FAKEVMEMDUMP_IDX]   = paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
+			paths[F_GCSRAM_IDX]         = paths[D_GCUSER_IDX] + GC_SRAM;
 			break;
 
 		case D_CONFIG_IDX:
-			paths[F_DOLPHINCONFIG_IDX]	= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
-			paths[F_DEBUGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
-			paths[F_LOGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
+			paths[F_DOLPHINCONFIG_IDX]  = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
+			paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
+			paths[F_LOGGERCONFIG_IDX]   = paths[D_CONFIG_IDX] + LOGGER_CONFIG;
 			break;
 
 		case D_GCUSER_IDX:
-			paths[F_GCSRAM_IDX]			= paths[D_GCUSER_IDX] + GC_SRAM;
+			paths[F_GCSRAM_IDX]         = paths[D_GCUSER_IDX] + GC_SRAM;
 			break;
 
 		case D_DUMP_IDX:
-			paths[D_DUMPFRAMES_IDX]		= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
-			paths[D_DUMPAUDIO_IDX]		= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
-			paths[D_DUMPTEXTURES_IDX]	= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMPDSP_IDX]		= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
-			paths[F_RAMDUMP_IDX]		= paths[D_DUMP_IDX] + RAM_DUMP;
-			paths[F_ARAMDUMP_IDX]		= paths[D_DUMP_IDX] + ARAM_DUMP;
-			paths[F_FAKEVMEMDUMP_IDX]	= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
+			paths[D_DUMPFRAMES_IDX]     = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
+			paths[D_DUMPAUDIO_IDX]      = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
+			paths[D_DUMPTEXTURES_IDX]   = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
+			paths[D_DUMPDSP_IDX]        = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
+			paths[F_RAMDUMP_IDX]        = paths[D_DUMP_IDX] + RAM_DUMP;
+			paths[F_ARAMDUMP_IDX]       = paths[D_DUMP_IDX] + ARAM_DUMP;
+			paths[F_FAKEVMEMDUMP_IDX]   = paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
 			break;
 		case D_LOGS_IDX:
-			paths[D_MAILLOGS_IDX]		= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
-			paths[F_MAINLOG_IDX]		= paths[D_LOGS_IDX] + MAIN_LOG;
+			paths[D_MAILLOGS_IDX]       = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
+			paths[F_MAINLOG_IDX]        = paths[D_LOGS_IDX] + MAIN_LOG;
 		}
 
-		paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP;
-		paths[D_WIIWC24_IDX] = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP;
-		paths[D_WIISYSCONF_IDX]	= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP;
-		paths[F_WIISYSCONF_IDX]	= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
+		paths[D_WIIUSER_IDX]    = paths[D_WIIROOT_IDX] + DIR_SEP;
+		paths[D_WIIWC24_IDX]    = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP;
+		paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP;
+		paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
 	}
 
 	return paths[DirIDX];
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
index e0efc42ca1..61dd618c1b 100644
--- a/Source/Core/Common/FileUtil.h
+++ b/Source/Core/Common/FileUtil.h
@@ -198,7 +198,7 @@ public:
 	bool IsOpen() { return NULL != m_file; }
 
 	// m_good is set to false when a read, write or other function fails
-	bool IsGood() {	return m_good; }
+	bool IsGood() { return m_good; }
 	operator void*() { return m_good ? m_file : NULL; }
 
 	std::FILE* ReleaseHandle();
diff --git a/Source/Core/Common/FixedSizeQueue.h b/Source/Core/Common/FixedSizeQueue.h
index 2b54b631b8..b6b9b0afe8 100644
--- a/Source/Core/Common/FixedSizeQueue.h
+++ b/Source/Core/Common/FixedSizeQueue.h
@@ -20,7 +20,7 @@ class FixedSizeQueue
 	int count;  // sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
 
 	// Make copy constructor private for now.
-	FixedSizeQueue(FixedSizeQueue &other) {	}
+	FixedSizeQueue(FixedSizeQueue &other) {}
 
 public:
 	FixedSizeQueue()
diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
index 9987dfc7e7..4d87b6bea8 100644
--- a/Source/Core/Common/IniFile.h
+++ b/Source/Core/Common/IniFile.h
@@ -36,7 +36,7 @@ public:
 		void Set(const std::string& key, const std::string& newValue);
 		void Set(const std::string& key, const std::string& newValue, const std::string& defaultValue);
 
- 		bool Get(const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING);
+		bool Get(const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING);
 
 		void Set(const std::string& key, u32 newValue) {
 			Set(key, StringFromFormat("0x%08x", newValue));
diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h
index 34bf38165c..5103db96f0 100644
--- a/Source/Core/Common/LinearDiskCache.h
+++ b/Source/Core/Common/LinearDiskCache.h
@@ -87,7 +87,7 @@ public:
 					Read(value, value_size) &&
 					Read(&entry_number) &&
 					entry_number == m_num_entries+1)
- 				{
+				{
 					reader.Read(key, value, value_size);
 				}
 				else
diff --git a/Source/Core/Common/Log.h b/Source/Core/Common/Log.h
index 544245e847..e7282e6b9c 100644
--- a/Source/Core/Common/Log.h
+++ b/Source/Core/Common/Log.h
@@ -140,12 +140,12 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type,
 
 #ifndef GEKKO
 #ifdef _WIN32
-#define _assert_msg_(_t_, _a_, _fmt_, ...)		\
+#define _assert_msg_(_t_, _a_, _fmt_, ...) \
 	if (!(_a_)) {\
 		if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \
 	}
 #else // not win32
-#define _assert_msg_(_t_, _a_, _fmt_, ...)		\
+#define _assert_msg_(_t_, _a_, _fmt_, ...) \
 	if (!(_a_)) {\
 		if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \
 	}
diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp
index 7651415474..45bcd53db4 100644
--- a/Source/Core/Common/LogManager.cpp
+++ b/Source/Core/Common/LogManager.cpp
@@ -28,52 +28,52 @@ LogManager *LogManager::m_logManager = NULL;
 LogManager::LogManager()
 {
 	// create log files
-	m_Log[LogTypes::MASTER_LOG]			= new LogContainer("*",				"Master Log");
-	m_Log[LogTypes::BOOT]				= new LogContainer("BOOT",			"Boot");
-	m_Log[LogTypes::COMMON]				= new LogContainer("COMMON",		"Common");
-	m_Log[LogTypes::DISCIO]				= new LogContainer("DIO",			"Disc IO");
-	m_Log[LogTypes::FILEMON]			= new LogContainer("FileMon",		"File Monitor");
-	m_Log[LogTypes::PAD]				= new LogContainer("PAD",			"Pad");
-	m_Log[LogTypes::PIXELENGINE]		= new LogContainer("PE",			"PixelEngine");
-	m_Log[LogTypes::COMMANDPROCESSOR]	= new LogContainer("CP",			"CommandProc");
-	m_Log[LogTypes::VIDEOINTERFACE]		= new LogContainer("VI",			"VideoInt");
-	m_Log[LogTypes::SERIALINTERFACE]	= new LogContainer("SI",			"SerialInt");
-	m_Log[LogTypes::PROCESSORINTERFACE]	= new LogContainer("PI",			"ProcessorInt");
-	m_Log[LogTypes::MEMMAP]				= new LogContainer("MI",			"MI & memmap");
-	m_Log[LogTypes::SP1]				= new LogContainer("SP1",			"Serial Port 1");
-	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",		"StreamingInt");
-	m_Log[LogTypes::DSPINTERFACE]		= new LogContainer("DSP",			"DSPInterface");
-	m_Log[LogTypes::DVDINTERFACE]		= new LogContainer("DVD",			"DVDInterface");
-	m_Log[LogTypes::GPFIFO]				= new LogContainer("GP",			"GPFifo");
-	m_Log[LogTypes::EXPANSIONINTERFACE]	= new LogContainer("EXI",			"ExpansionInt");
-	m_Log[LogTypes::GDB_STUB]			= new LogContainer("GDB_STUB",		"GDB Stub");
-	m_Log[LogTypes::AUDIO_INTERFACE]	= new LogContainer("AI",			"AudioInt");
-	m_Log[LogTypes::POWERPC]			= new LogContainer("PowerPC",		"IBM CPU");
-	m_Log[LogTypes::OSHLE]				= new LogContainer("HLE",			"HLE");
-	m_Log[LogTypes::DSPHLE]				= new LogContainer("DSPHLE",		"DSP HLE");
-	m_Log[LogTypes::DSPLLE]				= new LogContainer("DSPLLE",		"DSP LLE");
-	m_Log[LogTypes::DSP_MAIL]			= new LogContainer("DSPMails",		"DSP Mails");
-	m_Log[LogTypes::VIDEO]				= new LogContainer("Video",			"Video Backend");
-	m_Log[LogTypes::AUDIO]				= new LogContainer("Audio",			"Audio Emulator");
-	m_Log[LogTypes::DYNA_REC]			= new LogContainer("JIT",			"Dynamic Recompiler");
-	m_Log[LogTypes::CONSOLE]			= new LogContainer("CONSOLE",		"Dolphin Console");
-	m_Log[LogTypes::OSREPORT]			= new LogContainer("OSREPORT",		"OSReport");
-	m_Log[LogTypes::WIIMOTE]			= new LogContainer("Wiimote",		"Wiimote");
-	m_Log[LogTypes::WII_IPC]			= new LogContainer("WII_IPC",		"WII IPC");
-	m_Log[LogTypes::WII_IPC_HID]		= new LogContainer("WII_IPC_HID",	"WII IPC HID");
-	m_Log[LogTypes::WII_IPC_HLE]		= new LogContainer("WII_IPC_HLE",	"WII IPC HLE");
-	m_Log[LogTypes::WII_IPC_DVD]		= new LogContainer("WII_IPC_DVD",	"WII IPC DVD");
-	m_Log[LogTypes::WII_IPC_ES]			= new LogContainer("WII_IPC_ES",	"WII IPC ES");
-	m_Log[LogTypes::WII_IPC_FILEIO]		= new LogContainer("WII_IPC_FILEIO","WII IPC FILEIO");
-	m_Log[LogTypes::WII_IPC_SD]			= new LogContainer("WII_IPC_SD",	"WII IPC SD");
-	m_Log[LogTypes::WII_IPC_STM]		= new LogContainer("WII_IPC_STM",	"WII IPC STM");
-	m_Log[LogTypes::WII_IPC_NET]		= new LogContainer("WII_IPC_NET",	"WII IPC NET");
-	m_Log[LogTypes::WII_IPC_WC24]		= new LogContainer("WII_IPC_WC24",	"WII IPC WC24");
-	m_Log[LogTypes::WII_IPC_SSL]		= new LogContainer("WII_IPC_SSL",	"WII IPC SSL");
-	m_Log[LogTypes::WII_IPC_WIIMOTE]	= new LogContainer("WII_IPC_WIIMOTE","WII IPC WIIMOTE");
-	m_Log[LogTypes::ACTIONREPLAY]		= new LogContainer("ActionReplay",	"ActionReplay");
-	m_Log[LogTypes::MEMCARD_MANAGER]	= new LogContainer("MemCard Manager", "MemCard Manager");
-	m_Log[LogTypes::NETPLAY]			= new LogContainer("NETPLAY",		"Netplay");
+	m_Log[LogTypes::MASTER_LOG]         = new LogContainer("*",               "Master Log");
+	m_Log[LogTypes::BOOT]               = new LogContainer("BOOT",            "Boot");
+	m_Log[LogTypes::COMMON]             = new LogContainer("COMMON",          "Common");
+	m_Log[LogTypes::DISCIO]             = new LogContainer("DIO",             "Disc IO");
+	m_Log[LogTypes::FILEMON]            = new LogContainer("FileMon",         "File Monitor");
+	m_Log[LogTypes::PAD]                = new LogContainer("PAD",             "Pad");
+	m_Log[LogTypes::PIXELENGINE]        = new LogContainer("PE",              "PixelEngine");
+	m_Log[LogTypes::COMMANDPROCESSOR]   = new LogContainer("CP",              "CommandProc");
+	m_Log[LogTypes::VIDEOINTERFACE]     = new LogContainer("VI",              "VideoInt");
+	m_Log[LogTypes::SERIALINTERFACE]    = new LogContainer("SI",              "SerialInt");
+	m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI",              "ProcessorInt");
+	m_Log[LogTypes::MEMMAP]             = new LogContainer("MI",              "MI & memmap");
+	m_Log[LogTypes::SP1]                = new LogContainer("SP1",             "Serial Port 1");
+	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",          "StreamingInt");
+	m_Log[LogTypes::DSPINTERFACE]       = new LogContainer("DSP",             "DSPInterface");
+	m_Log[LogTypes::DVDINTERFACE]       = new LogContainer("DVD",             "DVDInterface");
+	m_Log[LogTypes::GPFIFO]             = new LogContainer("GP",              "GPFifo");
+	m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI",             "ExpansionInt");
+	m_Log[LogTypes::GDB_STUB]           = new LogContainer("GDB_STUB",        "GDB Stub");
+	m_Log[LogTypes::AUDIO_INTERFACE]    = new LogContainer("AI",              "AudioInt");
+	m_Log[LogTypes::POWERPC]            = new LogContainer("PowerPC",         "IBM CPU");
+	m_Log[LogTypes::OSHLE]              = new LogContainer("HLE",             "HLE");
+	m_Log[LogTypes::DSPHLE]             = new LogContainer("DSPHLE",          "DSP HLE");
+	m_Log[LogTypes::DSPLLE]             = new LogContainer("DSPLLE",          "DSP LLE");
+	m_Log[LogTypes::DSP_MAIL]           = new LogContainer("DSPMails",        "DSP Mails");
+	m_Log[LogTypes::VIDEO]              = new LogContainer("Video",           "Video Backend");
+	m_Log[LogTypes::AUDIO]              = new LogContainer("Audio",           "Audio Emulator");
+	m_Log[LogTypes::DYNA_REC]           = new LogContainer("JIT",             "Dynamic Recompiler");
+	m_Log[LogTypes::CONSOLE]            = new LogContainer("CONSOLE",         "Dolphin Console");
+	m_Log[LogTypes::OSREPORT]           = new LogContainer("OSREPORT",        "OSReport");
+	m_Log[LogTypes::WIIMOTE]            = new LogContainer("Wiimote",         "Wiimote");
+	m_Log[LogTypes::WII_IPC]            = new LogContainer("WII_IPC",         "WII IPC");
+	m_Log[LogTypes::WII_IPC_HID]        = new LogContainer("WII_IPC_HID",     "WII IPC HID");
+	m_Log[LogTypes::WII_IPC_HLE]        = new LogContainer("WII_IPC_HLE",     "WII IPC HLE");
+	m_Log[LogTypes::WII_IPC_DVD]        = new LogContainer("WII_IPC_DVD",     "WII IPC DVD");
+	m_Log[LogTypes::WII_IPC_ES]         = new LogContainer("WII_IPC_ES",      "WII IPC ES");
+	m_Log[LogTypes::WII_IPC_FILEIO]     = new LogContainer("WII_IPC_FILEIO",  "WII IPC FILEIO");
+	m_Log[LogTypes::WII_IPC_SD]         = new LogContainer("WII_IPC_SD",      "WII IPC SD");
+	m_Log[LogTypes::WII_IPC_STM]        = new LogContainer("WII_IPC_STM",     "WII IPC STM");
+	m_Log[LogTypes::WII_IPC_NET]        = new LogContainer("WII_IPC_NET",     "WII IPC NET");
+	m_Log[LogTypes::WII_IPC_WC24]       = new LogContainer("WII_IPC_WC24",    "WII IPC WC24");
+	m_Log[LogTypes::WII_IPC_SSL]        = new LogContainer("WII_IPC_SSL",     "WII IPC SSL");
+	m_Log[LogTypes::WII_IPC_WIIMOTE]    = new LogContainer("WII_IPC_WIIMOTE", "WII IPC WIIMOTE");
+	m_Log[LogTypes::ACTIONREPLAY]       = new LogContainer("ActionReplay",    "ActionReplay");
+	m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager", "MemCard Manager");
+	m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",         "Netplay");
 
 	m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX).c_str());
 
diff --git a/Source/Core/Common/LogManager.h b/Source/Core/Common/LogManager.h
index 487fc6771a..36b197cc3e 100644
--- a/Source/Core/Common/LogManager.h
+++ b/Source/Core/Common/LogManager.h
@@ -60,9 +60,9 @@ public:
 	bool IsEnabled() const { return m_enable; }
 	void SetEnable(bool enable) { m_enable = enable; }
 
-	LogTypes::LOG_LEVELS GetLevel() const { return m_level;	}
+	LogTypes::LOG_LEVELS GetLevel() const { return m_level; }
 
-	void SetLevel(LogTypes::LOG_LEVELS level) {	m_level = level; }
+	void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; }
 
 	bool HasListeners() const { return !m_listeners.empty(); }
 
@@ -86,7 +86,7 @@ private:
 	~LogManager();
 public:
 
-	static u32 GetMaxLevel() { return MAX_LOGLEVEL;	}
+	static u32 GetMaxLevel() { return MAX_LOGLEVEL; }
 
 	void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
 			 const char *file, int line, const char *fmt, va_list args);
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
index ce1c5d8a54..242fdbcb81 100644
--- a/Source/Core/Common/MemoryUtil.cpp
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -58,7 +58,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
 #else

 	if (ptr == NULL)

 	{

-#endif	

+#endif

 		PanicAlert("Failed to allocate executable memory");

 	}

 #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)

diff --git a/Source/Core/Common/StdConditionVariable.h b/Source/Core/Common/StdConditionVariable.h
index d9f17ec718..68e1f187dc 100644
--- a/Source/Core/Common/StdConditionVariable.h
+++ b/Source/Core/Common/StdConditionVariable.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
+#define GCC_VER(x,y,z)  ((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 
 #ifndef __has_include
diff --git a/Source/Core/Common/StdMutex.h b/Source/Core/Common/StdMutex.h
index 509e1d2566..365aa7f3b4 100644
--- a/Source/Core/Common/StdMutex.h
+++ b/Source/Core/Common/StdMutex.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
+#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 
 #ifndef __has_include
@@ -194,7 +194,7 @@ private:
 };
 
 #else
-typedef recursive_mutex mutex;	// just use CriticalSections
+typedef recursive_mutex mutex; // just use CriticalSections
 
 #endif
 
@@ -346,11 +346,6 @@ public:
 		return owns;
 	}
 
-	//explicit operator bool () const
-	//{
-	//	return owns_lock();
-	//}
-
 	mutex_type* mutex() const
 	{
 		return pm;
diff --git a/Source/Core/Common/StdThread.h b/Source/Core/Common/StdThread.h
index ca7d6917e1..7f02eebd5e 100644
--- a/Source/Core/Common/StdThread.h
+++ b/Source/Core/Common/StdThread.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
+#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 
 #ifndef __has_include
@@ -311,9 +311,9 @@ inline thread::id get_id()
 #endif
 }
 
-}	// namespace this_thread
+} // namespace this_thread
 
-}	// namespace std
+} // namespace std
 
 #undef USE_RVALUE_REFERENCES
 #undef USE_BEGINTHREADEX
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index 7ad4ac6ca5..7d8825231e 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -520,11 +520,7 @@ std::string SHIFTJISToUTF8(const std::string& input)
 
 std::string UTF16ToUTF8(const std::wstring& input)
 {
-	std::string result =
-	//	CodeToUTF8("UCS-2", input);
-	//	CodeToUTF8("UCS-2LE", input);
-	//	CodeToUTF8("UTF-16", input);
-		CodeToUTF8("UTF-16LE", input);
+	std::string result = CodeToUTF8("UTF-16LE", input);
 
 	// TODO: why is this needed?
 	result.erase(std::remove(result.begin(), result.end(), 0x00), result.end());
diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h
index 5f3af35da5..4eda7ae9ec 100644
--- a/Source/Core/Common/Thread.h
+++ b/Source/Core/Common/Thread.h
@@ -108,7 +108,7 @@ private:
 };
 
 void SleepCurrentThread(int ms);
-void SwitchCurrentThread();	// On Linux, this is equal to sleep 1ms
+void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms
 
 // Use this function during a spin-wait to make the current thread
 // relax while another thread is working. This may be more efficient
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
index a2e08bbf1d..8faf502c90 100644
--- a/Source/Core/Common/Timer.cpp
+++ b/Source/Core/Common/Timer.cpp
@@ -157,7 +157,7 @@ u64 Timer::GetLocalTimeSinceJan1970()
 		tzDST = 0;
 
 	// Lazy way to get local time in sec
-	gmTime	= gmtime(&sysTime);
+	gmTime = gmtime(&sysTime);
 	tzDiff = sysTime - mktime(gmTime);
 
 	return (u64)(sysTime + tzDiff + tzDST);
diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h
index de740c3c89..8b1c934c4f 100644
--- a/Source/Core/Common/stdafx.h
+++ b/Source/Core/Common/stdafx.h
@@ -13,7 +13,7 @@
 #endif
 */
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 /*
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define _CRT_NONSTDC_NO_DEPRECATE 1
diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h
index bdf82442b4..b3ec34bf0c 100644
--- a/Source/Core/Common/x64Emitter.h
+++ b/Source/Core/Common/x64Emitter.h
@@ -161,8 +161,8 @@ private:
 	u16 indexReg;
 };
 
-inline OpArg M(void *ptr)	    {return OpArg((u64)ptr, (int)SCALE_RIP);}
-inline OpArg R(X64Reg value)	{return OpArg(0, SCALE_NONE, value);}
+inline OpArg M(void *ptr)       {return OpArg((u64)ptr, (int)SCALE_RIP);}
+inline OpArg R(X64Reg value)    {return OpArg(0, SCALE_NONE, value);}
 inline OpArg MatR(X64Reg value) {return OpArg(0, SCALE_ATREG, value);}
 inline OpArg MDisp(X64Reg value, int offset) {
 	return OpArg((u32)offset, SCALE_ATREG, value);