Return fields by value instead of const reference

This commit is contained in:
Dan Paulat 2022-01-23 19:55:56 -06:00
parent c47a569645
commit 835ee644b5
10 changed files with 481 additions and 483 deletions

View file

@ -35,15 +35,15 @@ public:
bool operator==(const WmoHeader& o) const; bool operator==(const WmoHeader& o) const;
const std::string& sequence_number() const; std::string sequence_number() const;
const std::string& data_type() const; std::string data_type() const;
const std::string& geographic_designator() const; std::string geographic_designator() const;
const std::string& bulletin_id() const; std::string bulletin_id() const;
const std::string& icao() const; std::string icao() const;
const std::string& date_time() const; std::string date_time() const;
const std::string& bbb_indicator() const; std::string bbb_indicator() const;
const std::string& product_category() const; std::string product_category() const;
const std::string& product_designator() const; std::string product_designator() const;
bool Parse(std::istream& is); bool Parse(std::istream& is);

View file

@ -37,12 +37,12 @@ typedef util::Iterator<Level2Product,
Level2ProductIterator; Level2ProductIterator;
const std::string& GetRadarProductGroupName(RadarProductGroup group); const std::string& GetRadarProductGroupName(RadarProductGroup group);
const RadarProductGroup GetRadarProductGroup(const std::string& name); RadarProductGroup GetRadarProductGroup(const std::string& name);
const std::string& GetLevel2Name(Level2Product product); const std::string& GetLevel2Name(Level2Product product);
const std::string& GetLevel2Description(Level2Product product); const std::string& GetLevel2Description(Level2Product product);
const std::string& GetLevel2Palette(Level2Product product); const std::string& GetLevel2Palette(Level2Product product);
const Level2Product GetLevel2Product(const std::string& name); Level2Product GetLevel2Product(const std::string& name);
} // namespace common } // namespace common
} // namespace scwx } // namespace scwx

View file

@ -182,7 +182,7 @@ public:
DigitalRadarData(DigitalRadarData&&) noexcept; DigitalRadarData(DigitalRadarData&&) noexcept;
DigitalRadarData& operator=(DigitalRadarData&&) noexcept; DigitalRadarData& operator=(DigitalRadarData&&) noexcept;
const std::string& radar_identifier() const; std::string radar_identifier() const;
uint32_t collection_time() const; uint32_t collection_time() const;
uint16_t modified_julian_date() const; uint16_t modified_julian_date() const;
uint16_t azimuth_number() const; uint16_t azimuth_number() const;

View file

@ -76,7 +76,7 @@ public:
float adc_calibration_offset_voltage() const; float adc_calibration_offset_voltage() const;
float adc_calibration_gain_correction() const; float adc_calibration_gain_correction() const;
uint16_t rcp_status() const; uint16_t rcp_status() const;
const std::string& rcp_string() const; std::string rcp_string() const;
uint16_t spip_power_buttons() const; uint16_t spip_power_buttons() const;
float master_power_administrator_load() const; float master_power_administrator_load() const;
float expansion_power_administrator_load() const; float expansion_power_administrator_load() const;

View file

@ -23,11 +23,11 @@ public:
RdaAdaptationData(RdaAdaptationData&&) noexcept; RdaAdaptationData(RdaAdaptationData&&) noexcept;
RdaAdaptationData& operator=(RdaAdaptationData&&) noexcept; RdaAdaptationData& operator=(RdaAdaptationData&&) noexcept;
const std::string& adap_file_name() const; std::string adap_file_name() const;
const std::string& adap_format() const; std::string adap_format() const;
const std::string& adap_revision() const; std::string adap_revision() const;
const std::string& adap_date() const; std::string adap_date() const;
const std::string& adap_time() const; std::string adap_time() const;
float lower_pre_limit() const; float lower_pre_limit() const;
float az_lat() const; float az_lat() const;
float upper_pre_limit() const; float upper_pre_limit() const;
@ -123,7 +123,7 @@ public:
char slondir() const; char slondir() const;
float az_correction_factor() const; float az_correction_factor() const;
float el_correction_factor() const; float el_correction_factor() const;
const std::string& site_name() const; std::string site_name() const;
float ant_manual_setup_ielmin() const; float ant_manual_setup_ielmin() const;
float ant_manual_setup_ielmax() const; float ant_manual_setup_ielmax() const;
uint32_t ant_manual_setup_fazvelmax() const; uint32_t ant_manual_setup_fazvelmax() const;

View file

