Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7

4 files changed, 9 insertions, 9 deletions

diff --git a/tools/porting/src/rpp.cpp b/tools/porting/src/rpp.cpp
index 7b0bea1..2e2aa97 100644
--- a/tools/porting/src/rpp.cpp
+++ b/tools/porting/src/rpp.cpp
@@ -60,7 +60,7 @@ Source *Preprocessor::parse(const TokenEngine::TokenContainer &tokenContainer,
                             const QVector<Type> &tokenTypeList, TypedPool<Item> *memoryPool)
 {
     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;
     lexerTokenIndex = 0;
@@ -538,7 +538,7 @@ bool Preprocessor::parsePragmaDirective(Item *group)
 }
 /*
     Reads a preprocessor line from the source by advancing lexerTokenIndex and
-    returing a TokenSection containg the read line. Text lines separated by
+    returning a TokenSection containing the read line. Text lines separated by
     an escaped newline are joined.
 */
 TokenSection Preprocessor::readLine()
diff --git a/tools/porting/src/semantic.cpp b/tools/porting/src/semantic.cpp
index cf0b141..bd9175f 100644
--- a/tools/porting/src/semantic.cpp
+++ b/tools/porting/src/semantic.cpp
@@ -806,10 +806,10 @@ void Semantic::parseNameUse(NameAST* name)
 }
 
 /*
-    looks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList()
+    Looks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList()
     returns a non-empty list, the C++ qualified name lookup rules are used. Otherwise the
     unquialified name lookup rules are used.  Returns the a list of members that was found,
-    In most cases this list will contain zero or one element, exept in the case of overloaded functions.
+    In most cases this list will contain zero or one element, except in the case of overloaded functions.
     TODO: Argument-dependent name lookup
 */
 QList<CodeModel::Member *> Semantic::nameLookup(CodeModel::Scope *baseScope, const NameAST* name)
diff --git a/tools/porting/src/tokenengine.h b/tools/porting/src/tokenengine.h
index d998411..db68d88 100644
--- a/tools/porting/src/tokenengine.h
+++ b/tools/porting/src/tokenengine.h
@@ -55,7 +55,7 @@ namespace TokenEngine {
 
 class TokenContainer;
 /*
-    A token is defined as a start-postion and a lenght. Since the actual text
+    A token is defined as a start-position and a length. Since the actual text
     storage is not reffered to here, Token needs to be used together with
     a TokenContainer in order to be useful.
 */
diff --git a/tools/porting/src/tokenreplacements.cpp b/tools/porting/src/tokenreplacements.cpp
index 02b7751..fa3cff8 100644
--- a/tools/porting/src/tokenreplacements.cpp
+++ b/tools/porting/src/tokenreplacements.cpp
@@ -126,7 +126,7 @@ int QualifiedNameParser::findScopeOperator(Direction direction)
 {
     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 containing text or we pass the beginning/end of the source
     tokenIndex += direction;
     while(tokenText.isEmpty() && isValidIndex(tokenIndex)) {
         tokenText = tokenContainer.text(tokenIndex).trimmed();
@@ -146,7 +146,7 @@ int QualifiedNameParser::nextScopeToken(Direction direction)
     if (tokenIndex == -1)
         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 containing text or we pass the start of the source
     tokenIndex += direction;
     while(tokenText.isEmpty() && isValidIndex(tokenIndex)) {
        tokenText = tokenContainer.text(tokenIndex).trimmed();
@@ -266,7 +266,7 @@ bool ScopedTokenReplacement::doReplace(const TokenContainer &tokenContainer, int
     if (!attributes->attribute(sourceIndex, "unknown").isEmpty())
         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 attribute, which returns the scope
     // for the declaration associated with this name use.
     const bool haveNameUseInfo = !attributes->attribute(sourceIndex, "nameUse").isEmpty();
     if (haveNameUseInfo) {
@@ -314,7 +314,7 @@ bool ScopedTokenReplacement::doReplace(const TokenContainer &tokenContainer, int
     const QByteArray sourceScope = tokenContainer.text(sourceScopeIndex);
 
     // 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.
     if (!haveNameUseInfo && sourceScope != oldScope) {