Nothing important, just cleaning my dev folder. (mostly formatting changes, removed a superfluous strlen from logging in ogl plugin)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2126 8ced0084-cf51-0410-be5f-012b33b47a6e

6 files changed, 4 insertions, 18 deletions

diff --git a/Source/Core/Common/Src/CPUDetect.h b/Source/Core/Common/Src/CPUDetect.h
index 810f1eef2d..312bcdecec 100644
--- a/Source/Core/Common/Src/CPUDetect.h
+++ b/Source/Core/Common/Src/CPUDetect.h
@@ -56,11 +56,6 @@ struct CPUInfo
 	std::string Summarize();
 };
 
-
 extern CPUInfo cpu_info;
 
-inline void DetectCPU() {cpu_info.Detect();}
-
-
 #endif
-
diff --git a/Source/Core/Common/Src/MathUtil.h b/Source/Core/Common/Src/MathUtil.h
index b42c4553ff..a841a6dc6b 100644
--- a/Source/Core/Common/Src/MathUtil.h
+++ b/Source/Core/Common/Src/MathUtil.h
@@ -31,5 +31,4 @@ void SaveSSEState();
 void LoadSSEState();
 void LoadDefaultSSEState();
 
-
 #endif
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
index 01ff3c763b..6bcb6d0672 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -238,14 +238,6 @@ namespace CPUCompare
 		}
 		Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
 		ABI_CallFunctionC((void*)instr, inst.hex);
-		// This was added in revision 1954, I don't know what it does. MegaMan would hang if this was enabled.
-		/*
-		if (js.isLastInstruction)
-		{
-			MOV(32, R(EAX), M(&NPC));
-			WriteRfiExitDestInEAX();
-		}
-		*/
 	}
 
 	void Jit64::unknown_instruction(UGeckoInstruction inst)
diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
index 50a11891cb..7f6165f008 100644
--- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp
+++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
@@ -14,13 +14,13 @@
 
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
+
 #include "Common.h"
 #include "AboutDolphin.h"
 #include "svnrev.h"
 #include "CPUDetect.h"
 #include "../resources/dolphin_logo.cpp"
 
-
 BEGIN_EVENT_TABLE(AboutDolphin, wxDialog)
 	EVT_CLOSE(AboutDolphin::OnClose)
 	EVT_BUTTON(ID_CLOSE, AboutDolphin::CloseClick)
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index da74ce9e6d..d0d009b665 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -102,8 +102,8 @@ bool DolphinApp::OnInit()
 	bool LoadElf = false; wxString ElfFile;
 
 	// Detect CPU info and write it to the cpu_info struct
-	DetectCPU();
-	//
+	cpu_info.Detect();
+
 	#if defined _DEBUG && defined _WIN32
 		int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
 		tmpflag |= _CRTDBG_DELAY_FREE_MEM_DF;
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
index 19682b8fce..97a8039555 100644
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@@ -196,7 +196,7 @@ int main(int argc, char* argv[])
 	std::string bootFile(args_info.inputs[0]);
 
 	updateMainFrameEvent.Init();
-	DetectCPU();
+	cpu_info.Detect();
 	BootManager::BootCore(bootFile);
 	while (PowerPC::state != PowerPC::CPU_POWERDOWN)
 	{