diff options
Diffstat (limited to 'tools/porting')
-rw-r--r-- | tools/porting/src/codemodel.h | 2 | ||||
-rw-r--r-- | tools/porting/src/errors.cpp | 6 | ||||
-rw-r--r-- | tools/porting/src/errors.h | 6 | ||||
-rw-r--r-- | tools/porting/src/preprocessorcontrol.cpp | 2 | ||||
-rw-r--r-- | tools/porting/src/q3porting.xml | 4 | ||||
-rw-r--r-- | tools/porting/src/rpp.cpp | 4 | ||||
-rw-r--r-- | tools/porting/src/semantic.cpp | 10 | ||||
-rw-r--r-- | tools/porting/src/textreplacement.h | 4 | ||||
-rw-r--r-- | tools/porting/src/tokenengine.h | 2 | ||||
-rw-r--r-- | tools/porting/src/tokenreplacements.cpp | 8 |
10 files changed, 22 insertions, 26 deletions
diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h index cb3088f..04ad178 100644 --- a/tools/porting/src/codemodel.h +++ b/tools/porting/src/codemodel.h @@ -96,7 +96,7 @@ class Collection: public QMultiHash<QByteArray, CollectedType *> { public: void add(CollectedType *collectedItem) - { insert(collectedItem->name(), collectedItem); } + { this->insert(collectedItem->name(), collectedItem); } }; typedef Collection<Scope> ScopeCollection; diff --git a/tools/porting/src/errors.cpp b/tools/porting/src/errors.cpp index 580efb5..9081dba 100644 --- a/tools/porting/src/errors.cpp +++ b/tools/porting/src/errors.cpp @@ -44,8 +44,8 @@ QT_BEGIN_NAMESPACE -QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") ); -QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") ); -QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") ); +QT_STATIC_CONST_IMPL Error Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") ); +QT_STATIC_CONST_IMPL Error Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") ); +QT_STATIC_CONST_IMPL Error Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") ); QT_END_NAMESPACE diff --git a/tools/porting/src/errors.h b/tools/porting/src/errors.h index f0ad691..dbac833 100644 --- a/tools/porting/src/errors.h +++ b/tools/porting/src/errors.h @@ -61,9 +61,9 @@ public: class Errors { public: - QT_STATIC_CONST Error& InternalError; - QT_STATIC_CONST Error& SyntaxError; - QT_STATIC_CONST Error& ParseError; + QT_STATIC_CONST Error InternalError; + QT_STATIC_CONST Error SyntaxError; + QT_STATIC_CONST Error ParseError; }; QT_END_NAMESPACE diff --git a/tools/porting/src/preprocessorcontrol.cpp b/tools/porting/src/preprocessorcontrol.cpp index 673ed08..31adc32 100644 --- a/tools/porting/src/preprocessorcontrol.cpp +++ b/tools/porting/src/preprocessorcontrol.cpp @@ -154,7 +154,7 @@ QByteArray PreprocessorCache::readFile(const QString &filename) const // read the file for us. if (receivers(SIGNAL(readFile(QByteArray&,QString))) > 0) { QByteArray array; - // Workaround for "not beeing able to emit from const function" + // Workaround for "not being able to emit from const function" PreprocessorCache *cache = const_cast<PreprocessorCache *>(this); emit cache->readFile(array, filename); return array; diff --git a/tools/porting/src/q3porting.xml b/tools/porting/src/q3porting.xml index 7a31d6e..39f341f 100644 --- a/tools/porting/src/q3porting.xml +++ b/tools/porting/src/q3porting.xml @@ -1626,10 +1626,6 @@ <Name>Q3Wizard</Name> </item> <item Type="Qt4Class" > - <Library>QtAssistant</Library> - <Name>QAssistantClient</Name> - </item> - <item Type="Qt4Class" > <Library>QtCore</Library> <Name>QAbstractEventDispatcher</Name> </item> 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 268e037..bd9175f 100644 --- a/tools/porting/src/semantic.cpp +++ b/tools/porting/src/semantic.cpp @@ -768,7 +768,7 @@ void Semantic::parseTypedef(TypedefAST *ast) void Semantic::parseTypeSpecifier(TypeSpecifierAST *ast) { // If this is a classSpecifier or a EnumSpecifier we skip the name lookup, - // becuase looking up the name "E" in a class definition like + // because looking up the name "E" in a class definition like // "class E { ..." makes no sense. (There might be a variable named E // already declared, but that variable is now shadowed by the class type.) if( ast->nodeType() != NodeType_EnumSpecifier @@ -806,10 +806,10 @@ void Semantic::parseNameUse(NameAST* name) } /* - looks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList() - returns a non-emty list, the C++ qualified name lookup rules are used. Otherwise the + 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) @@ -975,7 +975,7 @@ FunctionMember *Semantic::functionLookup(CodeModel::Scope *baseScope, */ FunctionMember *Semantic::selectFunction(QList<CodeModel::Member*> candidatateList, const DeclaratorAST *functionDeclarator) { - // get arguments for funciton we are looking for + // get arguments for function we are looking for FunctionMember testFunction; parseFunctionArguments(functionDeclarator, &testFunction); const ArgumentCollection testArgumentCollection = testFunction.arguments(); diff --git a/tools/porting/src/textreplacement.h b/tools/porting/src/textreplacement.h index f90fb82..f351552 100644 --- a/tools/porting/src/textreplacement.h +++ b/tools/porting/src/textreplacement.h @@ -53,7 +53,7 @@ class TextReplacement public: QByteArray newText; int insertPosition; - int currentLenght; //lenght of the text that is going to be replaced. + int currentLenght; //length of the text that is going to be replaced. bool operator<(const TextReplacement &other) const { return (insertPosition < other.insertPosition); @@ -70,7 +70,7 @@ public: insert maintains the TextReplacement list in sorted order. - Returns true if the insert was successfull, false otherwise; + Returns true if the insert was successful, false otherwise; */ bool insert(QByteArray newText, int insertPosition, int currentLenght); void clear(); 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) { |