Rename all protos to end with 'Proto' to avoid name conflicts.

This commit is contained in:
David Given
2021-05-13 18:05:08 +02:00
parent 639588fa68
commit 5a186b6960
37 changed files with 162 additions and 165 deletions

View File

@@ -7,9 +7,9 @@ extern FlagGroup hardwareFluxSourceFlags;
class Fluxmap;
class FluxSpec;
class Config_InputDisk;
class HardwareInput;
class TestPatternInput;
class InputDiskProto;
class HardwareInputProto;
class TestPatternInputProto;
class FluxSource
{
@@ -18,13 +18,12 @@ public:
private:
static std::unique_ptr<FluxSource> createSqliteFluxSource(const std::string& filename);
static std::unique_ptr<FluxSource> createHardwareFluxSource(const HardwareInput& config);
static std::unique_ptr<FluxSource> createHardwareFluxSource(const HardwareInputProto& config);
static std::unique_ptr<FluxSource> createStreamFluxSource(const std::string& path);
static std::unique_ptr<FluxSource> createTestPatternFluxSource(const TestPatternInput& config);
static std::unique_ptr<FluxSource> createTestPatternFluxSource(const TestPatternInputProto& config);
public:
static std::unique_ptr<FluxSource> create(const FluxSpec& spec);
static std::unique_ptr<FluxSource> create(const Config_InputDisk& spec);
static std::unique_ptr<FluxSource> create(const InputDiskProto& spec);
public:
virtual std::unique_ptr<Fluxmap> readFlux(int track, int side) = 0;