Changeset 846 for trunk/tools/porting/src/rpp.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)
• tools/porting/src/rpp.cpp (modified) (3 diffs)

trunk/tools/porting/src/rpp.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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])
@@ -61 +61 @@
 {
     m_memoryPool = memoryPool;
-    Source *m_source = createNode<Source>(m_memoryPool); //node whith no parent
+    Source *m_source = createNode<Source>(m_memoryPool); //node with no parent
     m_tokenContainer = tokenContainer;
     m_tokenTypeList = tokenTypeList;
@@ -539 +539 @@
 /*
     Reads a preprocessor line from the source by advancing lexerTokenIndex and
-    returing a TokenSection containg the read line. Text lines separated by
+    returing the read line. Text lines separated by
     an escaped newline are joined.
 */