Ignore:
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:
64 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/porting/src/ast.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/ast.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/codemodel.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/codemodel.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])
    … …  
    9797public:
    9898     void add(CollectedType *collectedItem)
    99     { insert(collectedItem->name(), collectedItem); }
     99    { insert(collectedItem->name(), collectedItem); }
    100100};
    101101

  • trunk/tools/porting/src/codemodelattributes.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/codemodelattributes.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/codemodelwalker.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/codemodelwalker.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/cpplexer.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/cpplexer.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/errors.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])
    … …  
    4545QT_BEGIN_NAMESPACE
    4646
    47 QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") );
    48 QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") );
    49 QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") );
     47QT_STATIC_CONST_IMPL Error Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") );
     48QT_STATIC_CONST_IMPL Error Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") );
     49QT_STATIC_CONST_IMPL Error Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") );
    5050
    5151QT_END_NAMESPACE

  • trunk/tools/porting/src/errors.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])
    … …  
    6262{
    6363public:
    64     QT_STATIC_CONST Error& InternalError;
    65     QT_STATIC_CONST Error& SyntaxError;
    66     QT_STATIC_CONST Error& ParseError;
     64    QT_STATIC_CONST Error InternalError;
     65    QT_STATIC_CONST Error SyntaxError;
     66    QT_STATIC_CONST Error ParseError;
    6767};
    6868

  • trunk/tools/porting/src/fileporter.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/fileporter.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/filewriter.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/filewriter.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/list.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/logger.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/logger.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/parser.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/parser.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/port.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/portingrules.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/portingrules.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/preprocessorcontrol.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    155155    if (receivers(SIGNAL(readFile(QByteArray&,QString))) > 0) {
    156156        QByteArray array;
    157         // Workaround for "not beeing able to emit from const function"
     157        // Workaround for "not being able to emit from const function"
    158158        PreprocessorCache *cache = const_cast<PreprocessorCache *>(this);
    159159        emit cache->readFile(array, filename);

  • trunk/tools/porting/src/preprocessorcontrol.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/projectporter.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/projectporter.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/proparser.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/proparser.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/q3porting.xml

    r651 r846  
    22<!--************************************************************************
    33**
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])
    … …  
    16251625        <Library>Qt3Support</Library>
    16261626        <Name>Q3Wizard</Name>
    1627     </item>
    1628     <item Type="Qt4Class" >
    1629         <Library>QtAssistant</Library>
    1630         <Name>QAssistantClient</Name>
    16311627    </item>
    16321628    <item Type="Qt4Class" >

  • trunk/tools/porting/src/qtsimplexml.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/qtsimplexml.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/replacetoken.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/replacetoken.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rpp.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])
    … …  
    6161{
    6262    m_memoryPool = memoryPool;
    63     Source *m_source = createNode<Source>(m_memoryPool); //node whith no parent
     63    Source *m_source = createNode<Source>(m_memoryPool); //node with no parent
    6464    m_tokenContainer = tokenContainer;
    6565    m_tokenTypeList = tokenTypeList;
    … …  
    539539/*
    540540    Reads a preprocessor line from the source by advancing lexerTokenIndex and
    541     returing a TokenSection containg the read line. Text lines separated by
     541    returing the read line. Text lines separated by
    542542    an escaped newline are joined.
    543543*/

  • trunk/tools/porting/src/rpp.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rppexpressionbuilder.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rppexpressionbuilder.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rpplexer.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rpplexer.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rpptreeevaluator.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rpptreeevaluator.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rpptreewalker.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/rpptreewalker.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/semantic.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])
    … …  
    769769{
    770770    // If this is a classSpecifier or a EnumSpecifier we skip the name lookup,
    771     // becuase looking up the name "E" in a class definition like
     771    // becse looking up the name "E" in a class definition like
    772772    // "class E { ..." makes no sense. (There might be a variable named E
    773773    // already declared, but that variable is now shadowed by the class type.)
    … …  
    807807
    808808/*
    809     looks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList()
    810     returns a non-emty list, the C++ qualified name lookup rules are used. Otherwise the
     809    ooks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList()
     810    returns a non-emty list, the C++ qualified name lookup rules are used. Otherwise the
    811811    unquialified name lookup rules are used.  Returns the a list of members that was found,
    812     In most cases this list will contain zero or one element, exept in the case of overloaded functions.
     812    In most cases this list will contain zero or one element, exept in the case of overloaded functions.
    813813    TODO: Argument-dependent name lookup
    814814*/
    … …  
    976976FunctionMember *Semantic::selectFunction(QList<CodeModel::Member*> candidatateList, const DeclaratorAST *functionDeclarator)
    977977{
    978     // get arguments for funciton we are looking for
     978    // get arguments for funcon we are looking for
    979979    FunctionMember testFunction;
    980980    parseFunctionArguments(functionDeclarator, &testFunction);

  • trunk/tools/porting/src/semantic.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/smallobject.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/smallobject.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/textreplacement.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/textreplacement.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    5454    QByteArray newText;
    5555    int insertPosition;
    56     int currentLenght;    //lenght of the text that is going to be replaced.
     56    int currentLenght;    //leng of the text that is going to be replaced.
    5757    bool operator<(const TextReplacement &other) const
    5858    {
    … …  
    7171        insert maintains the TextReplacement list in sorted order.
    7272
    73         Returns true if the insert was successfull, false otherwise;
     73        Returns true if the insert was successful, false otherwise;
    7474    */
    7575    bool insert(QByteArray newText, int insertPosition, int currentLenght);

  • trunk/tools/porting/src/tokenengine.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/tokenengine.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    5656class TokenContainer;
    5757/*
    58     A token is defined as a start-postion and a lenght. Since the actual text
     58    A token is defined as a start-pos. Since the actual text
    5959    storage is not reffered to here, Token needs to be used together with
    6060    a TokenContainer in order to be useful.

  • trunk/tools/porting/src/tokenizer.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/tokenizer.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/tokenreplacements.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    127127    int tokenIndex = currentIndex;
    128128    QByteArray tokenText;
    129     //loop until we get a token containg text or we pass the beginning/end of the source
     129    //loop until we get a token containg text or we pass the beginning/end of the source
    130130    tokenIndex += direction;
    131131    while(tokenText.isEmpty() && isValidIndex(tokenIndex)) {
    … …  
    147147        return -1;
    148148    QByteArray tokenText;
    149    //loop until we get a token containg text or we pass the start of the source
     149   //loop until we get a token containg text or we pass the start of the source
    150150    tokenIndex += direction;
    151151    while(tokenText.isEmpty() && isValidIndex(tokenIndex)) {
    … …  
    267267        return false;
    268268    // If nameUse is set we test if the nameUse refers to the correct declaration.
    269     // This is done by checking the parentScope attriute, wich returns the scope
     269    // This is done by checking the parentScope attriich returns the scope
    270270    // for the declaration associated with this name use.
    271271    const bool haveNameUseInfo = !attributes->attribute(sourceIndex, "nameUse").isEmpty();
    … …  
    315315
    316316    // If we have no name use info and the source and old scopes don't match,
    317     // we generally dont't do a replace, unless the old scope is Qt and
     317    // we generally don't do a replace, unless the old scope is Qt and
    318318    // the source scope inherits Qt. For example, QWidget::ButtonState should
    319319    // be renamed to Qt::ButtonState.

  • trunk/tools/porting/src/tokenreplacements.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/tokens.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/tokenstreamadapter.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/translationunit.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/translationunit.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/treewalker.cpp

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])

  • trunk/tools/porting/src/treewalker.h

    r651 r846  
    22**
    33** Copyright (C) 2001-2004 Roberto Raggi
    4 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55** All rights reserved.
    66** Contact: Nokia Corporation ([email protected])
Note: See TracChangeset for help on using the changeset viewer.