diff --git a/esphome/components/binary_sensor/binary_sensor.cpp b/esphome/components/binary_sensor/binary_sensor.cpp index 1f837e3ac1..bd33b2af2d 100644 --- a/esphome/components/binary_sensor/binary_sensor.cpp +++ b/esphome/components/binary_sensor/binary_sensor.cpp @@ -41,16 +41,13 @@ void BinarySensor::send_state_internal(bool state, bool is_initial) { this->state_callback_.call(state); } } -std::string BinarySensor::device_class() { return ""; } + BinarySensor::BinarySensor() : state(false) {} void BinarySensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; } std::string BinarySensor::get_device_class() { if (this->device_class_.has_value()) return *this->device_class_; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return this->device_class(); -#pragma GCC diagnostic pop + return ""; } void BinarySensor::add_filter(Filter *filter) { filter->parent_ = this; diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h index fbfff63a38..0bf8cf2cdc 100644 --- a/esphome/components/binary_sensor/binary_sensor.h +++ b/esphome/components/binary_sensor/binary_sensor.h @@ -80,14 +80,6 @@ class BinarySensor : public EntityBase { virtual bool is_status_binary_sensor() const; - // ========== OVERRIDE METHODS ========== - // (You'll only need this when creating your own custom binary sensor) - /** Override this to set the default device class. - * - * @deprecated This method is deprecated, set the property during config validation instead. (2022.1) - */ - virtual std::string device_class(); - protected: CallbackManager state_callback_{}; optional device_class_{}; ///< Stores the override of the device class diff --git a/esphome/components/cover/cover.cpp b/esphome/components/cover/cover.cpp index 3d3abffae2..902e9bca94 100644 --- a/esphome/components/cover/cover.cpp +++ b/esphome/components/cover/cover.cpp @@ -208,14 +208,10 @@ Cover::Cover() : Cover("") {} std::string Cover::get_device_class() { if (this->device_class_override_.has_value()) return *this->device_class_override_; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return this->device_class(); -#pragma GCC diagnostic pop + return ""; } bool Cover::is_fully_open() const { return this->position == COVER_OPEN; } bool Cover::is_fully_closed() const { return this->position == COVER_CLOSED; } -std::string Cover::device_class() { return ""; } CoverCall CoverRestoreState::to_call(Cover *cover) { auto call = cover->make_call(); diff --git a/esphome/components/cover/cover.h b/esphome/components/cover/cover.h index 27a821215a..8ae9cfc8dd 100644 --- a/esphome/components/cover/cover.h +++ b/esphome/components/cover/cover.h @@ -170,12 +170,6 @@ class Cover : public EntityBase { virtual void control(const CoverCall &call) = 0; - /** Override this to set the default device class. - * - * @deprecated This method is deprecated, set the property during config validation instead. (2022.1) - */ - virtual std::string device_class(); - optional restore_state_(); CallbackManager state_callback_{}; diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp index a729791e7e..0de452b784 100644 --- a/esphome/components/sensor/sensor.cpp +++ b/esphome/components/sensor/sensor.cpp @@ -26,48 +26,32 @@ Sensor::Sensor() : Sensor("") {} std::string Sensor::get_unit_of_measurement() { if (this->unit_of_measurement_.has_value()) return *this->unit_of_measurement_; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return this->unit_of_measurement(); -#pragma GCC diagnostic pop + return ""; } void Sensor::set_unit_of_measurement(const std::string &unit_of_measurement) { this->unit_of_measurement_ = unit_of_measurement; } -std::string Sensor::unit_of_measurement() { return ""; } int8_t Sensor::get_accuracy_decimals() { if (this->accuracy_decimals_.has_value()) return *this->accuracy_decimals_; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return this->accuracy_decimals(); -#pragma GCC diagnostic pop + return 0; } void Sensor::set_accuracy_decimals(int8_t accuracy_decimals) { this->accuracy_decimals_ = accuracy_decimals; } -int8_t Sensor::accuracy_decimals() { return 0; } std::string Sensor::get_device_class() { if (this->device_class_.has_value()) return *this->device_class_; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return this->device_class(); -#pragma GCC diagnostic pop + return ""; } void Sensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; } -std::string Sensor::device_class() { return ""; } void Sensor::set_state_class(StateClass state_class) { this->state_class_ = state_class; } StateClass Sensor::get_state_class() { if (this->state_class_.has_value()) return *this->state_class_; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return this->state_class(); -#pragma GCC diagnostic pop + return StateClass::STATE_CLASS_NONE; } -StateClass Sensor::state_class() { return StateClass::STATE_CLASS_NONE; } void Sensor::publish_state(float state) { this->raw_state = state; diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h index 4a6b1fe3dc..e3651752cf 100644 --- a/esphome/components/sensor/sensor.h +++ b/esphome/components/sensor/sensor.h @@ -159,30 +159,6 @@ class Sensor : public EntityBase { void internal_send_state_to_frontend(float state); protected: - /** Override this to set the default unit of measurement. - * - * @deprecated This method is deprecated, set the property during config validation instead. (2022.1) - */ - virtual std::string unit_of_measurement(); // NOLINT - - /** Override this to set the default accuracy in decimals. - * - * @deprecated This method is deprecated, set the property during config validation instead. (2022.1) - */ - virtual int8_t accuracy_decimals(); // NOLINT - - /** Override this to set the default device class. - * - * @deprecated This method is deprecated, set the property during config validation instead. (2022.1) - */ - virtual std::string device_class(); // NOLINT - - /** Override this to set the default state class. - * - * @deprecated This method is deprecated, set the property during config validation instead. (2022.1) - */ - virtual StateClass state_class(); // NOLINT - CallbackManager raw_callback_; ///< Storage for raw state callbacks. CallbackManager callback_; ///< Storage for filtered state callbacks.