diff --git a/owlps-positioner/autocalibration.hh b/owlps-positioner/autocalibration.hh index 2ecfa25..099a2bf 100644 --- a/owlps-positioner/autocalibration.hh +++ b/owlps-positioner/autocalibration.hh @@ -56,7 +56,7 @@ protected: virtual bool compute_single_packet_ss(pkt_id_t pkt_id) = 0 ; public: - Autocalibration(const Point3D &_point): point(_point) {} + explicit Autocalibration(const Point3D &_point): point(_point) {} /// Generates a single reference point void generate_reference_point(void) ; diff --git a/owlps-positioner/autocalibrationmesh.hh b/owlps-positioner/autocalibrationmesh.hh index 1583576..5b6037d 100644 --- a/owlps-positioner/autocalibrationmesh.hh +++ b/owlps-positioner/autocalibrationmesh.hh @@ -78,7 +78,7 @@ protected: const float point_dst) ; public: - AutocalibrationMesh(const Point3D &_point): Autocalibration(_point) {} + explicit AutocalibrationMesh(const Point3D &_point): Autocalibration(_point) {} } ; #endif // _OWLPS_POSITIONING_AUTOCALIBRATIONMESH_HH_ diff --git a/owlps-positioner/building.hh b/owlps-positioner/building.hh index a2bc41c..fd604c3 100644 --- a/owlps-positioner/building.hh +++ b/owlps-positioner/building.hh @@ -34,7 +34,7 @@ protected: std::unordered_set waypoints ; public: - Building(const std::string &_name = "Unnamed building"): + explicit Building(const std::string &_name = "Unnamed building"): name(_name) {} Building(const Building &source): diff --git a/owlps-positioner/calibrationrequest.hh b/owlps-positioner/calibrationrequest.hh index e381d50..2e078cc 100644 --- a/owlps-positioner/calibrationrequest.hh +++ b/owlps-positioner/calibrationrequest.hh @@ -30,7 +30,8 @@ protected: Direction direction ; public: - CalibrationRequest(const uint_fast8_t _type = OWL_REQUEST_AUTOCALIBRATION) ; + explicit CalibrationRequest(const uint_fast8_t _type + = OWL_REQUEST_AUTOCALIBRATION); CalibrationRequest(const CalibrationRequest &source): Request(source), reference_point(source.reference_point), diff --git a/owlps-positioner/capturepoint.hh b/owlps-positioner/capturepoint.hh index b4c2be4..9f3f01a 100644 --- a/owlps-positioner/capturepoint.hh +++ b/owlps-positioner/capturepoint.hh @@ -57,7 +57,7 @@ public: frequency(PosUtil::wifi_channel_to_hz(channel)), friis_index(0) {} - CapturePoint(const WifiDevice &source): + explicit CapturePoint(const WifiDevice &source): WifiDevice(source), coordinates(Point3D()), frequency(0), friis_index(0) {} diff --git a/owlps-positioner/capturepointsreadercsv.hh b/owlps-positioner/capturepointsreadercsv.hh index 5b05454..e98f06d 100644 --- a/owlps-positioner/capturepointsreadercsv.hh +++ b/owlps-positioner/capturepointsreadercsv.hh @@ -35,7 +35,7 @@ protected: void process_device_line(void) ; public: - CapturePointsReaderCSV(const std::string &file_name) ; + explicit CapturePointsReaderCSV(const std::string &file_name); ~CapturePointsReaderCSV(void) {} } ; diff --git a/owlps-positioner/csvstringreader.hh b/owlps-positioner/csvstringreader.hh index 72de2c7..b344ebf 100644 --- a/owlps-positioner/csvstringreader.hh +++ b/owlps-positioner/csvstringreader.hh @@ -38,7 +38,7 @@ protected: void print_error_cast(void) const ; public: - CSVStringReader(const char _separator = ';'): + explicit CSVStringReader(const char _separator = ';'): separator(_separator), current_token(nullptr), current_field_nb(0) {} CSVStringReader(const std::string &_str, const char _separator = ';') ; diff --git a/owlps-positioner/inputcsv.hh b/owlps-positioner/inputcsv.hh index 6c2920e..d250e36 100644 --- a/owlps-positioner/inputcsv.hh +++ b/owlps-positioner/inputcsv.hh @@ -44,7 +44,7 @@ protected: //@} public: - InputCSV(const std::string &filename): + explicit InputCSV(const std::string &filename): file(filename) {} ~InputCSV(void) {} diff --git a/owlps-positioner/inputlogcsv.hh b/owlps-positioner/inputlogcsv.hh index 0a2076f..251c772 100644 --- a/owlps-positioner/inputlogcsv.hh +++ b/owlps-positioner/inputlogcsv.hh @@ -28,7 +28,7 @@ protected: TextFileWriter file ; public: - InputLogCSV(const std::string &filename): + explicit InputLogCSV(const std::string &filename): file(filename) {} /** @name Operations */ diff --git a/owlps-positioner/inputudpsocket.hh b/owlps-positioner/inputudpsocket.hh index e3b9a6b..7c66bce 100644 --- a/owlps-positioner/inputudpsocket.hh +++ b/owlps-positioner/inputudpsocket.hh @@ -40,7 +40,7 @@ protected: //@} public: - InputUDPSocket(const uint_fast16_t _port) ; + explicit InputUDPSocket(const uint_fast16_t _port); ~InputUDPSocket(void) ; diff --git a/owlps-positioner/measurement.hh b/owlps-positioner/measurement.hh index 8ff1960..6c3ce45 100644 --- a/owlps-positioner/measurement.hh +++ b/owlps-positioner/measurement.hh @@ -65,7 +65,7 @@ protected: public: - Measurement(const CapturePoint *const _cp = nullptr): + explicit Measurement(const CapturePoint *const _cp = nullptr): cp(_cp), average_dbm(0), average_mw(0), variance_mw(0), variance_dbm(0), variance_mw_m2(0), variance_dbm_m2(0), variance_size(0) {} diff --git a/owlps-positioner/mobile.hh b/owlps-positioner/mobile.hh index 3016bd1..ed23966 100644 --- a/owlps-positioner/mobile.hh +++ b/owlps-positioner/mobile.hh @@ -50,7 +50,7 @@ public: WifiDevice(_ip_addr, _mac_addr, _antenna_gain, _trx_power), last_request(nullptr) {} - Mobile(const WifiDevice &wd): + explicit Mobile(const WifiDevice &wd): WifiDevice(wd), last_request(nullptr) {} Mobile(const Mobile &m) ; diff --git a/owlps-positioner/mobilesreadercsv.hh b/owlps-positioner/mobilesreadercsv.hh index 77f494e..e65013d 100644 --- a/owlps-positioner/mobilesreadercsv.hh +++ b/owlps-positioner/mobilesreadercsv.hh @@ -35,7 +35,7 @@ protected: void process_device_line(void) ; public: - MobilesReaderCSV(const std::string &file_name) ; + explicit MobilesReaderCSV(const std::string &file_name); ~MobilesReaderCSV(void) {} } ; diff --git a/owlps-positioner/outputcsv.hh b/owlps-positioner/outputcsv.hh index 9440d39..6156cde 100644 --- a/owlps-positioner/outputcsv.hh +++ b/owlps-positioner/outputcsv.hh @@ -28,7 +28,7 @@ protected: TextFileWriter file ; public: - OutputCSV(const std::string &filename): + explicit OutputCSV(const std::string &filename): file(filename) {} void write(const Result &result) ; diff --git a/owlps-positioner/outputterminal.hh b/owlps-positioner/outputterminal.hh index 0e8917d..1097104 100644 --- a/owlps-positioner/outputterminal.hh +++ b/owlps-positioner/outputterminal.hh @@ -26,7 +26,7 @@ protected: std::ostream &output_stream ; public: - OutputTerminal(std::ostream &_output_stream = std::cout): + explicit OutputTerminal(std::ostream &_output_stream = std::cout): output_stream(_output_stream) {} void write(const Result &result) ; diff --git a/owlps-positioner/point3d.hh b/owlps-positioner/point3d.hh index 8f041a4..e78f38c 100644 --- a/owlps-positioner/point3d.hh +++ b/owlps-positioner/point3d.hh @@ -39,10 +39,10 @@ public: Point3D(const Point3D &source): x(source.x), y(source.y), z(source.z) {} - Point3D(const float source[3]): + explicit Point3D(const float source[3]): x(source[0]), y(source[1]), z(source[2]) {} - Point3D(const std::string &source) ; + explicit Point3D(const std::string &source); virtual ~Point3D(void) {} diff --git a/owlps-positioner/posexcept.hh b/owlps-positioner/posexcept.hh index afa1192..41a2c04 100644 --- a/owlps-positioner/posexcept.hh +++ b/owlps-positioner/posexcept.hh @@ -27,7 +27,7 @@ protected: std::string explanation ; public: - posexcept(const std::string &_explanation = "") throw(): + explicit posexcept(const std::string &_explanation = "") throw(): explanation(_explanation) {} ~posexcept(void) throw() {} @@ -46,28 +46,28 @@ public: class cannot_merge: public posexcept { public: - cannot_merge(const std::string &_explanation) throw() ; + explicit cannot_merge(const std::string &_explanation) throw(); } ; class element_already_exists: public posexcept { public: - element_already_exists(const std::string &_explanation) throw() ; + explicit element_already_exists(const std::string &_explanation) throw(); } ; class element_not_found: public posexcept { public: - element_not_found(const std::string &_explanation) throw() ; + explicit element_not_found(const std::string &_explanation) throw(); } ; class autocalibration_error: public posexcept { public: - autocalibration_error(const std::string &_explanation) throw() ; + explicit autocalibration_error(const std::string &_explanation) throw(); } ; @@ -78,14 +78,14 @@ public: class missing_configuration: public posexcept { public: - missing_configuration(const std::string &_explanation) throw() ; + explicit missing_configuration(const std::string &_explanation) throw(); } ; class bad_configuration: public posexcept { public: - bad_configuration(const std::string &_explanation) throw() ; + explicit bad_configuration(const std::string &_explanation) throw(); } ; @@ -96,21 +96,21 @@ public: class malformed_input_data: public posexcept { public: - malformed_input_data(const std::string &_explanation) throw() ; + explicit malformed_input_data(const std::string &_explanation) throw(); } ; class bad_direction: public posexcept { public: - bad_direction(const char direction) throw() ; + explicit bad_direction(const char direction) throw(); } ; class bad_channel: public posexcept { public: - bad_channel(const unsigned long channel) throw() ; + explicit bad_channel(const unsigned long channel) throw(); } ; @@ -128,14 +128,14 @@ public: class error_opening_input_file: public posexcept { public: - error_opening_input_file(const std::string &file_name) throw() ; + explicit error_opening_input_file(const std::string &file_name) throw(); } ; class error_opening_output_file: public posexcept { public: - error_opening_output_file(const std::string &file_name) throw() ; + explicit error_opening_output_file(const std::string &file_name) throw(); } ; diff --git a/owlps-positioner/positioningalgorithm.hh b/owlps-positioner/positioningalgorithm.hh index 8a556e6..8b38823 100644 --- a/owlps-positioner/positioningalgorithm.hh +++ b/owlps-positioner/positioningalgorithm.hh @@ -26,7 +26,7 @@ protected: const std::string name ; public: - PositioningAlgorithm(const std::string &_name = "UnknownAlgorithm"): + explicit PositioningAlgorithm(const std::string &_name = "UnknownAlgorithm"): name(_name) {} virtual ~PositioningAlgorithm(void) {} diff --git a/owlps-positioner/request.hh b/owlps-positioner/request.hh index 08e7aad..855a57f 100644 --- a/owlps-positioner/request.hh +++ b/owlps-positioner/request.hh @@ -71,8 +71,8 @@ public: const std::unordered_map &_measurements = measurements_list()) ; - Request(const std::unordered_map - &_measurements) ; + explicit Request(const std::unordered_map + &_measurements); Request(const Timestamp &_time_sent, const std::unordered_map diff --git a/owlps-positioner/tests/referencepoint_test.hh b/owlps-positioner/tests/referencepoint_test.hh index 9040777..27b57d4 100644 --- a/owlps-positioner/tests/referencepoint_test.hh +++ b/owlps-positioner/tests/referencepoint_test.hh @@ -40,7 +40,7 @@ public: // 3-float array constructor float coord[3] = {1, 2, 3} ; - ReferencePoint rp3(coord) ; + ReferencePoint rp3((Point3D(coord))) ; TS_ASSERT_EQUALS(rp1, rp3) ; } diff --git a/owlps-positioner/tests/waypoint_test.hh b/owlps-positioner/tests/waypoint_test.hh index c394294..9183620 100644 --- a/owlps-positioner/tests/waypoint_test.hh +++ b/owlps-positioner/tests/waypoint_test.hh @@ -42,7 +42,7 @@ public: // 3-float array constructor float coord[3] = {5, 3, 8} ; - Waypoint wp3(coord) ; + Waypoint wp3((Point3D(coord))) ; TS_ASSERT_EQUALS(wp3, wp4) ; } diff --git a/owlps-positioner/textfilereader.hh b/owlps-positioner/textfilereader.hh index 88d6227..3c65948 100644 --- a/owlps-positioner/textfilereader.hh +++ b/owlps-positioner/textfilereader.hh @@ -38,7 +38,7 @@ protected: bool eof_close(void) ; public: - TextFileReader(const std::string &_file_name) ; + explicit TextFileReader(const std::string &_file_name); virtual ~TextFileReader(void) ; /** @name Operations */ diff --git a/owlps-positioner/textfilewriter.hh b/owlps-positioner/textfilewriter.hh index 88c0d9e..0b35857 100644 --- a/owlps-positioner/textfilewriter.hh +++ b/owlps-positioner/textfilewriter.hh @@ -33,7 +33,7 @@ private: std::streambuf *file_buf ; public: - TextFileWriter(const std::string &_file_name) ; + explicit TextFileWriter(const std::string &_file_name); virtual ~TextFileWriter(void) ; bool write_text(const std::string &text) ; diff --git a/owlps-positioner/timestamp.hh b/owlps-positioner/timestamp.hh index 6d43b3f..2199683 100644 --- a/owlps-positioner/timestamp.hh +++ b/owlps-positioner/timestamp.hh @@ -62,11 +62,11 @@ protected: public: Timestamp(void) ; - Timestamp(const struct timespec &source) ; + explicit Timestamp(const struct timespec &source); Timestamp(const owl_timestamp &source) ; Timestamp(const uint_fast32_t source_s, const uint_fast32_t source_ns) ; /// Constructs a Timsestamp from a value in milliseconds (deprecated) - Timestamp(const uint64_t source) ; + explicit Timestamp(const uint64_t source); Timestamp(const Timestamp &source) ; ~Timestamp(void) {} diff --git a/owlps-positioner/waypoint.hh b/owlps-positioner/waypoint.hh index f16aa6d..0efeefa 100644 --- a/owlps-positioner/waypoint.hh +++ b/owlps-positioner/waypoint.hh @@ -42,7 +42,7 @@ public: Waypoint(Building *const _b, const Point3D &p) ; - Waypoint(const Point3D &p): Point3D(p) {} + explicit Waypoint(const Point3D &p): Point3D(p) {} Waypoint(const Waypoint &wp): Point3D(wp), buildings(wp.buildings) {}