Merge remote-tracking branch 'origin/api_changes' into containters

Conflicts:
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qvariant.cpp
	src/tools/moc/moc.h

Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6

1 files changed, 11 insertions, 2 deletions

diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index e20e29acb8..b12ec492ff 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -43,6 +43,7 @@
 #define MOC_H
 
 #include "parser.h"
+#include "preprocessor.h"
 #include <QStringList>
 #include <QMap>
 #include <QPair>
@@ -197,12 +198,14 @@ struct NamespaceDef {
 class Moc : public Parser
 {
 public:
-    Moc()
-        : noInclude(false), generatedCode(false), mustIncludeQPluginH(false)
+    Moc(Preprocessor &p)
+        : preprocessor(p), noInclude(false), generatedCode(false),
+          mustIncludeQPluginH(false)
         {}
 
     QByteArray filename;
 
+    Preprocessor &preprocessor;
     bool noInclude;
     bool generatedCode;
     bool mustIncludeQPluginH;
@@ -259,6 +262,12 @@ 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)