UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-20 14:20:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] InputTextDelegate and LayoutFieldDelegate don't inherit from

Browse Source 
InputTextDelegate to avoid diamond inheritance
This commit is contained in:
Émilie Feral
2018-10-22 18:14:30 +02:00
parent 0a438b1803
commit 698332c355
138 changed files with 285 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sequence/values/values_controller.cpp
View File

@@ -6,15 +6,15 @@ using namespace Shared;
namespace Sequence {
ValuesController::ValuesController(Responder * parentResponder, SequenceStore * sequenceStore, Interval * interval, ButtonRowController * header) :
Shared::ValuesController(parentResponder, header, I18n::Message::NColumn, &m_intervalParameterController, interval),
ValuesController::ValuesController(Responder * parentResponder,InputEventHandlerDelegate * inputEventHandlerDelegate, SequenceStore * sequenceStore, Interval * interval, ButtonRowController * header) :
Shared::ValuesController(parentResponder, inputEventHandlerDelegate, header, I18n::Message::NColumn, &m_intervalParameterController, interval),
m_sequenceTitleCells{},
m_floatCells{},
m_sequenceStore(sequenceStore),
#if COPY_COLUMN
m_sequenceParameterController('n'),
#endif
m_intervalParameterController(this, m_interval)
m_intervalParameterController(this, inputEventHandlerDelegate, m_interval)
{
for (int i = 0; i < k_maxNumberOfSequences; i++) {
m_sequenceTitleCells[i].setOrientation(FunctionTitleCell::Orientation::HorizontalIndicator);