Assure -> Ensure

oleg68 · Jan 20, 2024 · e8acb37 · e8acb37
1 parent f90cc43
commit e8acb37
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/grandorgue/combinations/model/GOCombination.cpp b/src/grandorgue/combinations/model/GOCombination.cpp
@@ -40,7 +40,7 @@ GOCombination::GOCombination(
 GOCombination::~GOCombination() {}
 
 void GOCombination::Clear() {
-  AssureElementStatesAllocated();
+  EnsureElementStatesAllocated();
   for (unsigned i = 0; i < m_ElementStates.size(); i++)
     m_ElementStates[i] = -1;
   m_IsFull = false;
@@ -50,7 +50,7 @@ void GOCombination::Clear() {
 void GOCombination::Copy(GOCombination *combination) {
   assert(&m_Template == &combination->m_Template);
   m_ElementStates = combination->m_ElementStates;
-  AssureElementStatesAllocated();
+  EnsureElementStatesAllocated();
 }
 
 bool GOCombination::IsEmpty() const {
@@ -232,7 +232,7 @@ void GOCombination::GetEnabledElements(
   }
 }
 
-void GOCombination::AssureElementStatesAllocated() {
+void GOCombination::EnsureElementStatesAllocated() {
   unsigned defSize = r_ElementDefinitions.size();
 
   if (m_ElementStates.size() > defSize)
@@ -385,7 +385,7 @@ bool GOCombination::FillWithCurrent(
   GOSetterState::SetterType setterType, bool isToStoreInvisibleObjects) {
   bool used = false;
 
-  AssureElementStatesAllocated();
+  EnsureElementStatesAllocated();
   m_IsFull = isToStoreInvisibleObjects;
   switch (setterType) {
   case GOSetterState::SETTER_REGULAR:
@@ -442,7 +442,7 @@ bool GOCombination::Push(
         setterState.m_SetterType, setterState.m_IsStoreInvisible);
     }
   } else {
-    AssureElementStatesAllocated();
+    EnsureElementStatesAllocated();
     for (unsigned i = 0; i < r_ElementDefinitions.size(); i++) {
       if (
         m_ElementStates[i] != -1

diff --git a/src/grandorgue/combinations/model/GOCombination.h b/src/grandorgue/combinations/model/GOCombination.h
@@ -58,7 +58,7 @@ class GOCombination : public GOSaveableObject, public GOSaveableToYaml {
   const std::vector<GOCombinationDefinition::Element> &r_ElementDefinitions;
   bool m_Protected;
 
-  void AssureElementStatesAllocated();
+  void EnsureElementStatesAllocated();
 
   // Read the NumberOfStops key from the given config source
   unsigned ReadNumberOfStops(

diff --git a/src/grandorgue/combinations/model/GODivisionalCombination.cpp b/src/grandorgue/combinations/model/GODivisionalCombination.cpp
@@ -130,7 +130,7 @@ void GODivisionalCombination::SaveInt(GOConfigWriter &cfg) {
   unsigned tremulant_count = 0;
   unsigned switch_count = 0;
 
-  AssureElementStatesAllocated();
+  EnsureElementStatesAllocated();
   for (unsigned i = 0; i < r_ElementDefinitions.size(); i++) {
     const GOCombinationDefinition::Element &e = r_ElementDefinitions[i];
     int state = GetElementState(i);

diff --git a/src/grandorgue/combinations/model/GOGeneralCombination.cpp b/src/grandorgue/combinations/model/GOGeneralCombination.cpp
@@ -166,7 +166,7 @@ void GOGeneralCombination::LoadCombinationInt(
 }
 
 void GOGeneralCombination::SaveInt(GOConfigWriter &cfg) {
-  AssureElementStatesAllocated();
+  EnsureElementStatesAllocated();
 
   wxString buffer;
   unsigned stop_count = 0;