Merge pull request #7240 from lioncash/namespace

Common/DebugInterface: Namespace code under the Common namespace

6 files changed, 12 insertions, 5 deletions

diff --git a/Source/Core/Common/DebugInterface.h b/Source/Core/Common/DebugInterface.h
index 0d1ea6159a..e73c44ee28 100644
--- a/Source/Core/Common/DebugInterface.h
+++ b/Source/Core/Common/DebugInterface.h
@@ -13,6 +13,8 @@
 #include "Common/Debug/MemoryPatches.h"
 #include "Common/Debug/Watches.h"
 
+namespace Common
+{
 class DebugInterface
 {
 protected:
@@ -75,3 +77,4 @@ public:
   virtual std::string GetDescription(unsigned int /*address*/) = 0;
   virtual void Clear() = 0;
 };
+}  // namespace Common
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h
index 898bb7dd25..d0b9a9625d 100644
--- a/Source/Core/Core/Debugger/PPCDebugInterface.h
+++ b/Source/Core/Core/Debugger/PPCDebugInterface.h
@@ -17,7 +17,7 @@ private:
 
 // wrapper between disasm control and Dolphin debugger
 
-class PPCDebugInterface final : public DebugInterface
+class PPCDebugInterface final : public Common::DebugInterface
 {
 public:
   PPCDebugInterface() {}
diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
index 36c5c3c93d..0510f7f9ea 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
+++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
@@ -20,7 +20,7 @@ private:
   void Patch(std::size_t index) override;
 };
 
-class DSPDebugInterface final : public DebugInterface
+class DSPDebugInterface final : public Common::DebugInterface
 {
 public:
   DSPDebugInterface() {}
diff --git a/Source/Core/Core/PowerPC/BreakPoints.cpp b/Source/Core/Core/PowerPC/BreakPoints.cpp
index 534ca92f52..6366762fcd 100644
--- a/Source/Core/Core/PowerPC/BreakPoints.cpp
+++ b/Source/Core/Core/PowerPC/BreakPoints.cpp
@@ -226,7 +226,7 @@ bool MemChecks::OverlapsMemcheck(u32 address, u32 length) const
   });
 }
 
-bool TMemCheck::Action(DebugInterface* debug_interface, u32 value, u32 addr, bool write,
+bool TMemCheck::Action(Common::DebugInterface* debug_interface, u32 value, u32 addr, bool write,
                        size_t size, u32 pc)
 {
   if ((write && is_break_on_write) || (!write && is_break_on_read))
diff --git a/Source/Core/Core/PowerPC/BreakPoints.h b/Source/Core/Core/PowerPC/BreakPoints.h
index 14339cce6f..0bef923c48 100644
--- a/Source/Core/Core/PowerPC/BreakPoints.h
+++ b/Source/Core/Core/PowerPC/BreakPoints.h
@@ -10,7 +10,10 @@
 
 #include "Common/CommonTypes.h"
 
+namespace Common
+{
 class DebugInterface;
+}
 
 struct TBreakPoint
 {
@@ -35,7 +38,8 @@ struct TMemCheck
   u32 num_hits = 0;
 
   // returns whether to break
-  bool Action(DebugInterface* dbg_interface, u32 value, u32 addr, bool write, size_t size, u32 pc);
+  bool Action(Common::DebugInterface* dbg_interface, u32 value, u32 addr, bool write, size_t size,
+              u32 pc);
 };
 
 // Code breakpoints.
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h
index 02127872d6..4266fde5aa 100644
--- a/Source/Core/Core/PowerPC/PPCSymbolDB.h
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h
@@ -39,7 +39,7 @@ public:
   void LogFunctionCall(u32 addr);
 
 private:
-  DebugInterface* debugger;
+  Common::DebugInterface* debugger;
 };
 
 extern PPCSymbolDB g_symbolDB;