diff --git a/apps/graph/function.cpp b/apps/graph/function.cpp index 5c99cb4b4..2e21710b9 100644 --- a/apps/graph/function.cpp +++ b/apps/graph/function.cpp @@ -9,8 +9,8 @@ Graph::Function::Function() : Graph::Function::Function(const char * text, KDColor color) : m_text(text), // FIXME: Copy !! - m_color(color), m_name("f(x)"), + m_color(color), m_expression(nullptr), m_layout(nullptr), m_active(true) diff --git a/apps/graph/list/function_name_view.cpp b/apps/graph/list/function_name_view.cpp index e0b9b7ff8..162aede0a 100644 --- a/apps/graph/list/function_name_view.cpp +++ b/apps/graph/list/function_name_view.cpp @@ -5,8 +5,8 @@ FunctionNameView::FunctionNameView(Responder * parentResponder, Invocation invocation) : ChildlessView(), Responder(parentResponder), - m_invocation(invocation), - m_focused(false) + m_focused(false), + m_invocation(invocation) { } diff --git a/apps/graph/list/parameter_controller.cpp b/apps/graph/list/parameter_controller.cpp index 46fbc2735..75065b3cd 100644 --- a/apps/graph/list/parameter_controller.cpp +++ b/apps/graph/list/parameter_controller.cpp @@ -3,9 +3,9 @@ ParameterController::ParameterController(Responder * parentResponder) : ViewController(parentResponder), - m_colorCell(TableViewCell("Couleur de la fonction")), - m_enableCell(SwitchTableViewCell("Activer/Desactiver")), - m_deleteCell(TableViewCell("Supprimer la fonction")), + m_colorCell(TableViewCell((char*)"Couleur de la fonction")), + m_enableCell(SwitchTableViewCell((char*)"Activer/Desactiver")), + m_deleteCell(TableViewCell((char*)"Supprimer la fonction")), m_tableView(TableView(this)), m_activeCell(0) { diff --git a/apps/graph/list/parameter_controller.h b/apps/graph/list/parameter_controller.h index 1e6223119..a77122b6b 100644 --- a/apps/graph/list/parameter_controller.h +++ b/apps/graph/list/parameter_controller.h @@ -29,7 +29,6 @@ private: TableView m_tableView; int m_activeCell; Graph::Function * m_function; - Graph::FunctionStore * m_functionStore; }; #endif diff --git a/escher/src/stack_view_controller.cpp b/escher/src/stack_view_controller.cpp index 4e2629a4a..e64012b74 100644 --- a/escher/src/stack_view_controller.cpp +++ b/escher/src/stack_view_controller.cpp @@ -64,9 +64,9 @@ const char * StackViewController::ControllerView::className() const { StackViewController::StackViewController(Responder * parentResponder, ViewController * rootViewController, bool displayFirstStackHeader) : ViewController(parentResponder), + m_view(ControllerView(displayFirstStackHeader)), m_numberOfChildren(0), - m_rootViewController(rootViewController), - m_view(ControllerView(displayFirstStackHeader)) + m_rootViewController(rootViewController) { // push(rootViewController); }