UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Remove Container * parameter from all App constructors

Browse Source
This commit is contained in:
Ruben Dashyan
2019-05-16 14:54:16 +02:00
committed by EmilieNumworks
parent 2c98a6ea0d
commit 1f06819974
35 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/calculation/app.cpp
View File

@@ -23,7 +23,7 @@ const Image * App::Descriptor::icon() {
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
void App::Snapshot::reset() {
@@ -39,8 +39,8 @@ void App::Snapshot::tidy() {
m_calculationStore.tidy();
}
App::App(Container * container, Snapshot * snapshot) :
ExpressionFieldDelegateApp(container, snapshot, &m_editExpressionController),
App::App(Snapshot * snapshot) :
ExpressionFieldDelegateApp(snapshot, &m_editExpressionController),
m_historyController(&m_editExpressionController, snapshot->calculationStore()),
m_editExpressionController(&m_modalViewController, this, &m_historyController, snapshot->calculationStore())
{

2
apps/calculation/app.h
View File

@@ -34,7 +34,7 @@ public:
bool storeExpressionAllowed() const override { return true; }
char XNT() override;
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
HistoryController m_historyController;
EditExpressionController m_editExpressionController;
};

6
apps/code/app.cpp
View File

@@ -28,7 +28,7 @@ App::Snapshot::Snapshot() :
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -72,8 +72,8 @@ void App::Snapshot::setOpt(const char * name, char * value) {
}
#endif
App::App(Container * container, Snapshot * snapshot) :
Shared::InputEventHandlerDelegateApp(container, snapshot, &m_codeStackViewController),
App::App(Snapshot * snapshot) :
Shared::InputEventHandlerDelegateApp(snapshot, &m_codeStackViewController),
m_pythonHeap{},
m_pythonUser(nullptr),
m_consoleController(nullptr, this, snapshot->scriptStore()

2
apps/code/app.h
View File

@@ -75,7 +75,7 @@ private:
char m_pythonHeap[k_pythonHeapSize];
const void * m_pythonUser;
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
ConsoleController m_consoleController;
ButtonRowController m_listFooter;
MenuController m_menuController;

6
apps/graph/app.cpp
View File

@@ -28,7 +28,7 @@ App::Snapshot::Snapshot() :
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -49,8 +49,8 @@ void App::Snapshot::tidy() {
m_graphRange.setDelegate(nullptr);
}
App::App(Container * container, Snapshot * snapshot) :
FunctionApp(container, snapshot, &m_inputViewController),
App::App(Snapshot * snapshot) :
FunctionApp(snapshot, &m_inputViewController),
m_listController(&m_listFooter, &m_listHeader, &m_listFooter),
m_listFooter(&m_listHeader, &m_listController, &m_listController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGrey),
m_listHeader(&m_listStackViewController, &m_listFooter, &m_listController),

2
apps/graph/app.h
View File

@@ -35,7 +35,7 @@ public:
NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override;
CartesianFunctionStore * functionStore() override { return static_cast<CartesianFunctionStore *>(Shared::FunctionApp::functionStore()); }
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
ListController m_listController;
ButtonRowController m_listFooter;
ButtonRowController m_listHeader;

6
apps/hardware_test/app.cpp
View File

@@ -8,7 +8,7 @@ extern "C" {
namespace HardwareTest {
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -16,8 +16,8 @@ App::Descriptor * App::Snapshot::descriptor() {
return &descriptor;
}
App::App(Container * container, Snapshot * snapshot) :
::App(container, snapshot, &m_wizardViewController),
App::App(Snapshot * snapshot) :
::App(snapshot, &m_wizardViewController),
m_wizardViewController(&m_modalViewController)
{
}

2
apps/hardware_test/app.h
View File

@@ -34,7 +34,7 @@ private:
SerialNumberController m_serialNumberController;
};
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
WizardViewController m_wizardViewController;
};

6
apps/home/app.cpp
View File

@@ -16,7 +16,7 @@ I18n::Message App::Descriptor::upperName() {
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -24,8 +24,8 @@ App::Descriptor * App::Snapshot::descriptor() {
return &descriptor;
}
App::App(Container * container, Snapshot * snapshot) :
::App(container, snapshot, &m_controller, I18n::Message::Warning),
App::App(Snapshot * snapshot) :
::App(snapshot, &m_controller, I18n::Message::Warning),
m_controller(&m_modalViewController, snapshot)
{
}

2
apps/home/app.h
View File

@@ -21,7 +21,7 @@ public:
Descriptor * descriptor() override;
};
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
Controller m_controller;
};

6
apps/on_boarding/app.cpp
View File

@@ -4,7 +4,7 @@
namespace OnBoarding {
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -12,8 +12,8 @@ App::Descriptor * App::Snapshot::descriptor() {
return &descriptor;
}
App::App(Container * container, Snapshot * snapshot) :
::App(container, snapshot, &m_languageController),
App::App(Snapshot * snapshot) :
::App(snapshot, &m_languageController),
m_languageController(&m_modalViewController, &m_logoController),
m_logoController()
{

2
apps/on_boarding/app.h
View File

@@ -19,7 +19,7 @@ public:
bool processEvent(Ion::Events::Event) override;
void didBecomeActive(Window * window) override;
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
LanguageController m_languageController;
LogoController m_logoController;
};

6
apps/probability/app.cpp
View File

@@ -35,7 +35,7 @@ App::Snapshot::~Snapshot() {
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -67,8 +67,8 @@ App::Snapshot::Page App::Snapshot::activePage() {
return m_activePage;
}
App::App(Container * container, Snapshot * snapshot) :
TextFieldDelegateApp(container, snapshot, &m_stackViewController),
App::App(Snapshot * snapshot) :
TextFieldDelegateApp(snapshot, &m_stackViewController),
m_calculationController(&m_stackViewController, this, snapshot->law(), snapshot->calculation()),
m_parametersController(&m_stackViewController, this, snapshot->law(), &m_calculationController),
m_lawController(&m_stackViewController, snapshot->law(), &m_parametersController),

2
apps/probability/app.h
View File

@@ -55,7 +55,7 @@ public:
Page m_activePage;
};
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
CalculationController m_calculationController;
ParametersController m_parametersController;
LawController m_lawController;

6
apps/regression/app.cpp
View File

@@ -29,7 +29,7 @@ App::Snapshot::Snapshot() :
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
void App::Snapshot::reset() {
@@ -50,8 +50,8 @@ void App::Snapshot::tidy() {
m_store.tidy();
}
App::App(Container * container, Snapshot * snapshot) :
TextFieldDelegateApp(container, snapshot, &m_tabViewController),
App::App(Snapshot * snapshot) :
TextFieldDelegateApp(snapshot, &m_tabViewController),
m_calculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, snapshot->store()),
m_calculationAlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController),
m_calculationHeader(&m_tabViewController, &m_calculationAlternateEmptyViewController, &m_calculationController),

2
apps/regression/app.h
View File

@@ -42,7 +42,7 @@ public:
};
RegressionController * regressionController() { return &m_regressionController; }
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
CalculationController m_calculationController;
AlternateEmptyViewController m_calculationAlternateEmptyViewController;
ButtonRowController m_calculationHeader;

8
apps/sequence/app.cpp
View File

@@ -26,7 +26,7 @@ App::Snapshot::Snapshot() :
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
void App::Snapshot::reset() {
@@ -53,9 +53,9 @@ void App::Snapshot::tidy() {
m_graphRange.setDelegate(nullptr);
}
App::App(Container * container, Snapshot * snapshot) :
FunctionApp(container, snapshot, &m_inputViewController),
m_sequenceContext(((AppsContainer *)container)->globalContext(), snapshot->functionStore()),
App::App(Snapshot * snapshot) :
FunctionApp(snapshot, &m_inputViewController),
m_sequenceContext(AppsContainer::sharedAppsContainer()->globalContext(), snapshot->functionStore()),
m_listController(&m_listFooter, this, &m_listHeader, &m_listFooter),
m_listFooter(&m_listHeader, &m_listController, &m_listController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGrey),
m_listHeader(nullptr, &m_listFooter, &m_listController),

2
apps/sequence/app.h
View File

@@ -40,7 +40,7 @@ public:
SequenceContext * localContext() override;
SequenceStore * functionStore() override { return static_cast<SequenceStore *>(Shared::FunctionApp::functionStore()); }
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
SequenceContext m_sequenceContext;
ListController m_listController;
ButtonRowController m_listFooter;

6
apps/settings/app.cpp
View File

@@ -17,7 +17,7 @@ const Image * App::Descriptor::icon() {
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -25,8 +25,8 @@ App::Descriptor * App::Snapshot::descriptor() {
return &descriptor;
}
App::App(Container * container, Snapshot * snapshot) :
Shared::TextFieldDelegateApp(container, snapshot, &m_stackViewController),
App::App(Snapshot * snapshot) :
Shared::TextFieldDelegateApp(snapshot, &m_stackViewController),
m_mainController(&m_stackViewController, this),
m_stackViewController(&m_modalViewController, &m_mainController)
{

2
apps/settings/app.h
View File

@@ -20,7 +20,7 @@ public:
Descriptor * descriptor() override;
};
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
MainController m_mainController;
StackViewController m_stackViewController;
};

4
apps/shared/expression_field_delegate_app.cpp
View File

@@ -7,8 +7,8 @@ using namespace Poincare;
namespace Shared {
ExpressionFieldDelegateApp::ExpressionFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController) :
TextFieldDelegateApp(container, snapshot, rootViewController),
ExpressionFieldDelegateApp::ExpressionFieldDelegateApp(Snapshot * snapshot, ViewController * rootViewController) :
TextFieldDelegateApp(snapshot, rootViewController),
LayoutFieldDelegate()
{
}

2
apps/shared/expression_field_delegate_app.h
View File

@@ -12,7 +12,7 @@ public:
bool layoutFieldShouldFinishEditing(LayoutField * layoutField, Ion::Events::Event event) override;
virtual bool layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::Events::Event event) override;
protected:
ExpressionFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController);
ExpressionFieldDelegateApp(Snapshot * snapshot, ViewController * rootViewController);
};
}

