Revert "Allow moc to handle symbols that have been redefined."

[profile/ivi/qtbase.git] / src / tools / moc / moc.h

diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index b12ec49..e20e29a 100644 (file)
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -43,7 +43,6 @@
 #define MOC_H
 
 #include "parser.h"
-#include "preprocessor.h"
 #include <QStringList>
 #include <QMap>
 #include <QPair>
@@ -198,14 +197,12 @@ struct NamespaceDef {
 class Moc : public Parser
 {
 public:
-    Moc(Preprocessor &p)
-        : preprocessor(p), noInclude(false), generatedCode(false),
-          mustIncludeQPluginH(false)
+    Moc()
+        : noInclude(false), generatedCode(false), mustIncludeQPluginH(false)
         {}
 
     QByteArray filename;
 
-    Preprocessor &preprocessor;
     bool noInclude;
     bool generatedCode;
     bool mustIncludeQPluginH;
@@ -262,12 +259,6 @@ public:
 
     void checkSuperClasses(ClassDef *def);
     void checkProperties(ClassDef* cdef);
-
-    QByteArray getSubstitution(const QByteArray &token) const;
-    QByteArray getTokenSubstitution(const QByteArray &token) const;
-    QByteArray getWordSubstitution(const QByteArray &word) const;
-    QByteArray getNameSubstitution(const QByteArray &name) const;
-    QByteArray getTypeSubstitution(const QByteArray &typeName) const;
 };
 
 inline QByteArray noRef(const QByteArray &type)