Address review comments

Author: usiems

generator/main.cpp

@@ -56,6 +56,8 @@
 #include <QTextStream>
 #include <QRegularExpression>
 
+#include <memory>
+
 void displayHelp(GeneratorSet *generatorSet);
 
 namespace
@@ -129,7 +131,7 @@ namespace
     {
       simplecpp::DUI dui; // settings
 
-      foreach(QString include, getIncludeDirectories(commandLineIncludes)) {
+      for(QString include : getIncludeDirectories(commandLineIncludes)) {
         dui.includePaths.push_back(QDir::toNativeSeparators(include).toStdString());
       }
       dui.defines.push_back("__cplusplus=1");
@@ -147,17 +149,16 @@ namespace
       QByteArray ba = file.readAll();
       file.close();
 
-      // Perform preprocessing
+      // Perform preprocessing (code originally taken from simplecpp/main.cpp and modified)
       simplecpp::OutputList outputList;
       std::vector<std::string> files;
-      simplecpp::TokenList* rawtokens = new simplecpp::TokenList(ba.constData(), ba.size(), files, {}, &outputList);
+      std::unique_ptr<simplecpp::TokenList> rawtokens(new simplecpp::TokenList(ba.constData(), ba.size(), files, {}, &outputList));
       rawtokens->removeComments();
       simplecpp::TokenList outputTokens(files);
       std::map<std::string, simplecpp::TokenList*> filedata;
       simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
       simplecpp::cleanup(filedata);
-      delete rawtokens;
-      rawtokens = nullptr;
+      rawtokens.reset();
 
       for (const simplecpp::Output& output : outputList) {
         if (output.type == simplecpp::Output::MISSING_HEADER) {