[inference] Remove using namespace in .h

numworks · Dec 19, 2023 · 0743474 · 0743474
1 parent c0d119b
commit 0743474
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/apps/inference/statistic/chi_square_and_slope/categorical_controller.h b/apps/inference/statistic/chi_square_and_slope/categorical_controller.h
@@ -39,7 +39,7 @@ class CategoricalController
 
   // SelectableListViewDelegate
   void listViewDidChangeSelectionAndDidScroll(
-      SelectableListView* l, int previousRow, KDPoint previousOffset,
+      Escher::SelectableListView* l, int previousRow, KDPoint previousOffset,
       bool withinTemporarySelection = false) override;
 
   // ListViewDataSource

diff --git a/apps/inference/statistic/chi_square_and_slope/input_categorical_cell.cpp b/apps/inference/statistic/chi_square_and_slope/input_categorical_cell.cpp
@@ -1,5 +1,7 @@
 #include "input_categorical_cell.h"
 
+using namespace Escher;
+
 namespace Inference {
 
 InputCategoricalCell::InputCategoricalCell(Responder* parentResponder,

diff --git a/apps/inference/statistic/chi_square_and_slope/input_categorical_cell.h b/apps/inference/statistic/chi_square_and_slope/input_categorical_cell.h
@@ -4,28 +4,26 @@
 #include <apps/i18n.h>
 #include <escher/menu_cell_with_editable_text.h>
 
-using namespace Escher;
-
 namespace Inference {
 
 // Cell with left and right margins for InputCategoricalController
 
-class InputCategoricalCell : public HighlightCell {
+class InputCategoricalCell : public Escher::HighlightCell {
  public:
-  InputCategoricalCell(Responder* parentResponder = nullptr,
-                       TextFieldDelegate* textFieldDelegate = nullptr);
+  InputCategoricalCell(Escher::Responder* parentResponder = nullptr,
+                       Escher::TextFieldDelegate* textFieldDelegate = nullptr);
 
   // View
   KDSize minimalSizeForOptimalDisplay() const override;
   void drawRect(KDContext* ctx, KDRect rect) const override;
 
   // HighlightCell
   void setHighlighted(bool highlight) override;
-  Responder* responder() override { return m_innerCell.responder(); }
+  Escher::Responder* responder() override { return m_innerCell.responder(); }
   const char* text() const override { return m_innerCell.text(); }
   Poincare::Layout layout() const override { return m_innerCell.layout(); }
 
-  TextField* textField() { return m_innerCell.textField(); }
+  Escher::TextField* textField() { return m_innerCell.textField(); }
   void setMessages(I18n::Message labelMessage,
                    I18n::Message subLabelMessage = I18n::Message::Default);
 

diff --git a/apps/inference/statistic/chi_square_and_slope/results_goodness_controller.cpp b/apps/inference/statistic/chi_square_and_slope/results_goodness_controller.cpp
@@ -27,7 +27,7 @@ ResultsGoodnessTabController::ContributionsController::ContributionsController(
     Escher::Responder* parentResponder, Escher::ViewController* nextController,
     GoodnessTest* statistic)
     : CategoricalController(parentResponder, nextController,
-                            Invocation::Builder<CategoricalController>(
+                            Escher::Invocation::Builder<CategoricalController>(
                                 &CategoricalController::ButtonAction, this)),
       m_table(&m_selectableListView, this, statistic) {}
 

diff --git a/apps/inference/statistic/chi_square_and_slope/results_goodness_table_cell.cpp b/apps/inference/statistic/chi_square_and_slope/results_goodness_table_cell.cpp
@@ -21,9 +21,10 @@ void ResultGoodnessContributionsTable::drawRect(KDContext *ctx,
                                                 KDRect rect) const {
   CategoricalTableCell::drawRect(ctx, rect);
   // Draw over the next cell border to hide it
-  ctx->fillRect(KDRect(0, bounds().height() - Metric::CellSeparatorThickness,
-                       bounds().width(), Metric::CellSeparatorThickness),
-                m_selectableTableView.backgroundColor());
+  ctx->fillRect(
+      KDRect(0, bounds().height() - Escher::Metric::CellSeparatorThickness,
+             bounds().width(), Escher::Metric::CellSeparatorThickness),
+      m_selectableTableView.backgroundColor());
 }
 
 void ResultGoodnessContributionsTable::fillCellForLocation(