4
apps/shared/function_app.h
View File

@@ -39,8 +39,8 @@ public:
void willBecomeInactive() override;
protected:
FunctionApp(Container * container, Snapshot * snapshot, ViewController * rootViewController) :
ExpressionFieldDelegateApp(container, snapshot, rootViewController)
FunctionApp(Snapshot * snapshot, ViewController * rootViewController) :
ExpressionFieldDelegateApp(snapshot, rootViewController)
{}
// TextFieldDelegateApp
bool isAcceptableExpression(const Poincare::Expression expression) override;

4
apps/shared/input_event_handler_delegate_app.cpp
View File

@@ -7,8 +7,8 @@ using namespace Poincare;
namespace Shared {
InputEventHandlerDelegateApp::InputEventHandlerDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController) :
::App(container, snapshot, rootViewController, I18n::Message::Warning),
InputEventHandlerDelegateApp::InputEventHandlerDelegateApp(Snapshot * snapshot, ViewController * rootViewController) :
::App(snapshot, rootViewController, I18n::Message::Warning),
InputEventHandlerDelegate()
{
}

2
apps/shared/input_event_handler_delegate_app.h
View File

@@ -13,7 +13,7 @@ public:
Toolbox * toolboxForInputEventHandler(InputEventHandler * textInput) override;
NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override;
protected:
InputEventHandlerDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController);
InputEventHandlerDelegateApp(Snapshot * snapshot, ViewController * rootViewController);
};
}

