Rename .h file extension to .hpp, and fix some include orderings

AdventOfCode2024.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/Program.h>
+#include <aoc/Program.hpp>
 
 int main()
 {

include/aoc/CeresSearch.hpp

@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include "LinesSolver.h"
+#include <aoc/LinesSolver.hpp>
 
 class CeresSearch :
     public LinesSolver

include/aoc/GuardGallivant.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "LinesSolver.h"
+#include <aoc/LinesSolver.hpp>
 
 class GuardGallivant :
     public LinesSolver

include/aoc/HistorianHysteria.hpp

@@ -17,7 +17,7 @@
 
 #include <set>
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 class HistorianHysteria
     : public Solver

include/aoc/LinesSolver.hpp

@@ -17,8 +17,8 @@
 
 #include <vector>
 
-#include "Solver.h"
+#include <aoc/Point2.hpp>
-#include "Point2.h"
+#include <aoc/Solver.hpp>
 
 class LinesSolver :
     public Solver

include/aoc/MullCharState.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/StringState.h>
+#include <aoc/StringState.hpp>
 
 class MullCharState
     : public StringState

include/aoc/MullDataState.hpp

@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <aoc/MullData.h>
+#include <aoc/MullData.hpp>
-#include <aoc/StringState.h>
+#include <aoc/StringState.hpp>
 
 class MullDataState
     : public StringState

include/aoc/MullDoOpenState.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 class MullDoOpenState
     : public MullDataState

include/aoc/MullEntryState.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/StringState.h>
+#include <aoc/StringState.hpp>
 
 class MullEntryState
     : public StringState

include/aoc/MullFactorState.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 class MullFactorState
     : public MullDataState

include/aoc/MullItOver.hpp

@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include <aoc/MullData.h>
+#include <aoc/MullData.hpp>
-#include <aoc/MullStates.h>
+#include <aoc/MullStates.hpp>
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 class MullItOver
     : public Solver

include/aoc/MullStates.hpp

@@ -15,11 +15,11 @@
 
 #pragma once
 
-#include <aoc/MullCharState.h>
+#include <aoc/MullCharState.hpp>
-#include <aoc/MullDoOpenState.h>
+#include <aoc/MullDoOpenState.hpp>
-#include <aoc/MullEntryState.h>
+#include <aoc/MullEntryState.hpp>
-#include <aoc/MullFactorState.h>
+#include <aoc/MullFactorState.hpp>
-#include <aoc/MullToggleCloseState.h>
+#include <aoc/MullToggleCloseState.hpp>
 
 class MullStates
 {

include/aoc/MullToggleCloseState.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 class MullToggleCloseState
     : public MullDataState

include/aoc/PrintQueue.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "Solver.h"
+#include <aoc/Solver.hpp>
 
 class PrintQueue :
     public Solver

include/aoc/RedNosedReportData.hpp

@@ -17,7 +17,7 @@
 
 #include<vector>
 
-#include <aoc/Slope.h>
+#include <aoc/Slope.hpp>
 
 class RedNosedReportData
 {

include/aoc/RedNosedReports.hpp

@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include <aoc/Slope.h>
+#include <aoc/RedNosedReportData.hpp>
-#include <aoc/Solver.h>
+#include <aoc/Slope.hpp>
-#include <aoc/RedNosedReportData.h>
+#include <aoc/Solver.hpp>
 
 class RedNosedReports
     : public Solver

include/aoc/SolverEngine.hpp

@@ -20,7 +20,7 @@
 #include <memory>
 #include <vector>
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 class SolverEngine
 {

include/aoc/StringState.hpp

@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include <aoc/StringStateMachine.h>
+#include <aoc/StringStateMachine.hpp>
 
 class StringStateMachine;
 

include/aoc/StringStateMachine.hpp

@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include <aoc/StringState.h>
+#include <aoc/StringState.hpp>
 
 class StringState;
 

src/CeresSearch.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/CeresSearch.h>
+#include <aoc/CeresSearch.hpp>
 
 std::string CeresSearch::getPuzzleName() const
 {

src/GuardGallivant.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/GuardGallivant.h>
+#include <aoc/GuardGallivant.hpp>
 
 std::string GuardGallivant::getPuzzleName() const
 {

src/HistorianHysteria.cpp

@@ -15,7 +15,7 @@
 
 #include <iostream>
 
-#include <aoc/HistorianHysteria.h>
+#include <aoc/HistorianHysteria.hpp>
 
 std::string HistorianHysteria::getPuzzleName() const
 {

src/LinesSolver.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/LinesSolver.h>
+#include <aoc/LinesSolver.hpp>
 
 void LinesSolver::processDataLine(const std::string& line)
 {

src/MullCharState.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullCharState.h>
+#include <aoc/MullCharState.hpp>
 
 MullCharState::MullCharState(const char expected)
     : expected_{ expected }, successState_{}, failState_{} {}

src/MullData.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullData.h>
+#include <aoc/MullData.hpp>
 
 MullData::MullData()
     : isEnabled_{ true }, factor1_{ 0 }, factor2_{ 0 }, part1_{ 0 }, part2_{ 0 } {};

src/MullDataState.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 void MullDataState::setData(MullData& data)
 {

src/MullDoOpenState.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullDoOpenState.h>
+#include <aoc/MullDoOpenState.hpp>
 
 void MullDoOpenState::next(StringStateMachine* stateMachine)
 {

src/MullEntryState.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullEntryState.h>
+#include <aoc/MullEntryState.hpp>
 
 void MullEntryState::enter(StringStateMachine* stateMachine)
 {

src/MullFactorState.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullFactorState.h>
+#include <aoc/MullFactorState.hpp>
 
 MullFactorState::MullFactorState(const char expected, const int index)
     : expected_{ expected }, index_{ index }, successState_{}, failState_{} {}

src/MullItOver.cpp

@@ -13,8 +13,9 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullItOver.h>
+#include <aoc/MullItOver.hpp>
-#include <aoc/StringStateMachine.h>
+
+#include <aoc/StringStateMachine.hpp>
 
 MullItOver::MullItOver()
     : Solver{}, data_{}, states_ {

src/MullStates.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullStates.h>
+#include <aoc/MullStates.hpp>
 
 MullStates::MullStates(MullData& data)
 {

src/MullToggleCloseState.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullToggleCloseState.h>
+#include <aoc/MullToggleCloseState.hpp>
 
 MullToggleCloseState::MullToggleCloseState(const bool isEnabler)
     : isEnabler_{ isEnabler }, successState_{} {}

src/Point2.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/Point2.h>
+#include <aoc/Point2.hpp>
 
 const Point2 Point2::left{ -1, 0 };
 const Point2 Point2::right{ 1, 0 };

src/PrintQueue.cpp

@@ -13,12 +13,12 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/PrintQueue.hpp>
+
 #include <algorithm>
 #include <sstream>
 #include <vector>
 
-#include <aoc/PrintQueue.h>
-
 PrintQueue::PrintQueue()
     : Solver{}, pageNoMapIndex_{ 0 }, isProcessingOrderingRules_{ true }, orderingRules_{}
 {

src/Program.cpp

@@ -13,19 +13,20 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/Program.hpp>
+
 #include <iostream>
 #include <memory>
 
-#include <aoc/Program.h>
+#include <aoc/SolverEngine.hpp>
-#include <aoc/SolverEngine.h>
 
 // Solver implementations in day order.
-#include <aoc/HistorianHysteria.h>
+#include <aoc/HistorianHysteria.hpp>
-#include <aoc/RedNosedReports.h>
+#include <aoc/RedNosedReports.hpp>
-#include <aoc/MullItOver.h>
+#include <aoc/MullItOver.hpp>
-#include <aoc/CeresSearch.h>
+#include <aoc/CeresSearch.hpp>
-#include <aoc/PrintQueue.h>
+#include <aoc/PrintQueue.hpp>
-#include <aoc/GuardGallivant.h>
+#include <aoc/GuardGallivant.hpp>
 
 void Program::run()
 {

src/RedNosedReports.cpp

@@ -13,12 +13,12 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/RedNosedReports.hpp>
+
 #include <iostream>
 #include <sstream>
 #include <vector>
 
-#include <aoc/RedNosedReports.h>
-
 std::string RedNosedReports::getPuzzleName() const
 {
     return "Day 2: Red-Nosed Reports";

src/Solver.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 Solver::Solver()
     : part1{ 0 }, part2{ 0 } {}

src/SolverEngine.cpp

@@ -13,11 +13,11 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/SolverEngine.hpp>
+
 #include <fstream>
 #include <iostream>
 
-#include <aoc/SolverEngine.h>
-
 SolverEngine::SolverEngine(const std::vector<std::string>& inputPaths)
     : inputPaths_{ inputPaths } {}
 

src/StringStateMachine.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/StringStateMachine.h>
+#include <aoc/StringStateMachine.hpp>
 
 StringStateMachine::StringStateMachine(const std::string& line, StringState& entryState)
 {

tests/include/aocTests/Part1TestContext.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aocTests/TestContext.h>
+#include <aocTests/TestContext.hpp>
 
 class Part1TestContext
     : public TestContext

tests/include/aocTests/Part2TestContext.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aocTests/TestContext.h>
+#include <aocTests/TestContext.hpp>
 
 class Part2TestContext
     : public TestContext

tests/include/aocTests/TestContext.hpp

@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 class TestContext
 {

tests/src/Part1TestContext.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aocTests/Part1TestContext.h>
+#include <aocTests/Part1TestContext.hpp>
 
 Part1TestContext::Part1TestContext(std::vector<std::string> inputPaths)
     : TestContext{ inputPaths } {}

tests/src/Part2TestContext.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aocTests/Part2TestContext.h>
+#include <aocTests/Part2TestContext.hpp>
 
 Part2TestContext::Part2TestContext(std::vector<std::string> inputPaths)
     : TestContext{ inputPaths } {}

tests/src/TestCases.cpp

@@ -15,12 +15,12 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
-#include <aoc/SolverEngine.h>
+#include <aoc/SolverEngine.hpp>
-#include <aoc/HistorianHysteria.h>
+#include <aoc/HistorianHysteria.hpp>
 
-#include <aocTests/Part1TestContext.h>
+#include <aocTests/Part1TestContext.hpp>
-#include <aocTests/Part2TestContext.h>
+#include <aocTests/Part2TestContext.hpp>
 
 #define REQUIRE_MESSAGE(cond, msg) if (!(cond)) { INFO(msg); REQUIRE(cond); }
 

tests/src/TestContext.cpp

@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aocTests/TestContext.h>
+#include <aocTests/TestContext.hpp>
 
 TestContext::TestContext(std::vector<std::string> inputPaths)
     : inputPaths_{ inputPaths } {}