Fix presubmit build errors
This change combines the following existing fixes:
- fix ArrowKeyNavigationMenu member initialization order (change 55425)
- use %zu for printing size_t (change 56510)
- fix comparison of different signedness (change 56509)
Change-Id: I4538a7a7fad028c0eaef4cb77f4a877487b61c7a
Signed-off-by: Sui Chen <suichen6@gmail.com>
diff --git a/views.hpp b/views.hpp
index d4f3779..203795d 100644
--- a/views.hpp
+++ b/views.hpp
@@ -21,6 +21,7 @@
#include "sensorhelper.hpp"
#include <ncurses.h>
+
#include <string>
#include <vector>
constexpr int MARGIN_BOTTOM = 1;
@@ -84,7 +85,7 @@
SummaryView() : DBusTopWindow()
{}
void Render() override;
- void OnResize(int win_w, int win_h) override
+ void OnResize(int win_w, [[maybe_unused]] int win_h) override
{
rect.h = 8;
rect.w = win_w;
@@ -94,7 +95,7 @@
}
void UpdateDBusTopStatistics(DBusTopStatistics* stat);
- void OnKeyDown(const std::string& key) override
+ void OnKeyDown([[maybe_unused]] const std::string& key) override
{}
std::string GetStatusString() override
{
@@ -430,8 +431,8 @@
};
SortOrder sort_order_;
- int disp_row_idx_; // From which row to start displaying? (essentially a
- // vertical scroll bar)
+ int disp_row_idx_; // From which row to start displaying? (essentially a
+ // vertical scroll bar)
int last_choices_[2]; // Last choice index on either side
enum MenuState
{
@@ -451,7 +452,7 @@
menu2_->win_ = win;
UpdateWindowSizeAndPosition();
}
-
+
private:
void SetMenuState(MenuState s)
{
@@ -519,7 +520,7 @@
selectable_ = false; // Cannot be selected by the tab key
}
- void OnKeyDown(const std::string& key) override
+ void OnKeyDown([[maybe_unused]] const std::string& key) override
{}
void OnResize(int win_w, int win_h) override
{
@@ -535,5 +536,4 @@
{
return "";
}
-
};