@ -74,47 +74,47 @@ bool WmoHeaderImpl::operator==(const WmoHeaderImpl& o) const
productDesignator_ == o.productDesignator_); productDesignator_ == o.productDesignator_);
} }
const std::string& WmoHeader::sequence_number() const std::string WmoHeader::sequence_number() const
{ {
return p->sequenceNumber_; return p->sequenceNumber_;
} }
const std::string& WmoHeader::data_type() const std::string WmoHeader::data_type() const
{ {
return p->dataType_; return p->dataType_;
} }
const std::string& WmoHeader::geographic_designator() const std::string WmoHeader::geographic_designator() const
{ {
return p->geographicDesignator_; return p->geographicDesignator_;
} }
const std::string& WmoHeader::bulletin_id() const std::string WmoHeader::bulletin_id() const
{ {
return p->bulletinId_; return p->bulletinId_;
} }
const std::string& WmoHeader::icao() const std::string WmoHeader::icao() const
{ {
return p->icao_; return p->icao_;
} }
const std::string& WmoHeader::date_time() const std::string WmoHeader::date_time() const
{ {
return p->dateTime_; return p->dateTime_;
} }
const std::string& WmoHeader::bbb_indicator() const std::string WmoHeader::bbb_indicator() const
{ {
return p->bbbIndicator_; return p->bbbIndicator_;
} }
const std::string& WmoHeader::product_category() const std::string WmoHeader::product_category() const
{ {
return p->productCategory_; return p->productCategory_;
} }
const std::string& WmoHeader::product_designator() const std::string WmoHeader::product_designator() const
{ {
return p->productDesignator_; return p->productDesignator_;
} }

View file

@ -47,14 +47,13 @@ const std::string& GetProductGroupName(RadarProductGroup group)
return productGroupName_.at(group); return productGroupName_.at(group);
} }
const RadarProductGroup GetProductGroup(const std::string& name) RadarProductGroup GetProductGroup(const std::string& name)
{ {
auto result = std::find_if( auto result = std::find_if(
productGroupName_.cbegin(), productGroupName_.cbegin(),
productGroupName_.cend(), productGroupName_.cend(),
[&](const std::pair<RadarProductGroup, std::string>& pair) -> bool { [&](const std::pair<RadarProductGroup, std::string>& pair) -> bool
return pair.second == name; { return pair.second == name; });
});
if (result != productGroupName_.cend()) if (result != productGroupName_.cend())
{ {
@ -81,14 +80,13 @@ const std::string& GetLevel2Palette(Level2Product product)
return level2Palette_.at(product); return level2Palette_.at(product);
} }
const Level2Product GetLevel2Product(const std::string& name) Level2Product GetLevel2Product(const std::string& name)
{ {
auto result = std::find_if( auto result = std::find_if(
level2Name_.cbegin(), level2Name_.cbegin(),
level2Name_.cend(), level2Name_.cend(),
[&](const std::pair<Level2Product, std::string>& pair) -> bool { [&](const std::pair<Level2Product, std::string>& pair) -> bool
return pair.second == name; { return pair.second == name; });
});
if (result != level2Name_.cend()) if (result != level2Name_.cend())
{ {

View file

@ -550,7 +550,7 @@ DigitalRadarData::DigitalRadarData(DigitalRadarData&&) noexcept = default;
DigitalRadarData& DigitalRadarData&
DigitalRadarData::operator=(DigitalRadarData&&) noexcept = default; DigitalRadarData::operator=(DigitalRadarData&&) noexcept = default;
const std::string& DigitalRadarData::radar_identifier() const std::string DigitalRadarData::radar_identifier() const
{ {
return p->radarIdentifier_; return p->radarIdentifier_;
} }

View file

@ -821,7 +821,7 @@ uint16_t PerformanceMaintenanceData::rcp_status() const
return p->rcpStatus_; return p->rcpStatus_;
} }
const std::string& PerformanceMaintenanceData::rcp_string() const std::string PerformanceMaintenanceData::rcp_string() const
{ {
return p->rcpString_; return p->rcpString_;
} }

View file

@ -378,27 +378,27 @@ RdaAdaptationData::RdaAdaptationData(RdaAdaptationData&&) noexcept = default;
RdaAdaptationData& RdaAdaptationData&
RdaAdaptationData::operator=(RdaAdaptationData&&) noexcept = default; RdaAdaptationData::operator=(RdaAdaptationData&&) noexcept = default;
const std::string& RdaAdaptationData::adap_file_name() const std::string RdaAdaptationData::adap_file_name() const
{ {
return p->adapFileName_; return p->adapFileName_;
} }
const std::string& RdaAdaptationData::adap_format() const std::string RdaAdaptationData::adap_format() const
{ {
return p->adapFormat_; return p->adapFormat_;
} }
const std::string& RdaAdaptationData::adap_revision() const std::string RdaAdaptationData::adap_revision() const
{ {
return p->adapRevision_; return p->adapRevision_;
} }
const std::string& RdaAdaptationData::adap_date() const std::string RdaAdaptationData::adap_date() const
{ {
return p->adapDate_; return p->adapDate_;
} }
const std::string& RdaAdaptationData::adap_time() const std::string RdaAdaptationData::adap_time() const
{ {
return p->adapTime_; return p->adapTime_;
} }
@ -878,7 +878,7 @@ float RdaAdaptationData::el_correction_factor() const
return p->elCorrectionFactor_; return p->elCorrectionFactor_;
} }
const std::string& RdaAdaptationData::site_name() const std::string RdaAdaptationData::site_name() const
{ {
return p->siteName_; return p->siteName_;
} }