4
apps/shared/text_field_delegate_app.cpp
View File

@@ -52,8 +52,8 @@ bool TextFieldDelegateApp::hasUndefinedValue(const char * text, double & value)
/* Protected */
TextFieldDelegateApp::TextFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController) :
InputEventHandlerDelegateApp(container, snapshot, rootViewController),
TextFieldDelegateApp::TextFieldDelegateApp(Snapshot * snapshot, ViewController * rootViewController) :
InputEventHandlerDelegateApp(snapshot, rootViewController),
TextFieldDelegate()
{
}

2
apps/shared/text_field_delegate_app.h
View File

@@ -20,7 +20,7 @@ public:
bool isAcceptableText(const char * text);
bool hasUndefinedValue(const char * text, double & value);
protected:
TextFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController);
TextFieldDelegateApp(Snapshot * snapshot, ViewController * rootViewController);
bool fieldDidReceiveEvent(EditableField * field, Responder * responder, Ion::Events::Event event);
bool isFinishingEvent(Ion::Events::Event event);
virtual bool isAcceptableExpression(const Poincare::Expression expression);

6
apps/solver/app.cpp
View File

@@ -24,7 +24,7 @@ App::Snapshot::Snapshot() :
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -42,8 +42,8 @@ void App::Snapshot::tidy() {
m_equationStore.tidy();
}
App::App(Container * container, Snapshot * snapshot) :
ExpressionFieldDelegateApp(container, snapshot, &m_inputViewController),
App::App(Snapshot * snapshot) :
ExpressionFieldDelegateApp(snapshot, &m_inputViewController),
m_solutionsController(&m_alternateEmptyViewController, snapshot->equationStore()),
m_intervalController(nullptr, this, snapshot->equationStore()),
m_alternateEmptyViewController(nullptr, &m_solutionsController, &m_solutionsController),

