Reformat all the things. Have fun with merge conflicts.

1 files changed, 52 insertions, 50 deletions

diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp
index fac8e450ca..5caa406d25 100644
--- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp
+++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp
@@ -8,81 +8,83 @@
 #include "Common/CommonTypes.h"
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPTables.h"
-#include "DolphinWX/WxUtils.h"
 #include "DolphinWX/Debugger/DSPRegisterView.h"
-
+#include "DolphinWX/WxUtils.h"
 
 wxString CDSPRegTable::GetValue(int row, int col)
 {
-	if (row < 32) // 32 "normal" regs
-	{
-		switch (col)
-		{
-		case 0: return StrToWxStr(pdregname(row));
-		case 1: return wxString::Format("0x%04x", DSPCore_ReadRegister(row));
-		default: return wxEmptyString;
-		}
-	}
-	return wxEmptyString;
+  if (row < 32)  // 32 "normal" regs
+  {
+    switch (col)
+    {
+    case 0:
+      return StrToWxStr(pdregname(row));
+    case 1:
+      return wxString::Format("0x%04x", DSPCore_ReadRegister(row));
+    default:
+      return wxEmptyString;
+    }
+  }
+  return wxEmptyString;
 }
 
-void CDSPRegTable::SetValue(int, int, const wxString &)
+void CDSPRegTable::SetValue(int, int, const wxString&)
 {
 }
 
 void CDSPRegTable::UpdateCachedRegs()
 {
-	if (m_CachedCounter == g_dsp.step_counter)
-	{
-		return;
-	}
-
-	m_CachedCounter = g_dsp.step_counter;
-
-	for (int i = 0; i < 32; ++i)
-	{
-		m_CachedRegHasChanged[i] = (m_CachedRegs[i] != DSPCore_ReadRegister(i));
-		m_CachedRegs[i] = DSPCore_ReadRegister(i);
-	}
+  if (m_CachedCounter == g_dsp.step_counter)
+  {
+    return;
+  }
+
+  m_CachedCounter = g_dsp.step_counter;
+
+  for (int i = 0; i < 32; ++i)
+  {
+    m_CachedRegHasChanged[i] = (m_CachedRegs[i] != DSPCore_ReadRegister(i));
+    m_CachedRegs[i] = DSPCore_ReadRegister(i);
+  }
 }
 
-wxGridCellAttr *CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
+wxGridCellAttr* CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
 {
-	wxGridCellAttr *attr = new wxGridCellAttr();
+  wxGridCellAttr* attr = new wxGridCellAttr();
 
-	attr->SetBackgroundColour(*wxWHITE);
+  attr->SetBackgroundColour(*wxWHITE);
 
-	switch (col)
-	{
-	case 1:
-		attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
-		break;
-	default:
-		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
-		break;
-	}
+  switch (col)
+  {
+  case 1:
+    attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
+    break;
+  default:
+    attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
+    break;
+  }
 
-	if (col == 1)
-		attr->SetTextColour(m_CachedRegHasChanged[row] ? *wxRED : *wxBLACK);
+  if (col == 1)
+    attr->SetTextColour(m_CachedRegHasChanged[row] ? *wxRED : *wxBLACK);
 
-	return attr;
+  return attr;
 }
 
-DSPRegisterView::DSPRegisterView(wxWindow *parent, wxWindowID id)
-	: wxGrid(parent, id, wxDefaultPosition, wxSize(130, 120))
+DSPRegisterView::DSPRegisterView(wxWindow* parent, wxWindowID id)
+    : wxGrid(parent, id, wxDefaultPosition, wxSize(130, 120))
 {
-	m_register_table = new CDSPRegTable();
+  m_register_table = new CDSPRegTable();
 
-	SetTable(m_register_table, true);
-	SetRowLabelSize(0);
-	SetColLabelSize(0);
-	DisableDragRowSize();
+  SetTable(m_register_table, true);
+  SetRowLabelSize(0);
+  SetColLabelSize(0);
+  DisableDragRowSize();
 
-	AutoSizeColumns();
+  AutoSizeColumns();
 }
 
 void DSPRegisterView::Update()
 {
-	m_register_table->UpdateCachedRegs();
-	ForceRefresh();
+  m_register_table->UpdateCachedRegs();
+  ForceRefresh();
 }