Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-12 08:24:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

clang-tidy fixes

Browse source
This commit is contained in:
Michael Davidson 2023-12-30 12:40:19 +11:00
parent 62b7c05cd7
commit e40277aa56
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
6 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/graphical_layout/horizontal_stack.cpp
View file

@ -11,7 +11,7 @@ static const char *const TAG = "horizontalstack";
void HorizontalStack::dump_config(int indent_depth, int additional_level_depth) { void HorizontalStack::dump_config(int indent_depth, int additional_level_depth) {
ESP_LOGCONFIG(TAG, "%*sItem Padding: %i", indent_depth, "", this->item_padding_); ESP_LOGCONFIG(TAG, "%*sItem Padding: %i", indent_depth, "", this->item_padding_);
ESP_LOGCONFIG(TAG, "%*sChild alignment: %s", indent_depth, "", vertical_child_align_to_string(this->child_align_)); ESP_LOGCONFIG(TAG, "%*sChild alignment: %s", indent_depth, "", LOG_STR_ARG(vertical_child_align_to_string(this->child_align_)));
ESP_LOGCONFIG(TAG, "%*sChildren: %i", indent_depth, "", this->children_.size()); ESP_LOGCONFIG(TAG, "%*sChildren: %i", indent_depth, "", this->children_.size());
for (LayoutItem *child : this->children_) { for (LayoutItem *child : this->children_) {

2
esphome/components/graphical_layout/text_panel.cpp
View file

@ -14,7 +14,7 @@ static const int TEXT_ALIGN_Y_MASK =
void TextPanel::dump_config(int indent_depth, int additional_level_depth) { void TextPanel::dump_config(int indent_depth, int additional_level_depth) {
std::string text = this->text_.value(); std::string text = this->text_.value();
ESP_LOGCONFIG(TAG, "%*sText Align: %s", indent_depth, "", display::text_align_to_string(this->text_align_)); ESP_LOGCONFIG(TAG, "%*sText Align: %s", indent_depth, "", LOG_STR_ARG(display::text_align_to_string(this->text_align_)));
ESP_LOGCONFIG(TAG, "%*sText: %s", indent_depth, "", text.c_str()); ESP_LOGCONFIG(TAG, "%*sText: %s", indent_depth, "", text.c_str());
} }

6
esphome/components/graphical_layout/text_panel.h
View file

@ -7,12 +7,6 @@
#include "esphome/core/automation.h" #include "esphome/core/automation.h"
namespace esphome { namespace esphome {
namespace display {
extern const Color COLOR_ON;
extern const Color COLOR_OFF;
} // namespace display
namespace graphical_layout { namespace graphical_layout {
/** The TextPanel is a UI item that renders a single line of text to a display */ /** The TextPanel is a UI item that renders a single line of text to a display */

3
esphome/components/graphical_layout/text_run_panel.cpp
View file

@ -15,7 +15,7 @@ static const int TEXT_ALIGN_Y_MASK =
void TextRunPanel::dump_config(int indent_depth, int additional_level_depth) { void TextRunPanel::dump_config(int indent_depth, int additional_level_depth) {
ESP_LOGCONFIG(TAG, "%*sMin Width: %i", indent_depth, "", this->min_width_); ESP_LOGCONFIG(TAG, "%*sMin Width: %i", indent_depth, "", this->min_width_);
ESP_LOGCONFIG(TAG, "%*sMax Width: %i", indent_depth, "", this->max_width_); ESP_LOGCONFIG(TAG, "%*sMax Width: %i", indent_depth, "", this->max_width_);
ESP_LOGCONFIG(TAG, "%*sText Align: %s", indent_depth, "", display::text_align_to_string(this->text_align_)); ESP_LOGCONFIG(TAG, "%*sText Align: %s", indent_depth, "", LOG_STR_ARG(display::text_align_to_string(this->text_align_)));
ESP_LOGCONFIG(TAG, "%*sText Runs: %i", indent_depth, "", this->text_runs_.size()); ESP_LOGCONFIG(TAG, "%*sText Runs: %i", indent_depth, "", this->text_runs_.size());
for (TextRun *run : this->text_runs_) { for (TextRun *run : this->text_runs_) {
std::string text = run->text_.value(); std::string text = run->text_.value();
@ -70,7 +70,6 @@ CalculatedLayout TextRunPanel::determine_layout(display::Display *display, displ
for (TextRun *run : this->text_runs_) { for (TextRun *run : this->text_runs_) {
int x1; int x1;
int y1;
int width; int width;
int height; int height;
int baseline; int baseline;

6
esphome/components/graphical_layout/text_run_panel.h
View file

@ -7,12 +7,6 @@
#include "esphome/core/automation.h" #include "esphome/core/automation.h"
namespace esphome { namespace esphome {
namespace display {
extern const Color COLOR_ON;
extern const Color COLOR_OFF;
} // namespace display
namespace graphical_layout { namespace graphical_layout {
class TextRunPanel; class TextRunPanel;

2
esphome/components/graphical_layout/vertical_stack.cpp
View file

@ -11,7 +11,7 @@ static const char *const TAG = "verticalstack";
void VerticalStack::dump_config(int indent_depth, int additional_level_depth) { void VerticalStack::dump_config(int indent_depth, int additional_level_depth) {
ESP_LOGCONFIG(TAG, "%*sItem Padding: %i", indent_depth, "", this->item_padding_); ESP_LOGCONFIG(TAG, "%*sItem Padding: %i", indent_depth, "", this->item_padding_);
ESP_LOGCONFIG(TAG, "%*sChild alignment: %s", indent_depth, "", horizontal_child_align_to_string(this->child_align_)); ESP_LOGCONFIG(TAG, "%*sChild alignment: %s", indent_depth, "", LOG_STR_ARG(horizontal_child_align_to_string(this->child_align_)));
ESP_LOGCONFIG(TAG, "%*sChildren: %i", indent_depth, "", this->children_.size()); ESP_LOGCONFIG(TAG, "%*sChildren: %i", indent_depth, "", this->children_.size());
for (LayoutItem *child : this->children_) { for (LayoutItem *child : this->children_) {