Changeset 846 for trunk/src/tools/moc/moc.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/tools/moc/moc.cpp (modified) (7 diffs)

trunk/src/tools/moc/moc.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -231 +231 @@
     }
     while (test(CONST) || test(VOLATILE) || test(SIGNED) || test(UNSIGNED)
-           || test(STAR) || test(AND)) {
+           || test(STAR) || test(AND)) {
         type.name += ' ';
         type.name += lexem();
         if (lookup(0) == AND)
             type.referenceType = Type::Reference;
+
+
         else if (lookup(0) == STAR)
             type.referenceType = Type::Pointer;
@@ -726 +728 @@
 
             checkSuperClasses(&def);
+
 
             classList += def;
@@ -1207 +1210 @@
         }
     }
+
+
+
+
+
+
     while (index < symbols.size()) {
         Token t = symbols.at(index++).token;
@@ -1225 +1234 @@
             && brackCount <= 0
             && parenCount <= 0
-            && (target != RANGLE || angleCount <= 0))
+            && (target != RANGLE || angleCount <= 0)) {
+            if (target != COMMA || angleCount <= 0)
+                return true;
+            possible = index;
+        }
+
+        if (target == COMMA && t == EQ && possible != -1) {
+            index = possible;
             return true;
+
 
         if (braceCount < 0 || brackCount < 0 || parenCount < 0
@@ -1234 +1251 @@
         }
     }
+
+
+
+
+
+
     return false;
 }
@@ -1291 +1314 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 QT_END_NAMESPACE