remove :: prefix when accessing the std namespace

ChetSimpson · ChetSimpson · commit ee2e3d5ca274 · 2025-11-13T04:30:55.000-07:00
diff --git a/ExecutionTrace.cpp b/ExecutionTrace.cpp
@@ -364,7 +364,7 @@ namespace VCC::Debugger::UI { namespace
 		// Draw our current page of samples
 		SetTextColor(hdc, RGB(0, 0, 0));
 		int y = rect.top + 20;
-		int lines = ::std::min((long)currentTrace.size(), tracePage);
+		int lines = std::min((long)currentTrace.size(), tracePage);
 		for (int i = 0; i < lines; i++)
 		{
 			std::string s;
@@ -1100,7 +1100,7 @@ namespace VCC::Debugger::UI { namespace
 		EmuState.Debugger.LockTrace();
 		unsigned int offset = start > 1 ? start-1 : 0;
 		auto & _trace = EmuState.Debugger.GetTraceResult();
-		int count = ::std::min((unsigned int)_trace.size(), nlines);
+		int count = std::min((unsigned int)_trace.size(), nlines);
 		const size_t lineSize = 65536;
 		char *line = new char[lineSize];
 
diff --git a/FD502/fd502.cpp b/FD502/fd502.cpp
@@ -251,7 +251,7 @@ extern "C"
 
 extern "C"
 {
-	__declspec(dllexport) unsigned char PakReadMemoryByte(::std::size_t Address)
+	__declspec(dllexport) unsigned char PakReadMemoryByte(std::size_t Address)
 	{
 		return RomPointer[SelectRomIndex]->read_memory_byte(Address);
 	}
@@ -354,7 +354,7 @@ LRESULT CALLBACK Config(HWND hDlg, UINT message, WPARAM wParam, LPARAM /*lParam*
 								mount_disk_image("*Floppy B:",PhysicalDriveB-1);
 						}
 					}
-					SelectRomIndex = ::std::min(TempSelectRomIndex, RomPointer.size());
+					SelectRomIndex = std::min(TempSelectRomIndex, RomPointer.size());
 					RomFileName = ::vcc::utils::find_pak_module_path(TempRomFileName);
 					ExternalRom.load(RomFileName); //JF
 					BeckerAddr = ::vcc::utils::get_dialog_item_text(hDlg, IDC_BECKER_HOST);
diff --git a/FD502/wd1793.cpp b/FD502/wd1793.cpp
@@ -99,7 +99,7 @@ static bool DirtyDisk=true;
 char ImageFormat[5][4]={"JVC","VDK","DMK","OS9","RAW"};
 
 
-::std::string get_mounted_disk_filename(::std::size_t drive_index)
+std::string get_mounted_disk_filename(::std::size_t drive_index)
 {
 	return Drive[drive_index].ImageName;
 }
diff --git a/FD502/wd1793.h b/FD502/wd1793.h
@@ -31,7 +31,7 @@ unsigned char SetTurboDisk( unsigned char);
 //unsigned char UseKeyboardLeds(unsigned char);
 DWORD GetDriverVersion ();
 unsigned short InitController ();
-::std::string get_mounted_disk_filename(::std::size_t drive_index);
+std::string get_mounted_disk_filename(::std::size_t drive_index);
 
 // FIXME: Needs a name and should be scoped
 enum
diff --git a/GMC/gmc_cartridge.h b/GMC/gmc_cartridge.h
@@ -12,7 +12,7 @@ class gmc_cartridge : public ::vcc::bus::cartridge
 public:
 
 	using context_type = ::vcc::bus::cartridge_context;
-	using path_type = ::std::string;
+	using path_type = std::string;
 	using rom_image_type = ::vcc::devices::rom::banked_rom_image;
 
 
diff --git a/Ramdisk/ramdisk_cartridge.h b/Ramdisk/ramdisk_cartridge.h
@@ -26,7 +26,7 @@ class ramdisk_cartridge : public ::vcc::bus::cartridge
 {
 public:
 
-	using address_type = ::std::size_t;
+	using address_type = std::size_t;
 
 
 public:
diff --git a/Vcc.cpp b/Vcc.cpp
@@ -641,11 +641,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 					maxHorizontalPosition -= (displayDetails.leftBorderColumns + displayDetails.rightBorderColumns);
 					maxVerticalPosition -= (displayDetails.topBorderRows + displayDetails.bottomBorderRows);
 
-					mouseXPosition = ::std::min(
-						::std::max(0, mouseXPosition - displayDetails.leftBorderColumns),
+					mouseXPosition = std::min(
+						std::max(0, mouseXPosition - displayDetails.leftBorderColumns),
 						maxHorizontalPosition);
-					mouseYPosition = ::std::min(
-						::std::max(0, mouseYPosition - displayDetails.topBorderRows),
+					mouseYPosition = std::min(
+						std::max(0, mouseYPosition - displayDetails.topBorderRows),
 						maxVerticalPosition);
 
 #if USE_DEBUG_MOUSE
diff --git a/acia/acia.cpp b/acia/acia.cpp
@@ -170,7 +170,7 @@ __declspec(dllexport) void PakReset()
 // Dll export pak rom read
 //-----------------------------------------------------------------------
 extern "C"
-__declspec(dllexport) unsigned char PakReadMemoryByte(::std::size_t Address)
+__declspec(dllexport) unsigned char PakReadMemoryByte(std::size_t Address)
 {
     return(Rom[Address & 8191]);
 }
diff --git a/becker/configuration_dialog.h b/becker/configuration_dialog.h
@@ -24,7 +24,7 @@ class cartridge_controller
 {
 public:
 
-	using string_type = ::std::string;
+	using string_type = std::string;
 
 
 public:
diff --git a/config.cpp b/config.cpp
@@ -895,7 +895,7 @@ void UpdateSoundBar(const unsigned int * audioBuf,unsigned int bufLen)
 	int lMax = lval;
 	int rMin = rval;
 	int rMax = rval;
-	for (size_t i = 1; i < ::std::min(bufLen,100u); ++i) {
+	for (size_t i = 1; i < std::min(bufLen,100u); ++i) {
 		int lval = audioBuf[i] >> 16;
 		int rval = audioBuf[i] & 0xFFFF;
 		if (lval > lMax) lMax = lval;
diff --git a/libcommon/include/vcc/bus/cartridge.h b/libcommon/include/vcc/bus/cartridge.h
@@ -34,13 +34,13 @@ namespace vcc::bus
 	public:
 
 		/// @brief Specifies the type used to store names.
-		using name_type = ::std::string;
+		using name_type = std::string;
 		/// @brief Specifies the type used to store catalog identifiers.
-		using catalog_id_type = ::std::string;
+		using catalog_id_type = std::string;
 		/// @brief Specifies the type used to store cartridge descriptions.
-		using description_type = ::std::string;
+		using description_type = std::string;
 		/// @brief Specifies the type used to store a size of length.
-		using size_type = ::std::size_t;
+		using size_type = std::size_t;
 
 
 	public:
diff --git a/libcommon/include/vcc/bus/cartridge_context.h b/libcommon/include/vcc/bus/cartridge_context.h
@@ -38,7 +38,7 @@ namespace vcc::bus
 	public:
 
 		/// @brief The type used to represent paths.
-		using path_type = ::std::string;
+		using path_type = std::string;
 		/// @brief The type used to represent menu items.
 		using menu_item_type = MenuItemType;
 
diff --git a/libcommon/include/vcc/utils/cartridge_loader.h b/libcommon/include/vcc/utils/cartridge_loader.h
@@ -149,5 +149,5 @@ namespace vcc::utils
 	/// @param status The status to retrieve the description for.
 	/// 
 	/// @return A string containing a description of the error.
-	LIBCOMMON_EXPORT ::std::string load_error_string(cartridge_loader_status status);
+	LIBCOMMON_EXPORT std::string load_error_string(cartridge_loader_status status);
 }
diff --git a/libcommon/include/vcc/utils/persistent_value_store.h b/libcommon/include/vcc/utils/persistent_value_store.h
@@ -33,11 +33,11 @@ namespace vcc::utils
 	public:
 
 		/// @brief The type used to represent paths.
-		using path_type = ::std::string;
+		using path_type = std::string;
 		/// @brief The type used to represent strings.
-		using string_type = ::std::string;
+		using string_type = std::string;
 		/// @brief The type used to represent a size or length.
-		using size_type = ::std::size_t;
+		using size_type = std::size_t;
 
 
 	public:
diff --git a/libcommon/src/bus/cartridges/rom_cartridge.cpp b/libcommon/src/bus/cartridges/rom_cartridge.cpp
@@ -38,17 +38,17 @@ namespace vcc::bus::cartridges
 	{
 		if (context_ == nullptr)
 		{
-			throw ::std::invalid_argument("Cannot construct ROM Cartridge. The cartridge context is null.");
+			throw std::invalid_argument("Cannot construct ROM Cartridge. The cartridge context is null.");
 		}
 
 		if (name.empty())
 		{
-			throw ::std::invalid_argument("Cannot construct ROM Cartridge. The catalog name is empty.");
+			throw std::invalid_argument("Cannot construct ROM Cartridge. The catalog name is empty.");
 		}
 
 		if (buffer.empty())
 		{
-			throw ::std::invalid_argument("Cannot construct ROM Cartridge. The ROM buffer is empty.");
+			throw std::invalid_argument("Cannot construct ROM Cartridge. The ROM buffer is empty.");
 		}
 	}
 
diff --git a/libcommon/src/utils/cartridge_loader.cpp b/libcommon/src/utils/cartridge_loader.cpp
@@ -190,7 +190,7 @@ namespace vcc::utils
 		}
 	}
 
-	::std::string load_error_string(cartridge_loader_status status)
+	std::string load_error_string(cartridge_loader_status status)
 	{
 		static const std::map<cartridge_loader_status, UINT> string_id_map = {
 			{ cartridge_loader_status::already_loaded, IDS_ERROR_CARTRIDGE_ALREADY_LOADED},
diff --git a/mpi/cartridge_slot.h b/mpi/cartridge_slot.h
@@ -31,16 +31,16 @@ namespace vcc::modules::mpi
 
 		using context_type = ::vcc::bus::cartridge_context;
 		using cartridge_type = ::vcc::bus::cartridge;
-		using cartridge_ptr_type = ::std::unique_ptr<cartridge_type>;
+		using cartridge_ptr_type = std::unique_ptr<cartridge_type>;
 		using name_type = cartridge_type::name_type;
 		using catalog_id_type = cartridge_type::catalog_id_type;
 		using description_type = cartridge_type::description_type;
-		using path_type = ::std::string;
-		using label_type = ::std::string;
+		using path_type = std::string;
+		using label_type = std::string;
 		using handle_type = ::vcc::utils::cartridge_loader_result::handle_type;
 		using menu_item_type = CartMenuItem;
 		using menu_item_collection_type = std::vector<menu_item_type>;
-		using size_type = ::std::size_t;
+		using size_type = std::size_t;
 
 
 	public:
diff --git a/mpi/configuration_dialog.h b/mpi/configuration_dialog.h
@@ -29,8 +29,8 @@ class multipak_controller
 	using mount_status_type = ::vcc::utils::cartridge_loader_status;
 	using slot_id_type = ::multipak_configuration::slot_id_type;
 	using path_type = ::multipak_configuration::path_type;
-	using label_type = ::std::string;
-	using description_type = ::std::string;
+	using label_type = std::string;
+	using description_type = std::string;
 
 
 public:
diff --git a/mpi/multipak_cartridge.h b/mpi/multipak_cartridge.h
@@ -34,10 +34,10 @@ class multipak_cartridge
 
 	using context_type = ::vcc::bus::cartridge_context;
 	using mount_status_type = ::vcc::utils::cartridge_loader_status;
-	using slot_id_type = ::std::size_t;
-	using path_type = ::std::string;
-	using label_type = ::std::string;
-	using description_type = ::std::string;
+	using slot_id_type = std::size_t;
+	using path_type = std::string;
+	using label_type = std::string;
+	using description_type = std::string;
 	using menu_item_type = CartMenuItem;
 
 
diff --git a/mpi/multipak_configuration.cpp b/mpi/multipak_configuration.cpp
@@ -56,5 +56,5 @@ multipak_configuration::path_type multipak_configuration::slot_cartridge_path(sl
 
 multipak_configuration::string_type multipak_configuration::get_slot_path_key(slot_id_type slot) const
 {
-	return "SLOT" + ::std::to_string(slot + 1);
+	return "SLOT" + std::to_string(slot + 1);
 }
diff --git a/mpi/multipak_configuration.h b/mpi/multipak_configuration.h
@@ -6,9 +6,9 @@ class multipak_configuration
 {
 public:
 
-	using slot_id_type = ::std::size_t;
-	using path_type = ::std::string;
-	using string_type = ::std::string;
+	using slot_id_type = std::size_t;
+	using path_type = std::string;
+	using string_type = std::string;
 
 
 public:

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ extern "C"`
`251`	`251`
`252`	`252`	`extern "C"`
`253`	`253`	`{`
`254`		`- __declspec(dllexport) unsigned char PakReadMemoryByte(::std::size_t Address)`
	`254`	`+ __declspec(dllexport) unsigned char PakReadMemoryByte(std::size_t Address)`
`255`	`255`	`{`
`256`	`256`	`return RomPointer[SelectRomIndex]->read_memory_byte(Address);`
`257`	`257`	`}`
`@@ -354,7 +354,7 @@ LRESULT CALLBACK Config(HWND hDlg, UINT message, WPARAM wParam, LPARAM /lParam`
`354`	`354`	`mount_disk_image("*Floppy B:",PhysicalDriveB-1);`
`355`	`355`	`}`
`356`	`356`	`}`
`357`		`- SelectRomIndex = ::std::min(TempSelectRomIndex, RomPointer.size());`
	`357`	`+ SelectRomIndex = std::min(TempSelectRomIndex, RomPointer.size());`
`358`	`358`	`RomFileName = ::vcc::utils::find_pak_module_path(TempRomFileName);`
`359`	`359`	`ExternalRom.load(RomFileName); //JF`
`360`	`360`	`BeckerAddr = ::vcc::utils::get_dialog_item_text(hDlg, IDC_BECKER_HOST);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ static bool DirtyDisk=true;`
`99`	`99`	`char ImageFormat[5][4]={"JVC","VDK","DMK","OS9","RAW"};`
`100`	`100`
`101`	`101`
`102`		`-::std::string get_mounted_disk_filename(::std::size_t drive_index)`
	`102`	`+std::string get_mounted_disk_filename(::std::size_t drive_index)`
`103`	`103`	`{`
`104`	`104`	`return Drive[drive_index].ImageName;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class ramdisk_cartridge : public ::vcc::bus::cartridge`
`26`	`26`	`{`
`27`	`27`	`public:`
`28`	`28`
`29`		`- using address_type = ::std::size_t;`
	`29`	`+ using address_type = std::size_t;`
`30`	`30`
`31`	`31`
`32`	`32`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ __declspec(dllexport) void PakReset()`
`170`	`170`	`// Dll export pak rom read`
`171`	`171`	`//-----------------------------------------------------------------------`
`172`	`172`	`extern "C"`
`173`		`-__declspec(dllexport) unsigned char PakReadMemoryByte(::std::size_t Address)`
	`173`	`+__declspec(dllexport) unsigned char PakReadMemoryByte(std::size_t Address)`
`174`	`174`	`{`
`175`	`175`	`return(Rom[Address & 8191]);`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class cartridge_controller`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`	`26`
`27`		`- using string_type = ::std::string;`
	`27`	`+ using string_type = std::string;`
`28`	`28`
`29`	`29`
`30`	`30`	`public:`