Use new style namespace statement

ejaquay · ejaquay · commit ae187ba3cbfd · 2025-11-01T09:39:40.000-04:00
diff --git a/Debugger.cpp b/Debugger.cpp
@@ -25,7 +25,7 @@
 #include "audio.h"
 #include "Disassembler.h"
 
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 
 	void Debugger::Reset()
@@ -505,6 +505,6 @@ namespace VCC { namespace Debugger
 		Break_Enabled_TF = flag;
 	}
 
-} }
+}
 
 
diff --git a/Debugger.h b/Debugger.h
@@ -30,7 +30,7 @@
 #include "OpDecoder.h"
 
 
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 
 	struct Client
@@ -173,4 +173,4 @@ namespace VCC { namespace Debugger
 		bool							Break_Enabled_TF = false;
 		bool							Halt_Enabled_TF = false;
 	};
-} }
+}
diff --git a/DebuggerUtils.cpp b/DebuggerUtils.cpp
@@ -24,7 +24,7 @@
 #include <memory>
 #include "defines.h"
 
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 
 	std::string ToHexString(long value, int length, bool leadingZeros)
@@ -104,9 +104,9 @@ namespace VCC { namespace Debugger
 		}
 	}
 	
-} }
+}
 
-namespace VCC { namespace Debugger { namespace UI
+namespace VCC::Debugger::UI
 {
 
 	BackBufferInfo AttachBackBuffer(HWND hWnd, int widthAdjust, int heightAdjust)
@@ -142,5 +142,5 @@ namespace VCC { namespace Debugger { namespace UI
 		return backBuffer;
 	}
 
-} } }
+}
 
diff --git a/DebuggerUtils.h b/DebuggerUtils.h
@@ -21,10 +21,7 @@
 #include <string>
 #include <vector>
 
-
-
-
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 
     template<class Type_>
@@ -52,9 +49,9 @@ namespace VCC { namespace Debugger
 	int roundUp(int numToRound, int multiple);
 	int roundDn(int numToRound, int multiple);
 	unsigned char DbgRead8(bool phyAddr, unsigned short block, unsigned short PC);
-} }
+}
 
-namespace VCC { namespace Debugger { namespace UI
+namespace VCC::Debugger::UI
 {
 
 	struct BackBufferInfo
@@ -68,4 +65,4 @@ namespace VCC { namespace Debugger { namespace UI
 
 	BackBufferInfo AttachBackBuffer(HWND hWnd, int widthAdjust, int heightAdjust);
 
-} } }
+}
diff --git a/ExecutionTrace.cpp b/ExecutionTrace.cpp
@@ -33,7 +33,7 @@ This file is part of VCC (Virtual Color Computer).
 
 static HINSTANCE g_hinstDLG;
 
-namespace VCC { namespace Debugger { namespace UI { namespace 
+namespace VCC::Debugger::UI { namespace
 {
 	HWND ExecutionTraceWindow = nullptr;
 	HWND hWndExecutionTrace;
@@ -1500,7 +1500,7 @@ namespace VCC { namespace Debugger { namespace UI { namespace
 		return FALSE;
 	}
 
-} } } }
+} }
 
 
 //-------------------------------------------------------------------------------
diff --git a/ExecutionTrace.h b/ExecutionTrace.h
@@ -19,9 +19,9 @@
 #pragma once
 #include <Windows.h>
 
-namespace VCC { namespace Debugger { namespace UI
+namespace VCC::Debugger::UI
 {
 
 	void OpenExecutionTraceWindow(HINSTANCE instance, HWND parent);
 
-} } }
+}
diff --git a/MMUMonitor.cpp b/MMUMonitor.cpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <stdexcept>
 
-namespace VCC { namespace Debugger { namespace UI { namespace
+namespace VCC::Debugger::UI { namespace
 {
 	// Color constants
 	const COLORREF rgbBlack  = RGB(  0,   0,   0);
@@ -255,7 +255,7 @@ namespace VCC { namespace Debugger { namespace UI { namespace
 		return FALSE;
 	}
 
-} } } }
+} }
 
 
 void VCC::Debugger::UI::OpenMMUMonitorWindow(HINSTANCE instance, HWND parent)
diff --git a/MMUMonitor.h b/MMUMonitor.h
@@ -20,9 +20,9 @@
 #include <Windows.h>
 
 
-namespace VCC { namespace Debugger { namespace UI
+namespace VCC::Debugger::UI
 {
 
 	void OpenMMUMonitorWindow(HINSTANCE instance, HWND parent);
 
-} } }
+}
diff --git a/MemoryMap.cpp b/MemoryMap.cpp
@@ -34,7 +34,7 @@
 #include <vcc/common/DialogOps.h>
 #include <fstream>
 
-namespace VCC { namespace Debugger { namespace UI { namespace {
+namespace VCC::Debugger::UI { namespace {
 
 // Local functions
 void SetEditing(bool);
@@ -847,7 +847,7 @@ void FlashDialogWindow()
 	FlashWindow(hDlgMem,false);
 }
 
-} } } }  // end namespace
+} }  // end namespace
 
 //------------------------------------------------------------------
 // Launch Memory Dialog
diff --git a/MemoryMap.h b/MemoryMap.h
@@ -26,8 +26,7 @@
 #pragma once
 #include <Windows.h>
 
-namespace VCC { namespace Debugger { namespace UI
+namespace VCC::Debugger::UI
 {
 	void OpenMemoryMapWindow(HINSTANCE instance, HWND parent);
-
-} } }
+}
diff --git a/OpCodeTables.cpp b/OpCodeTables.cpp
@@ -24,7 +24,7 @@
 #include <sstream>
 #include <iomanip>
 
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 	bool OpCodeTables::ProcessHeuristics(OpCodeInfo& opcode, const CPUState& state, CPUTrace& trace) const
 	{
@@ -537,4 +537,4 @@ namespace VCC { namespace Debugger
 		opcode.numbytes += bytes;
 		return cycles;
 	}
-} }
+}
diff --git a/OpCodeTables.h b/OpCodeTables.h
@@ -25,7 +25,7 @@
 #include <array>
 #include "MachineDefs.h"
 
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 
 	class OpCodeTables
@@ -982,6 +982,6 @@ namespace VCC { namespace Debugger
 		std::string ToRelativeAddressString(int value, int operandlen) const;
 
 	};
-}}
+}
 
 #pragma warning(pop)
diff --git a/OpDecoder.cpp b/OpDecoder.cpp
@@ -21,7 +21,7 @@
 #include "DebuggerUtils.h"
 #include "defines.h"
 
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 
 	void OpDecoder::Reset(long maxSamples)
@@ -282,4 +282,4 @@ namespace VCC { namespace Debugger
 		return true;
 	}
 
-} }
+}
diff --git a/OpDecoder.h b/OpDecoder.h
@@ -22,7 +22,7 @@
 #include "OpCodeTables.h"
 #include "MachineDefs.h"
 
-namespace VCC { namespace Debugger
+namespace VCC::Debugger
 {
 	class OpDecoder
 	{
@@ -75,4 +75,4 @@ namespace VCC { namespace Debugger
 		int								CurrentLine_ = 0;
 	};
 
-} }
+}
diff --git a/ProcessorState.cpp b/ProcessorState.cpp
@@ -28,7 +28,7 @@
 
 extern SystemState EmuState;
 
-namespace VCC { namespace Debugger { namespace UI { namespace
+namespace VCC::Debugger::UI { namespace
 {
     HWND    ProcessorStateWindow = nullptr;
     BackBufferInfo  BackBuf;
@@ -261,7 +261,7 @@ namespace VCC { namespace Debugger { namespace UI { namespace
         return FALSE;
     }
 
-} } } }
+} }
 
 
 void VCC::Debugger::UI::OpenProcessorStateWindow(HINSTANCE instance, HWND parent)
diff --git a/ProcessorState.h b/ProcessorState.h
@@ -20,9 +20,9 @@
 #include <Windows.h>
 
 
-namespace VCC { namespace Debugger { namespace UI
+namespace VCC::Debugger::UI
 {
 
 	void OpenProcessorStateWindow(HINSTANCE instance, HWND parent);
 
-} } }
+}
diff --git a/SourceDebug.cpp b/SourceDebug.cpp
@@ -36,7 +36,7 @@
 #include <Richedit.h>
 
 
-namespace VCC { namespace Debugger { namespace UI { namespace
+namespace VCC::Debugger::UI { namespace
 {
 	HWND SourceDebugWindow = nullptr;
 	HWND hWndSourceDebug;
@@ -606,7 +606,7 @@ namespace VCC { namespace Debugger { namespace UI { namespace
 		return FALSE;
 	}
 
-} } } }
+} }
 
 
 void VCC::Debugger::UI::OpenSourceDebugWindow(HINSTANCE instance, HWND parent)
diff --git a/SourceDebug.h b/SourceDebug.h
@@ -20,9 +20,9 @@
 #include <Windows.h>
 
 
-namespace VCC { namespace Debugger { namespace UI
+namespace VCC::Debugger::UI
 {
 
 	void OpenSourceDebugWindow(HINSTANCE instance, HWND parent);
 
-} } }
+}
diff --git a/mpi/cartridge_slot.cpp b/mpi/cartridge_slot.cpp
@@ -19,7 +19,7 @@
 #include <vcc/cartridges/empty_cartridge.h>
 
 
