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

trunk/tools/porting/src/tokenreplacements.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])
@@ -127 +127 @@
     int tokenIndex = currentIndex;
     QByteArray tokenText;
-    //loop until we get a token containg text or we pass the beginning/end of the source
+    //loop until we get a token containg text or we pass the beginning/end of the source
     tokenIndex += direction;
     while(tokenText.isEmpty() && isValidIndex(tokenIndex)) {
@@ -147 +147 @@
         return -1;
     QByteArray tokenText;
-   //loop until we get a token containg text or we pass the start of the source
+   //loop until we get a token containg text or we pass the start of the source
     tokenIndex += direction;
     while(tokenText.isEmpty() && isValidIndex(tokenIndex)) {
@@ -267 +267 @@
         return false;
     // If nameUse is set we test if the nameUse refers to the correct declaration.
-    // This is done by checking the parentScope attriute, wich returns the scope
+    // This is done by checking the parentScope attriich returns the scope
     // for the declaration associated with this name use.
     const bool haveNameUseInfo = !attributes->attribute(sourceIndex, "nameUse").isEmpty();
@@ -315 +315 @@
 
     // If we have no name use info and the source and old scopes don't match,
-    // we generally dont't do a replace, unless the old scope is Qt and
+    // we generally don't do a replace, unless the old scope is Qt and
     // the source scope inherits Qt. For example, QWidget::ButtonState should
     // be renamed to Qt::ButtonState.