diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-07-03 16:06:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 00:48:44 +0200 |
| commit | 10edf63174414cc95165c4fc14a3278e944dfbe2 (patch) | |
| tree | fcf9f0cd2d4ee429a76339df7d32c00b257cbb74 /src/tools/moc/moc.h | |
| parent | 0ce1574dad6f80d563c61259b4d4bff84d03b889 (diff) | |
Revert "Allow moc to handle symbols that have been redefined."
This reverts commit 5bb1408927b4eb5a03e8ab9f7cbc68f80d8a3962.
The temporary measure used to support redefinition of QtDeclarative
class names during the transition period is no longer required.
Task-number: QTBUG-24517
Change-Id: Ib90f08fcdfb02e004e594ac72b698eaa0325d98d
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc/moc.h')
| -rw-r--r-- | src/tools/moc/moc.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index b12ec492ff..e20e29acb8 100644 --- 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) |