Format code based on clang format

src/Makefile.cpp

@@ -1,30 +1,31 @@
 #include "Makefile.h"
 
-#include "IncludeDeps.h"
-#include "Utils.h"
-#include "Common.h"
-
 #include <fstream>
 #include <map>
 
+#include "Common.h"
+#include "IncludeDeps.h"
+#include "Utils.h"
+
 void Makefile::Save(ConfigFile& conf, unsigned int flags)
 {
-  std::set<HFile> hFiles; // hFile, directory
+  std::set<HFile> hFiles;  // hFile, directory
   std::set<std::string> cppFiles;
-  if(flags & FLAG_SIMPLE)
+  if (flags & FLAG_SIMPLE)
     Utils::GetCppFiles(conf, cppFiles);
   else
     Utils::GetCppAndHFiles(conf, hFiles, cppFiles);
 
-  std::ofstream outputFile(conf.GetConfigPath()+ "Makefile");
-  outputFile << "# This Makefile was generated using MakeGen "<< MAKEGEN_VERSION << " made by Tim Håkansson" << std::endl;
+  std::ofstream outputFile(conf.GetConfigPath() + "Makefile");
+  outputFile << "# This Makefile was generated using MakeGen " << MAKEGEN_VERSION << " made by Tim Håkansson"
+             << std::endl;
   outputFile << "# and is licensed under MIT. Full source of the project can be found at" << std::endl;
   outputFile << "# https://github.com/Thraix/MakeGen" << std::endl;
   outputFile << "CC=@g++" << std::endl;
   std::string outputtype = conf.GetSettingString(ConfigSetting::OutputType);
-  if(outputtype != "executable")
+  if (outputtype != "executable")
   {
-    if(outputtype == "sharedlibrary")
+    if (outputtype == "sharedlibrary")
       outputFile << "CO=@g++ -shared -o" << std::endl;
     else
       outputFile << "CO=@g++ -o" << std::endl;
@@ -37,25 +38,25 @@ void Makefile::Save(ConfigFile& conf, unsigned int flags)
   outputFile << "OBJPATH=$(BIN)intermediates" << std::endl;
   outputFile << "INCLUDES=";
   std::vector<std::string>& includedirs = conf.GetSettingVectorString(ConfigSetting::IncludeDir);
-  for(auto it = includedirs.begin(); it != includedirs.end(); ++it)
+  for (auto it = includedirs.begin(); it != includedirs.end(); ++it)
   {
     outputFile << "-I " << *it << " ";
   }
   std::vector<std::string>& includedirsexcldep = conf.GetSettingVectorString(ConfigSetting::IncludeDirExclDep);
-  for(auto it = includedirsexcldep.begin(); it != includedirsexcldep.end(); ++it)
+  for (auto it = includedirsexcldep.begin(); it != includedirsexcldep.end(); ++it)
   {
     outputFile << "-I " << *it << " ";
   }
   outputFile << std::endl;
   outputFile << "OBJECTS=";
-  for(auto it = cppFiles.begin();it!=cppFiles.end();++it)
+  for (auto it = cppFiles.begin(); it != cppFiles.end(); ++it)
   {
     size_t extensionPos = it->find_last_of(".");
-    size_t slash = it->find_last_of("/")+1;
+    size_t slash = it->find_last_of("/") + 1;
     outputFile << "$(OBJPATH)/" << it->substr(slash, extensionPos - slash) << ".o ";
   }
   outputFile << std::endl;
-  if(outputtype == "executable" || outputtype != "sharedlibrary")
+  if (outputtype == "executable" || outputtype != "sharedlibrary")
   {
     outputFile << "CFLAGS=$(INCLUDES) -std=c++17 -c ";
   }
@@ -64,48 +65,48 @@ void Makefile::Save(ConfigFile& conf, unsigned int flags)
     outputFile << "CFLAGS=$(INCLUDES) -fPIC -std=c++17 -c ";
   }
   std::vector<std::string>& defines = conf.GetSettingVectorString(ConfigSetting::Define);
-  for(auto it = defines.begin(); it != defines.end(); ++it)
+  for (auto it = defines.begin(); it != defines.end(); ++it)
   {
     outputFile << "-D" << *it << " ";
   }
   std::vector<std::string>& cflags = conf.GetSettingVectorString(ConfigSetting::CFlag);
-  for(auto it = cflags.begin(); it != cflags.end(); ++it)
+  for (auto it = cflags.begin(); it != cflags.end(); ++it)
   {
     outputFile << *it << " ";
   }
   outputFile << std::endl;
-  if(outputtype == "executable")
+  if (outputtype == "executable")
   {
-    std::vector<std::string>& libdirs= conf.GetSettingVectorString(ConfigSetting::LibraryDir);
+    std::vector<std::string>& libdirs = conf.GetSettingVectorString(ConfigSetting::LibraryDir);
     outputFile << "LIBDIR=";
-    for(auto it = libdirs.begin();it!=libdirs.end();++it)
+    for (auto it = libdirs.begin(); it != libdirs.end(); ++it)
     {
       outputFile << "-L " << *it << " ";
     }
     outputFile << std::endl;
     std::vector<std::string>& lflags = conf.GetSettingVectorString(ConfigSetting::LFlag);
     outputFile << "LDFLAGS=";
-    for(auto it = lflags.begin(); it != lflags.end(); ++it)
+    for (auto it = lflags.begin(); it != lflags.end(); ++it)
     {
       outputFile << *it << " ";
     }
-    for(auto it = libdirs.begin(); it != libdirs.end(); ++it)
+    for (auto it = libdirs.begin(); it != libdirs.end(); ++it)
     {
       outputFile << "-Wl,-rpath=" << *it << " ";
     }
     outputFile << std::endl;
     std::vector<std::string>& libs = conf.GetSettingVectorString(ConfigSetting::Library);
     outputFile << "LIBS=$(LIBDIR) ";
-    for(auto it = libs.begin(); it != libs.end(); ++it)
+    for (auto it = libs.begin(); it != libs.end(); ++it)
     {
       outputFile << "-l" << *it << " ";
     }
     outputFile << std::endl;
     std::vector<std::string>& dependencies = conf.GetSettingVectorString(ConfigSetting::Dependency);
-    if(!dependencies.empty())
+    if (!dependencies.empty())
     {
       outputFile << "DEPENDENCIES=";
-      for(auto it = dependencies.begin();it!=dependencies.end();++it)
+      for (auto it = dependencies.begin(); it != dependencies.end(); ++it)
       {
         outputFile << *it << " ";
       }
@@ -132,17 +133,15 @@ void Makefile::Save(ConfigFile& conf, unsigned int flags)
 
   // Run
   outputFile << "run: all" << std::endl;
-  if(outputtype == "executable")
+  if (outputtype == "executable")
   {
     std::vector<std::string>& prearguments = conf.GetSettingVectorString(ConfigSetting::ExecPreArgument);
     std::vector<std::string>& arguments = conf.GetSettingVectorString(ConfigSetting::ExecArgument);
 
     outputFile << "\t@";
-    for(auto&& preargument : prearguments)
-      outputFile << preargument << " ";
+    for (auto&& preargument : prearguments) outputFile << preargument << " ";
     outputFile << "./$(OUTPUT)";
-    for(auto&& argument : arguments)
-      outputFile << " " << argument;
+    for (auto&& argument : arguments) outputFile << " " << argument;
     outputFile << std::endl;
   }
 
@@ -157,27 +156,28 @@ void Makefile::Save(ConfigFile& conf, unsigned int flags)
   // Output file
   outputFile << "$(OUTPUT): $(OBJECTS)" << std::endl;
   outputFile << "\t$(info Generating output file)" << std::endl;
-  if(outputtype == "executable")
+  if (outputtype == "executable")
     outputFile << "\t$(CO) $(OUTPUT) $(OBJECTS) $(LDFLAGS) $(LIBS)" << std::endl;
   else
     outputFile << "\t$(CO) $(OUTPUT) $(OBJECTS)" << std::endl;
 
   // Install
   outputFile << "install: all" << std::endl;
-  outputFile << "\t$(info Installing " << conf.GetSettingString(ConfigSetting::ProjectName) <<" to /usr/bin/)" << std::endl;
+  outputFile << "\t$(info Installing " << conf.GetSettingString(ConfigSetting::ProjectName) << " to /usr/bin/)"
+             << std::endl;
   outputFile << "\t@cp $(OUTPUT) /usr/bin/" << conf.GetSettingString(ConfigSetting::OutputName) << std::endl;
 
   std::map<std::string, IncludeDeps*> dependencies;
   size_t i = 0;
-  for(auto it = cppFiles.begin(); it != cppFiles.end();++it)
+  for (auto it = cppFiles.begin(); it != cppFiles.end(); ++it)
   {
     i++;
     auto itD = dependencies.find(*it);
-    if(itD == dependencies.end())
+    if (itD == dependencies.end())
     {
       size_t extensionPos = it->find_last_of(".");
-      size_t slash = it->find_last_of("/")+1;
-      std::string oFile = it->substr(slash, extensionPos - slash)+".o ";
+      size_t slash = it->find_last_of("/") + 1;
+      std::string oFile = it->substr(slash, extensionPos - slash) + ".o ";
 
       outputFile << "$(OBJPATH)/" << oFile << ":";
       if (flags & FLAG_SIMPLE)