[apps] Rename FloatPairStore methods

apps/shared/float_pair_store.cpp

@@ -19,7 +19,7 @@ void FloatPairStore::set(double f, int series, int i, int j) {
   }
 }
 
-int FloatPairStore::numberOfPairsOfAllSeries() const {
+int FloatPairStore::numberOfPairs() const {
   int result = 0;
   for (int i = 0; i < k_numberOfSeries; i++) {
     result += m_numberOfPairs[i];
@@ -27,7 +27,7 @@ int FloatPairStore::numberOfPairsOfAllSeries() const {
   return result;
 }
 
-void FloatPairStore::deletePairAtIndex(int series, int j) {
+void FloatPairStore::deletePairOfSeriesAtIndex(int series, int j) {
   m_numberOfPairs[series]--;
   for (int k = j; k < m_numberOfPairs[series]; k++) {
     m_data[series][0][k] = m_data[series][0][k+1];
@@ -39,7 +39,7 @@ void FloatPairStore::deletePairAtIndex(int series, int j) {
   m_data[series][1][m_numberOfPairs[series]] = 0;
 }
 
-void FloatPairStore::deleteAllPairs(int series) {
+void FloatPairStore::deleteAllPairsOfSeries(int series) {
   assert(series >= 0 && series < k_numberOfSeries);
   /* We reset all values to 0 to ensure the correctness of the checksum.*/
   for (int k = 0; k < m_numberOfPairs[series]; k++) {
@@ -49,9 +49,9 @@ void FloatPairStore::deleteAllPairs(int series) {
   m_numberOfPairs[series] = 0;
 }
 
-void FloatPairStore::deleteAllPairsOfAllSeries() {
+void FloatPairStore::deleteAllPairs() {
   for (int i = 0; i < k_numberOfSeries; i ++) {
-    deleteAllPairs(i);
+    deleteAllPairsOfSeries(i);
   }
 }
 

apps/shared/float_pair_store.h

@@ -21,14 +21,14 @@ public:
     return m_data[series][i][j];
   }
   void set(double f, int series, int i, int j);
-  int numberOfPairsOfAllSeries() const;
-  int numberOfPairs(int series) const {
+  int numberOfPairs() const;
+  int numberOfPairsOfSeries(int series) const {
     assert(series >= 0 && series < k_numberOfSeries);
     return m_numberOfPairs[series];
   }
-  void deletePairAtIndex(int series, int j);
-  void deleteAllPairs(int series);
-  void deleteAllPairsOfAllSeries();
+  void deletePairOfSeriesAtIndex(int series, int j);
+  void deleteAllPairsOfSeries(int series);
+  void deleteAllPairs();
   void resetColumn(int series, int i);
   double sumOfColumn(int series, int i) const;
   uint32_t storeChecksum();

apps/shared/store_controller.cpp

@@ -61,7 +61,7 @@ int StoreController::typeAtLocation(int i, int j) {
 
 void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {
   // Handle empty cells
-  if (j > m_store->numberOfPairs(seriesAtColumn(i)) && j < numberOfRows() - 1) {
+  if (j > m_store->numberOfPairsOfSeries(seriesAtColumn(i)) && j < numberOfRows() - 1) {
     ((EvenOddCell *)cell)->setEven(j%2 == 0);
     assert(cellAtLocationIsEditable(i, j));
     ((EvenOddEditableTextCell *)cell)->editableTextCell()->textField()->setText("");
@@ -97,7 +97,7 @@ bool StoreController::handleEvent(Ion::Events::Event event) {
     if (selectedRow() == 0 || selectedRow() == numberOfRows()-1) {
       return false;
     }
-    m_store->deletePairAtIndex(series, selectedRow()-1);
+    m_store->deletePairOfSeriesAtIndex(series, selectedRow()-1);
     selectableTableView()->reloadData();
     return true;
   }
@@ -125,7 +125,7 @@ double StoreController::dataAtLocation(int columnIndex, int rowIndex) {
 }
 
 int StoreController::numberOfElements() {
-  return m_store->numberOfPairsOfAllSeries();
+  return m_store->numberOfPairs();
 }
 
 int StoreController::maxNumberOfElements() const {

apps/shared/store_parameter_controller.cpp

@@ -32,7 +32,7 @@ bool StoreParameterController::handleEvent(Ion::Events::Event event) {
       case 0:
       {
         if (m_xColumnSelected) {
-          m_store->deleteAllPairs(m_series);
+          m_store->deleteAllPairsOfSeries(m_series);
         } else {
           m_store->resetColumn(m_series, !m_xColumnSelected);
         }

apps/statistics/app.cpp

@@ -33,7 +33,7 @@ App * App::Snapshot::unpack(Container * container) {
 }
 
 void App::Snapshot::reset() {
-  m_store.deleteAllPairsOfAllSeries();
+  m_store.deleteAllPairs();
   m_storeVersion = 0;
   m_barVersion = 0;
   m_rangeVersion = 0;