Remove old preprocessor

Author: usiems

generator/generator.pri

@@ -16,8 +16,6 @@ RESOURCES += generator.qrc
 
 include($$GENERATORPATH/parser/rxx.pri)
 
-include($$GENERATORPATH/parser/rpp/rpp.pri)
-
 include($$GENERATORPATH/simplecpp/simplecpp.pri)
 
 CONFIG += strict_c++

generator/generator.qrc

@@ -15,6 +15,5 @@
 <file alias="typesystem_multimedia.txt">typesystem_multimedia.xml</file>
 <file alias="typesystem_qml.txt">typesystem_qml.xml</file>
 <file alias="typesystem_quick.txt">typesystem_quick.xml</file>
-<file>parser/rpp/pp-qt-configuration</file>
 </qresource>
 </RCC>

generator/main.cpp

@@ -48,7 +48,6 @@
 #include "generatorset.h"
 #include "fileout.h"
 #include "control.h"
-#include "pp.h"
 #include "simplecpp.h"
 
 #include <QDir>
@@ -212,60 +211,6 @@ namespace
       return true;
     }
 
-
-    bool
-    preprocess2(const QString &sourceFile, const QString &targetFile, const QString &commandLineIncludes = QString())
-    {
-      rpp::pp_environment env;
-      rpp::pp preprocess(env);
-
-      rpp::pp_null_output_iterator null_out;
-
-      const char *ppconfig = ":/trolltech/generator/parser/rpp/pp-qt-configuration";
-
-      QFile file(ppconfig);
-      if (!file.open(QFile::ReadOnly))
-      {
-        fprintf(stderr, "Preprocessor configuration file not found '%s'\n", ppconfig);
-        return false;
-      }
-
-      QByteArray ba = file.readAll();
-      file.close();
-      preprocess.operator()(ba.constData(), ba.constData() + ba.size(), null_out);
-
-      foreach(QString
-      include, getIncludeDirectories(commandLineIncludes)) {
-        preprocess.push_include_path(QDir::toNativeSeparators(include).toStdString());
-      }
-
-      QString currentDir = QDir::current().absolutePath();
-      QFileInfo sourceInfo(sourceFile);
-      QDir::setCurrent(sourceInfo.absolutePath());
-
-      std::string result;
-      result.reserve(20 * 1024); // 20K
-
-      result += "# 1 \"builtins\"\n";
-      result += "# 1 \"";
-      result += sourceFile.toStdString();
-      result += "\"\n";
-
-      preprocess.file(sourceInfo.fileName().toStdString(),
-                      rpp::pp_output_iterator<std::string>(result));
-
-      QDir::setCurrent(currentDir);
-
-      QFile f(targetFile);
-      if (!f.open(QIODevice::WriteOnly | QIODevice::Text))
-      {
-        fprintf(stderr, "Failed to write preprocessed file: %s\n", qPrintable(targetFile));
-      }
-      f.write(result.c_str(), result.length());
-
-      return true;
-    }
-
     unsigned int getQtVersion(const QString &commandLineIncludes)
     {
       QRegularExpression re("#define\\s+QTCORE_VERSION\\s+0x([0-9a-f]+)", QRegularExpression::CaseInsensitiveOption);