normalizeTypeInternal() cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/kernel/qmetaobject_p.h b/src/core/kernel/qmetaobject_p.h
index f9e4e68..f5cbed4 100644 (file)
--- a/src/core/kernel/qmetaobject_p.h
+++ b/src/core/kernel/qmetaobject_p.h
@@ -168,7 +168,7 @@ static inline bool is_space(char s)
 #endif
 
 // This code is shared with moc.cpp
-static inline QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixScope = false, bool adjustConst = true)
+static inline QByteArray normalizeTypeInternal(const char *t, const char *e, bool adjustConst = true)
 {
     int len = e - t;
     /*
@@ -177,8 +177,7 @@ static inline QByteArray normalizeTypeInternal(const char *t, const char *e, boo
     */
     QByteArray constbuf;
     for (int i = 1; i < len; i++) {
-        if ( t[i] == 'c'
-             && strncmp(t + i + 1, "onst", 4) == 0
+        if ( strncmp(t + i, "const", 5) == 0
              && (i + 5 >= len || !is_ident_char(t[i + 5]))
              && !is_ident_char(t[i-1])
              ) {
@@ -263,14 +262,6 @@ static inline QByteArray normalizeTypeInternal(const char *t, const char *e, boo
     bool star = false;
     while (t != e) {
         char c = *t++;
-        if (fixScope && c == ':' && *t == ':' ) {
-            ++t;
-            c = *t++;
-            int i = result.size() - 1;
-            while (i >= 0 && is_ident_char(result.at(i)))
-                --i;
-            result.resize(i + 1);
-        }
         star = star || c == '*';
         result += c;
         if (c == '<') {
@@ -284,7 +275,7 @@ static inline QByteArray normalizeTypeInternal(const char *t, const char *e, boo
                 if (c == '>')
                     --templdepth;
                 if (templdepth == 0 || (templdepth == 1 && c == ',')) {
-                    result += normalizeTypeInternal(tt, t-1, fixScope, false);
+                    result += normalizeTypeInternal(tt, t-1, false);
                     result += c;
                     if (templdepth == 0) {
                         if (*t == '>')

diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 5d1b054..18c0bef 100644 (file)
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -55,7 +55,7 @@
 QT_BEGIN_NAMESPACE
 
 // only moc needs this function
-static QByteArray normalizeType(const char *s, bool fixScope = false)
+static QByteArray normalizeType(const char *s)
 {
     int len = qstrlen(s);
     char stackbuf[64];
@@ -77,7 +77,7 @@ static QByteArray normalizeType(const char *s, bool fixScope = false)
     *d = '\0';
     QByteArray result;
     if (strncmp("void", buf, d - buf) != 0)
-        result = normalizeTypeInternal(buf, d, fixScope);
+        result = normalizeTypeInternal(buf, d);
     if (buf != stackbuf)
         delete [] buf;
     return result;