Refactoring: Using camelCase throughout

CMakeLists.txt

@@ -84,22 +84,22 @@ set_target_properties(gtest_main PROPERTIES FOLDER lib)
 
 # Define executable
 include_directories("src" "src/audio_input")
-configure_file(src/app_info.cpp.in src/app_info.cpp ESCAPE_QUOTES)
+configure_file(src/appInfo.cpp.in src/appInfo.cpp ESCAPE_QUOTES)
 set(SOURCE_FILES
-	${CMAKE_CURRENT_BINARY_DIR}/src/app_info.cpp
+	${CMAKE_CURRENT_BINARY_DIR}/src/appInfo.cpp
 	src/main.cpp
 	src/Phone.cpp
 	src/Shape.cpp
 	src/centiseconds.cpp
-	src/mouth_animation.cpp
+	src/mouthAnimation.cpp
-	src/phone_extraction.cpp
+	src/phoneExtraction.cpp
-	src/platform_tools.cpp
+	src/platformTools.cpp
 	src/tools.cpp
-	src/audio_input/ChannelDownmixer.cpp
+	src/audioInput/ChannelDownmixer.cpp
-	src/audio_input/SampleRateConverter.cpp
+	src/audioInput/SampleRateConverter.cpp
-	src/audio_input/WaveFileReader.cpp
+	src/audioInput/WaveFileReader.cpp
-	src/audio_input/wave_file_writing.cpp
+	src/audioInput/waveFileWriting.cpp
-	src/string_tools.cpp
+	src/stringTools.cpp
 )
 add_executable(rhubarb ${SOURCE_FILES})
 target_link_libraries(rhubarb ${Boost_LIBRARIES} cppFormat sphinxbase pocketSphinx)
@@ -108,8 +108,8 @@ target_compile_options(rhubarb PUBLIC ${enableWarningsFlags})
 # Define test project
 #include_directories("${gtest_SOURCE_DIR}/include")
 set(TEST_FILES
-	tests/string_tools_tests.cpp
+	tests/stringToolsTests.cpp
-	src/string_tools.cpp
+	src/stringTools.cpp
 )
 add_executable(runTests ${TEST_FILES})
 target_link_libraries(runTests gtest gmock gmock_main)

src/appInfo.cpp.in

@@ -0,0 +1,4 @@
+#include "appInfo.h"
+
+const std::string appName = "@appName@";
+const std::string appVersion = "@appVersion@";

src/app_info.cpp.in

@@ -1,4 +0,0 @@
-#include "app_info.h"
-
-const std::string appName = "@appName@";
-const std::string appVersion = "@appVersion@";

src/audioInput/WaveFileReader.cpp

@@ -1,6 +1,6 @@
 #include <format.h>
 #include "WaveFileReader.h"
-#include "io_tools.h"
+#include "ioTools.h"
 
 using std::runtime_error;
 using fmt::format;

src/audioInput/waveFileWriting.cpp

@@ -1,6 +1,6 @@
 #include <fstream>
-#include "wave_file_writing.h"
+#include "waveFileWriting.h"
-#include "io_tools.h"
+#include "ioTools.h"
 
 using namespace little_endian;
 

src/main.cpp

@@ -3,11 +3,11 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <format.h>
 #include <tclap/CmdLine.h>
-#include "audio_input/WaveFileReader.h"
+#include "audioInput/WaveFileReader.h"
-#include "phone_extraction.h"
+#include "phoneExtraction.h"
-#include "mouth_animation.h"
+#include "mouthAnimation.h"
-#include "platform_tools.h"
+#include "platformTools.h"
-#include "app_info.h"
+#include "appInfo.h"
 
 using std::exception;
 using std::string;

src/mouthAnimation.cpp

@@ -1,4 +1,4 @@
-#include "mouth_animation.h"
+#include "mouthAnimation.h"
 #include <boost/utility.hpp>
 
 using std::map;

src/phoneExtraction.cpp

@@ -1,10 +1,10 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include "phone_extraction.h"
+#include "phoneExtraction.h"
-#include "audio_input/SampleRateConverter.h"
+#include "audioInput/SampleRateConverter.h"
-#include "audio_input/ChannelDownmixer.h"
+#include "audioInput/ChannelDownmixer.h"
-#include "platform_tools.h"
+#include "platformTools.h"
 #include "tools.h"
 
 extern "C" {

src/phoneExtraction.h

@@ -5,7 +5,7 @@
 #include <chrono>
 #include <ratio>
 #include <memory>
-#include "audio_input/AudioStream.h"
+#include "audioInput/AudioStream.h"
 #include "Phone.h"
 #include "centiseconds.h"
 

src/platformTools.cpp

@@ -3,7 +3,7 @@
 #include <boost/predef.h>
 #include <format.h>
 
-#include "platform_tools.h"
+#include "platformTools.h"
 
 using boost::filesystem::path;
 

src/stringTools.cpp

@@ -1,4 +1,4 @@
-#include "string_tools.h"
+#include "stringTools.h"
 #include <boost/algorithm/string/trim.hpp>
 
 using std::string;

tests/stringToolsTests.cpp

@@ -1,5 +1,5 @@
 #include <gmock/gmock.h>
-#include "string_tools.h"
+#include "stringTools.h"
 
 using namespace testing;