1 files changed, 20 insertions, 20 deletions

diff --git a/src/citra_qt/cpu_regs.cpp b/src/citra_qt/cpu_regs.cpp
index f2859f695..7e54e18b0 100644
--- a/src/citra_qt/cpu_regs.cpp
+++ b/src/citra_qt/cpu_regs.cpp
@@ -1,7 +1,7 @@
 #include "cpu_regs.hxx"
 
-#include "core.h"
-#include "arm/interpreter/armdefs.h"
+#include "core/core.h"
+#include "core/arm/interpreter/armdefs.h"
 
 GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent)
 {
@@ -42,22 +42,22 @@ void GARM11RegsView::OnCPUStepped()
     ARM_Interface* app_core = Core::g_app_core;
 
     for (int i = 0; i < 16; ++i)
-        registers->child(i)->setText(1, QString("0x%1").arg(app_core->Reg(i), 8, 16, QLatin1Char('0')));
-
-    CSPR->setText(1, QString("0x%1").arg(app_core->CPSR(), 8, 16, QLatin1Char('0')));
-    CSPR->child(0)->setText(1, QString("b%1").arg(app_core->CPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
-    CSPR->child(1)->setText(1, QString("%1").arg((app_core->CPSR() >> 5) & 0x1));	// T - State
-    CSPR->child(2)->setText(1, QString("%1").arg((app_core->CPSR() >> 6) & 0x1));	// F - FIQ disable
-    CSPR->child(3)->setText(1, QString("%1").arg((app_core->CPSR() >> 7) & 0x1));	// I - IRQ disable
-    CSPR->child(4)->setText(1, QString("%1").arg((app_core->CPSR() >> 8) & 0x1));	// A - Imprecise abort
-    CSPR->child(5)->setText(1, QString("%1").arg((app_core->CPSR() >> 9) & 0x1));	// E - Data endianess
-    CSPR->child(6)->setText(1, QString("%1").arg((app_core->CPSR() >> 10) & 0x3F));	// IT - If-Then state (DNM)
-    CSPR->child(7)->setText(1, QString("%1").arg((app_core->CPSR() >> 16) & 0xF));	// GE - Greater-than-or-Equal
-    CSPR->child(8)->setText(1, QString("%1").arg((app_core->CPSR() >> 20) & 0xF));	// DNM - Do not modify
-    CSPR->child(9)->setText(1, QString("%1").arg((app_core->CPSR() >> 24) & 0x1));	// J - Java state
-    CSPR->child(10)->setText(1, QString("%1").arg((app_core->CPSR() >> 27) & 0x1));	// Q - Sticky overflow
-    CSPR->child(11)->setText(1, QString("%1").arg((app_core->CPSR() >> 28) & 0x1));	// V - Overflow
-    CSPR->child(12)->setText(1, QString("%1").arg((app_core->CPSR() >> 29) & 0x1));	// C - Carry/Borrow/Extend
-    CSPR->child(13)->setText(1, QString("%1").arg((app_core->CPSR() >> 30) & 0x1));	// Z - Zero
-    CSPR->child(14)->setText(1, QString("%1").arg((app_core->CPSR() >> 31) & 0x1));	// N - Negative/Less than
+        registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));
+
+    CSPR->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0')));
+    CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
+    CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1));	// T - State
+    CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1));	// F - FIQ disable
+    CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1));	// I - IRQ disable
+    CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1));	// A - Imprecise abort
+    CSPR->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1));	// E - Data endianess
+    CSPR->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F));	// IT - If-Then state (DNM)
+    CSPR->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF));	// GE - Greater-than-or-Equal
+    CSPR->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF));	// DNM - Do not modify
+    CSPR->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1));	// J - Java state
+    CSPR->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1));	// Q - Sticky overflow
+    CSPR->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1));	// V - Overflow
+    CSPR->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1));	// C - Carry/Borrow/Extend
+    CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1));	// Z - Zero
+    CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1));	// N - Negative/Less than
 }