var names

window.cpp

@@ -88,21 +88,21 @@ void Window::solveButtonClicked()
         if (backtracking)
         {
             hist.back().cell->collapsedCellClicked();
-            std::vector<int> b;
+            std::vector<int> validNrs;
             for (int i = 0; i < 9; i++)
                 if (hist.back().blocked[i] == 0)
-                    b.push_back(i);
-            if (b.size() == 0)
+                    validNrs.push_back(i);
+            if (validNrs.size() == 0)
             {
                 hist.pop_back();
                 continue;
             }
             backtracking = false;
-            int choiceNr = rand() % b.size(); // choose a random number;
+            int rndNr = rand() % validNrs.size(); // choose a random number;
             repaint();                            // draw cells again
             delay(delayTime);
-            hist.back().cell->collapse(b[choiceNr]); // collapse cell with chosen number;
-            hist.back().blocked[b[choiceNr]]++;
+            hist.back().cell->collapse(validNrs[rndNr]); // collapse cell with chosen number;
+            hist.back().blocked[validNrs[rndNr]]++;
         }
         else
         {
@@ -138,16 +138,16 @@ void Window::solveButtonClicked()
                 continue;
             }
 
-            int choiceCell = rand() % b.size(); // choose a random cell
-            std::vector<int> c;
+            int rndCell = rand() % b.size(); // choose a random cell
+            std::vector<int> validNrs;
             for (int i = 0; i < 9; i++)
             {
-                if (b[choiceCell]->blocked[i] == 0)
-                    c.push_back(i);
+                if (b[rndCell]->blocked[i] == 0)
+                    validNrs.push_back(i);
             }
-            int choiceNr = rand() % c.size();                                              // choose a random number;
-            hist.push_back(History(b[choiceCell], b[choiceCell]->blocked, c[choiceNr])); // fix this!!!
-            b[choiceCell]->collapse(c[choiceNr]);                                          // collapse that random cell with chosen number;
+            int rndNr = rand() % validNrs.size(); // choose a random number;
+            hist.push_back(History(b[rndCell], b[rndCell]->blocked, validNrs[rndNr]));
+            b[rndCell]->collapse(validNrs[rndNr]); // collapse that random cell with chosen number;
         }
     }
 }