fixed compiler warnings (clang)
This commit is contained in:
+1
-1
@@ -88,7 +88,7 @@ class Button : public FormField {
|
||||
}
|
||||
|
||||
#if defined(HARDWARE_KEYS)
|
||||
void onEvent(event_t event);
|
||||
void onEvent(event_t event) override;
|
||||
#endif
|
||||
|
||||
#if defined(HARDWARE_TOUCH)
|
||||
|
||||
+7
-6
@@ -39,7 +39,7 @@ void MainWindow::emptyTrash()
|
||||
trash.clear();
|
||||
}
|
||||
|
||||
void MainWindow::checkEvents(bool trash)
|
||||
void MainWindow::checkEvents()
|
||||
{
|
||||
#if defined(HARDWARE_TOUCH)
|
||||
if (touchState.event == TE_DOWN) {
|
||||
@@ -60,10 +60,6 @@ void MainWindow::checkEvents(bool trash)
|
||||
#endif
|
||||
|
||||
Window::checkEvents();
|
||||
|
||||
if (trash) {
|
||||
emptyTrash();
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::invalidate(const rect_t & rect)
|
||||
@@ -106,7 +102,12 @@ bool MainWindow::refresh()
|
||||
|
||||
void MainWindow::run(bool trash)
|
||||
{
|
||||
checkEvents(trash);
|
||||
checkEvents();
|
||||
|
||||
if (trash) {
|
||||
emptyTrash();
|
||||
}
|
||||
|
||||
if (refresh()) {
|
||||
lcdRefresh();
|
||||
}
|
||||
|
||||
+2
-2
@@ -39,7 +39,7 @@ class MainWindow: public Window {
|
||||
}
|
||||
#endif
|
||||
|
||||
void checkEvents(bool trash = true);
|
||||
void checkEvents() override;
|
||||
|
||||
void invalidate()
|
||||
{
|
||||
@@ -60,4 +60,4 @@ class MainWindow: public Window {
|
||||
|
||||
extern MainWindow mainWindow;
|
||||
|
||||
#endif // _MAINWINDOW_H_
|
||||
#endif // _MAINWINDOW_H_
|
||||
|
||||
Reference in New Issue
Block a user