-namespace vcc { namespace modules { namespace mpi
+namespace vcc::modules::mpi
 {
 
 	cartridge_slot::cartridge_slot()
@@ -66,4 +66,4 @@ namespace vcc { namespace modules { namespace mpi
 		return text;
 	}
 
-} } }
+}
diff --git a/mpi/cartridge_slot.h b/mpi/cartridge_slot.h
@@ -22,7 +22,7 @@
 #include "../CartridgeMenu.h"
 
 
-namespace vcc { namespace modules { namespace mpi
+namespace vcc::modules::mpi
 {
 
 	class cartridge_slot
@@ -167,4 +167,4 @@ namespace vcc { namespace modules { namespace mpi
 		bool line_state_ = false;
 	};
 
-} } }
+}

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include "audio.h"`
`26`	`26`	`#include "Disassembler.h"`
`27`	`27`
`28`		`-namespace VCC { namespace Debugger`
	`28`	`+namespace VCC::Debugger`
`29`	`29`	`{`
`30`	`30`
`31`	`31`	`void Debugger::Reset()`
`@@ -505,6 +505,6 @@ namespace VCC { namespace Debugger`
`505`	`505`	`Break_Enabled_TF = flag;`
`506`	`506`	`}`
`507`	`507`
`508`		`-} }`
	`508`	`+}`
`509`	`509`
`510`	`510`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include <memory>`
`25`	`25`	`#include "defines.h"`
`26`	`26`
`27`		`-namespace VCC { namespace Debugger`
	`27`	`+namespace VCC::Debugger`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`std::string ToHexString(long value, int length, bool leadingZeros)`
`@@ -104,9 +104,9 @@ namespace VCC { namespace Debugger`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`-} }`
	`107`	`+}`
`108`	`108`
`109`		`-namespace VCC { namespace Debugger { namespace UI`
	`109`	`+namespace VCC::Debugger::UI`
`110`	`110`	`{`
`111`	`111`
`112`	`112`	`BackBufferInfo AttachBackBuffer(HWND hWnd, int widthAdjust, int heightAdjust)`
`@@ -142,5 +142,5 @@ namespace VCC { namespace Debugger { namespace UI`
`142`	`142`	`return backBuffer;`
`143`	`143`	`}`
`144`	`144`
`145`		`-} } }`
	`145`	`+}`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ This file is part of VCC (Virtual Color Computer).`
`33`	`33`
`34`	`34`	`static HINSTANCE g_hinstDLG;`
`35`	`35`
`36`		`-namespace VCC { namespace Debugger { namespace UI { namespace`
	`36`	`+namespace VCC::Debugger::UI { namespace`
`37`	`37`	`{`
`38`	`38`	`HWND ExecutionTraceWindow = nullptr;`
`39`	`39`	`HWND hWndExecutionTrace;`
`@@ -1500,7 +1500,7 @@ namespace VCC { namespace Debugger { namespace UI { namespace`
`1500`	`1500`	`return FALSE;`
`1501`	`1501`	`}`
`1502`	`1502`
`1503`		`-} } } }`
	`1503`	`+} }`
`1504`	`1504`
`1505`	`1505`
`1506`	`1506`	`//-------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@`
`19`	`19`	`#pragma once`
`20`	`20`	`#include <Windows.h>`
`21`	`21`
`22`		`-namespace VCC { namespace Debugger { namespace UI`
	`22`	`+namespace VCC::Debugger::UI`
`23`	`23`	`{`
`24`	`24`
`25`	`25`	`void OpenExecutionTraceWindow(HINSTANCE instance, HWND parent);`
`26`	`26`
`27`		`-} } }`
	`27`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`	`#include <Windows.h>`
`21`	`21`
`22`	`22`
`23`		`-namespace VCC { namespace Debugger { namespace UI`
	`23`	`+namespace VCC::Debugger::UI`
`24`	`24`	`{`
`25`	`25`
`26`	`26`	`void OpenMMUMonitorWindow(HINSTANCE instance, HWND parent);`
`27`	`27`
`28`		`-} } }`
	`28`	`+}`