Removed redundant 'Bloom' namespace from entire codebase

This commit is contained in:
Nav
2023-08-13 15:47:51 +01:00
parent 0935ba65cf
commit 5896306f1a
555 changed files with 6254 additions and 6510 deletions

View File

@@ -14,7 +14,7 @@
#include "Exceptions/DebugWirePhysicalInterfaceError.hpp"
#include "src/Targets/TargetRegister.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
using namespace Exceptions;

View File

@@ -24,7 +24,7 @@
#include "Avr8TargetConfig.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
class Avr8: public Target
{
@@ -34,7 +34,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
/*
* The functions below implement the Target interface for AVR8 targets.
*
* See the Bloom::Targets::Target abstract class for documentation on the expected behaviour of
* See the Targets::Target abstract class for documentation on the expected behaviour of
* each function.
*/

View File

@@ -5,12 +5,12 @@
#include "src/Exceptions/InvalidConfig.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
Avr8TargetConfig::Avr8TargetConfig(const TargetConfig& targetConfig)
: TargetConfig(targetConfig)
{
using Bloom::Exceptions::InvalidConfig;
using Exceptions::InvalidConfig;
const auto& targetNode = targetConfig.targetNode;

View File

@@ -8,7 +8,7 @@
#include "PhysicalInterface.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
/**
* Extending the generic TargetConfig struct to accommodate AVR8 target configuration parameters.

View File

@@ -2,7 +2,7 @@
#include "src/TargetController/Exceptions/TargetOperationFailure.hpp"
namespace Bloom::Exceptions
namespace Exceptions
{
class DebugWirePhysicalInterfaceError: public TargetOperationFailure
{

View File

@@ -1,6 +1,6 @@
#pragma once
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
enum class Family: int
{

View File

@@ -4,7 +4,7 @@
#include <cstdint>
#include <optional>
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
/**
* Pin configurations for AVR8 targets may vary across target variants. This is why we must differentiate a pin

View File

@@ -1,6 +1,6 @@
#include "PhysicalInterface.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
std::map<PhysicalInterface, std::string> getPhysicalInterfaceNames() {
return std::map<PhysicalInterface, std::string>({

View File

@@ -4,7 +4,7 @@
#include <map>
#include <string>
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
enum class PhysicalInterface: std::uint8_t
{

View File

@@ -2,7 +2,7 @@
#include <cstdint>
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
enum class ProgramMemorySection: std::uint8_t
{

View File

@@ -2,7 +2,7 @@
#include <cstdint>
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
/**
* Information relating to a specific AVR8 programming session.

View File

@@ -10,17 +10,17 @@
#include "src/Exceptions/Exception.hpp"
#include "src/Targets/TargetDescription/Exceptions/TargetDescriptionParsingFailureException.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
namespace Targets::Microchip::Avr::Avr8Bit::TargetDescription
{
using namespace Bloom::Exceptions;
using namespace Exceptions;
using Bloom::Targets::TargetDescription::RegisterGroup;
using Bloom::Targets::TargetDescription::AddressSpace;
using Bloom::Targets::TargetDescription::MemorySegment;
using Bloom::Targets::TargetDescription::MemorySegmentType;
using Bloom::Targets::TargetDescription::Register;
using Bloom::Targets::TargetVariant;
using Bloom::Targets::TargetRegisterDescriptor;
using Targets::TargetDescription::RegisterGroup;
using Targets::TargetDescription::AddressSpace;
using Targets::TargetDescription::MemorySegment;
using Targets::TargetDescription::MemorySegmentType;
using Targets::TargetDescription::Register;
using Targets::TargetVariant;
using Targets::TargetRegisterDescriptor;
TargetDescriptionFile::TargetDescriptionFile(const std::string& targetName) {
const auto mapping = TargetDescriptionFile::getTargetDescriptionMapping();

View File

@@ -17,7 +17,7 @@
#include "src/Targets/Microchip/AVR/AVR8/TargetParameters.hpp"
#include "src/Targets/Microchip/AVR/AVR8/PadDescriptor.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
namespace Targets::Microchip::Avr::Avr8Bit::TargetDescription
{
/**
* Represents an AVR8 TDF. See the Targets::TargetDescription::TargetDescriptionFile close for more on TDFs.

View File

@@ -6,7 +6,7 @@
#include "../TargetSignature.hpp"
#include "Family.hpp"
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
namespace Targets::Microchip::Avr::Avr8Bit
{
/**
* Holds all parameters that would be required for configuring a debug tool, for an AVR8 target.

View File

@@ -4,7 +4,7 @@
#include "src/Targets/TargetMemory.hpp"
namespace Bloom::Targets::Microchip::Avr
namespace Targets::Microchip::Avr
{
enum class FuseType: std::uint8_t
{

View File

@@ -2,7 +2,7 @@
#include <cstdint>
namespace Bloom::Targets::Microchip::Avr
namespace Targets::Microchip::Avr
{
/**
* These parameters are required by the ISP interface. They can be extracted from the target's TDF.

View File

@@ -4,7 +4,7 @@
#include <sstream>
#include <iomanip>
namespace Bloom::Targets::Microchip::Avr
namespace Targets::Microchip::Avr
{
/**
* All AVR targets carry a three-byte signature that is *usually* unique to the target.

View File

@@ -17,7 +17,7 @@
#include "src/DebugToolDrivers/DebugTool.hpp"
namespace Bloom::Targets
namespace Targets
{
/**
* Abstract class for Targets.

View File

@@ -4,7 +4,7 @@
#include "TargetMemory.hpp"
namespace Bloom::Targets
namespace Targets
{
enum class TargetBreakCause: int
{

View File

@@ -4,7 +4,7 @@
#include "MemorySegment.hpp"
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct AddressSpace
{

View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <string>
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct BitField
{

View File

@@ -2,7 +2,7 @@
#include "src/Exceptions/Exception.hpp"
namespace Bloom::Exceptions
namespace Exceptions
{
class TargetDescriptionParsingFailureException: public Exception
{

View File

@@ -3,7 +3,7 @@
#include <string>
#include <optional>
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct Interface
{

View File

@@ -6,7 +6,7 @@
#include "src/Helpers/BiMap.hpp"
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
enum class MemorySegmentType
{

View File

@@ -3,7 +3,7 @@
#include "ModuleInstance.hpp"
#include "RegisterGroup.hpp"
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct Module
{

View File

@@ -7,7 +7,7 @@
#include "RegisterGroup.hpp"
#include "Signal.hpp"
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct ModuleInstance
{

View File

@@ -3,7 +3,7 @@
#include <string>
#include <vector>
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct Pin
{

View File

@@ -4,7 +4,7 @@
#include <QString>
#include <map>
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct Property
{

View File

@@ -7,7 +7,7 @@
#include "BitField.hpp"
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct Register
{

View File

@@ -3,7 +3,7 @@
#include <string>
#include <optional>
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct Signal
{

View File

@@ -7,9 +7,9 @@
#include "src/Logger/Logger.hpp"
#include "src/Services/PathService.hpp"
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
using namespace Bloom::Exceptions;
using namespace Exceptions;
const std::string& TargetDescriptionFile::getTargetName() const {
return this->targetName;

View File

@@ -12,7 +12,7 @@
#include "Pinout.hpp"
#include "Interface.hpp"
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
/**
* A target description file (TDF) is an XML file that describes a particular target. All supported targets come

View File

@@ -2,7 +2,7 @@
#include <string>
namespace Bloom::Targets::TargetDescription
namespace Targets::TargetDescription
{
struct Variant
{

View File

@@ -11,7 +11,7 @@
#include "TargetRegister.hpp"
#include "TargetVariant.hpp"
namespace Bloom::Targets
namespace Targets
{
struct TargetDescriptor
{
@@ -56,4 +56,4 @@ namespace Bloom::Targets
};
}
Q_DECLARE_METATYPE(Bloom::Targets::TargetDescriptor)
Q_DECLARE_METATYPE(Targets::TargetDescriptor)

View File

@@ -4,7 +4,7 @@
#include <vector>
#include <optional>
namespace Bloom::Targets
namespace Targets
{
using TargetMemoryAddress = std::uint32_t;
using TargetMemorySize = std::uint32_t;

View File

@@ -7,7 +7,7 @@
#include <map>
#include <QMetaType>
namespace Bloom::Targets
namespace Targets
{
enum class TargetPinType: std::uint8_t
{
@@ -57,9 +57,9 @@ namespace Bloom::Targets
std::optional<IoDirection> ioDirection;
};
using TargetPinStateMapping = std::map<int, Bloom::Targets::TargetPinState>;
using TargetPinStateMapping = std::map<int, Targets::TargetPinState>;
}
Q_DECLARE_METATYPE(Bloom::Targets::TargetPinDescriptor)
Q_DECLARE_METATYPE(Bloom::Targets::TargetPinState)
Q_DECLARE_METATYPE(Bloom::Targets::TargetPinStateMapping)
Q_DECLARE_METATYPE(Targets::TargetPinDescriptor)
Q_DECLARE_METATYPE(Targets::TargetPinState)
Q_DECLARE_METATYPE(Targets::TargetPinStateMapping)

View File

@@ -1,6 +1,6 @@
#include "TargetRegister.hpp"
namespace Bloom::Targets
namespace Targets
{
std::size_t TargetRegisterDescriptor::getHash() const {
if (!this->cachedHash.has_value()) {

View File

@@ -11,7 +11,7 @@
#include "TargetMemory.hpp"
namespace Bloom::Targets
namespace Targets
{
using TargetRegisterDescriptorId = std::uint32_t;
using TargetRegisterDescriptorIds = std::set<Targets::TargetRegisterDescriptorId>;
@@ -97,7 +97,7 @@ namespace Bloom::Targets
static inline std::atomic<TargetRegisterDescriptorId> lastRegisterDescriptorId = 0;
std::size_t getHash() const;
friend std::hash<Bloom::Targets::TargetRegisterDescriptor>;
friend std::hash<Targets::TargetRegisterDescriptor>;
};
struct TargetRegister
@@ -129,10 +129,10 @@ namespace std
* class)
*/
template<>
class hash<Bloom::Targets::TargetRegisterDescriptor>
class hash<Targets::TargetRegisterDescriptor>
{
public:
std::size_t operator()(const Bloom::Targets::TargetRegisterDescriptor& descriptor) const {
std::size_t operator()(const Targets::TargetRegisterDescriptor& descriptor) const {
return descriptor.getHash();
}
};

View File

@@ -2,7 +2,7 @@
#include <QMetaType>
namespace Bloom::Targets
namespace Targets
{
enum class TargetState: std::uint8_t
{
@@ -12,4 +12,4 @@ namespace Bloom::Targets
};
}
Q_DECLARE_METATYPE(Bloom::Targets::TargetState)
Q_DECLARE_METATYPE(Targets::TargetState)

View File

@@ -6,7 +6,7 @@
#include "TargetPinDescriptor.hpp"
namespace Bloom::Targets
namespace Targets
{
enum class TargetPackage: std::uint8_t
{