2
apps/solver/app.h
View File

@@ -35,7 +35,7 @@ public:
void willBecomeInactive() override;
char XNT() override;
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
SolutionsController m_solutionsController;
IntervalController m_intervalController;
AlternateEmptyViewController m_alternateEmptyViewController;

6
apps/statistics/app.cpp
View File

@@ -31,7 +31,7 @@ App::Snapshot::Snapshot() :
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
void App::Snapshot::reset() {
@@ -49,8 +49,8 @@ App::Descriptor * App::Snapshot::descriptor() {
return &descriptor;
}
App::App(Container * container, Snapshot * snapshot) :
TextFieldDelegateApp(container, snapshot, &m_tabViewController),
App::App(Snapshot * snapshot) :
TextFieldDelegateApp(snapshot, &m_tabViewController),
m_calculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, snapshot->store()),
m_calculationAlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController),
m_calculationHeader(&m_tabViewController, &m_calculationAlternateEmptyViewController, &m_calculationController),

2
apps/statistics/app.h
View File

@@ -44,7 +44,7 @@ public:
BoxView::Quantile m_selectedBoxQuantile;
};
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
CalculationController m_calculationController;
AlternateEmptyViewController m_calculationAlternateEmptyViewController;
ButtonRowController m_calculationHeader;

6
apps/usb/app.cpp
View File

@@ -13,7 +13,7 @@ I18n::Message App::Descriptor::upperName() {
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(container, this);
return new (container->currentAppBuffer()) App(this);
}
App::Descriptor * App::Snapshot::descriptor() {
@@ -21,8 +21,8 @@ App::Descriptor * App::Snapshot::descriptor() {
return &descriptor;
}
App::App(Container * container, Snapshot * snapshot) :
::App(container, snapshot, &m_usbConnectedController)
App::App(Snapshot * snapshot) :
::App(snapshot, &m_usbConnectedController)
{
}

2
apps/usb/app.h
View File

@@ -20,7 +20,7 @@ public:
};
bool processEvent(Ion::Events::Event) override;
private:
App(Container * container, Snapshot * snapshot);
App(Snapshot * snapshot);
USBConnectedController m_usbConnectedController;
};

2
escher/include/escher/app.h
View File

@@ -65,7 +65,7 @@ public:
virtual int numberOfTimers();
virtual Timer * timerAtIndex(int i);
protected:
App(Container * container, Snapshot * snapshot, ViewController * rootViewController, I18n::Message warningMessage = (I18n::Message)0);
App(Snapshot * snapshot, ViewController * rootViewController, I18n::Message warningMessage = (I18n::Message)0);
ModalViewController m_modalViewController;
private:
Responder * m_firstResponder;

2
escher/src/app.cpp
View File

@@ -29,7 +29,7 @@ void App::Snapshot::reset() {
void App::Snapshot::tidy() {
}
App::App(Container * container, Snapshot * snapshot, ViewController * rootViewController, I18n::Message warningMessage) :
App::App(Snapshot * snapshot, ViewController * rootViewController, I18n::Message warningMessage) :
Responder(nullptr),
m_magic(Magic),
m_modalViewController(this, rootViewController),