[Fix] Conflicts

This commit is contained in:
Quentin
2020-04-16 14:04:56 +02:00
335 changed files with 2110 additions and 1685 deletions

View File

@@ -17,12 +17,12 @@ public:
void viewWillAppear() override;
void viewDidDisappear() override;
virtual int numberOfRows() const override;
virtual int numberOfColumns() const override;
virtual KDCoordinate cellHeight() override;
virtual KDCoordinate cellWidth() override;
virtual HighlightCell * reusableCell(int index) override;
virtual int reusableCellCount() const override;
int numberOfRows() const override;
int numberOfColumns() const override;
KDCoordinate cellHeight() override;
KDCoordinate cellWidth() override;
HighlightCell * reusableCell(int index) override;
int reusableCellCount() const override;
void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
void tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY, bool withinTemporarySelection) override;
private: