Consts and references

This commit is contained in:
2022-09-09 20:10:38 +02:00
parent b050c23577
commit 699e2a4784
16 changed files with 156 additions and 179 deletions
+5 -5
View File
@@ -29,7 +29,7 @@ namespace germanairlinesva_simdata
{
private:
std::string designator;
germanairlinesva_geodata::point center;
struct germanairlinesva_geodata::point center;
std::uint8_t radius;
std::vector<std::uint8_t> file;
@@ -41,13 +41,13 @@ namespace germanairlinesva_simdata
std::uint8_t radius);
// From database
Gate(std::string designator,
germanairlinesva_geodata::point center,
struct germanairlinesva_geodata::point center,
std::uint8_t radius);
inline std::uint8_t *getBinaryData() { return file.data(); }
inline std::size_t getBinaryLength() { return file.size(); }
inline const std::uint8_t *getBinaryData() const { return file.data(); }
inline std::size_t getBinaryLength() const { return file.size(); }
std::string to_string() const
inline const std::string to_string() const
{
std::ostringstream str;
str << "Gate " << this->designator << " at " << this->center.latitude
+3 -3
View File
@@ -49,10 +49,10 @@ namespace germanairlinesva_simdata
std::uint16_t length,
std::uint16_t trueHeading);
inline std::uint8_t *getBinaryData() { return file.data(); }
inline std::size_t getBinaryLength() { return file.size(); }
inline const std::uint8_t *getBinaryData() const { return file.data(); }
inline std::size_t getBinaryLength() const { return file.size(); }
std::string to_string() const
inline const std::string to_string() const
{
std::ostringstream str;
str << "Runway " << this->designator << " with bounds "
+9 -7
View File
@@ -12,9 +12,9 @@
namespace germanairlinesva_simdata
{
int scan(
const char *defaultFile,
const char *sceneryPack,
const char *logFile,
const std::string defaultFile,
const std::string sceneryPack,
const std::string logFile,
std::map<std::string, std::pair<std::vector<Gate>, std::vector<Runway>>>
&airports);
@@ -24,10 +24,12 @@ namespace germanairlinesva_simdata
std::map<std::string, std::pair<std::vector<Gate>, std::vector<Runway>>>
&airports,
std::ofstream &logfile);
void makeGate15(std::vector<Gate> *gates, std::vector<std::string> fields);
void makeRunway(std::vector<Runway> *runways,
std::vector<std::string> fields);
void makeGate1300(std::vector<Gate> *gates, std::vector<std::string> fields);
void makeGate15(std::vector<Gate> &gates,
const std::vector<std::string> &fields);
void makeRunway(std::vector<Runway> &runways,
const std::vector<std::string> &fields);
void makeGate1300(std::vector<Gate> &gates,
const std::vector<std::string> &fields);
} // namespace germanairlinesva_simdata
+2 -2
View File
@@ -113,7 +113,7 @@ namespace germanairlinesva_simdata
static_cast<char *>(calloc(designatorLength + 1, sizeof(char)));
in.read(designator, designatorLength + 1);
// Center
germanairlinesva_geodata::point center;
struct germanairlinesva_geodata::point center;
in.read(reinterpret_cast<char *>(&center), sizeof(center));
// Radius
std::uint8_t radius;
@@ -133,7 +133,7 @@ namespace germanairlinesva_simdata
static_cast<char *>(calloc(designatorLength + 1, sizeof(char)));
in.read(designator, designatorLength + 1);
// Bounds
germanairlinesva_geodata::box bounds;
struct germanairlinesva_geodata::box bounds;
in.read(reinterpret_cast<char *>(&bounds), sizeof(bounds));
// Width
std::uint8_t width;