Merge remote-tracking branch 'origin/3.3'

Change-Id: I3a8ef73222c64fb93f1d00adbea2057d2f8dcf43

src/plugins/cpptools/builtineditordocumentprocessor.cpp

@@ -95,7 +95,7 @@ CppTools::CheckSymbols *createHighlighter(const CPlusPlus::Document::Ptr &doc,
         SimpleLexer tokenize;
         tokenize.setLanguageFeatures(features);
 
-        const QList<Token> tokens = tokenize(name);
+        const Tokens tokens = tokenize(name);
         if (tokens.length() && (tokens.at(0).isKeyword() || tokens.at(0).isObjCAtKeyword()))
             continue;
 

src/plugins/cpptools/cppcodeformatter.cpp

@@ -1449,7 +1449,7 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
     *savedPaddingDepth = qMax(0, *savedPaddingDepth);
 }
 
-void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, int lexerState, int *indentDepth, int *paddingDepth) const
+void QtStyleCodeFormatter::adjustIndent(const Tokens &tokens, int lexerState, int *indentDepth, int *paddingDepth) const
 {
     State topState = state();
     State previousState = state(1);

src/plugins/cpptools/cppcodeformatter.h

@@ -74,7 +74,7 @@ public:
 
 protected:
     virtual void onEnter(int newState, int *indentDepth, int *savedIndentDepth, int *paddingDepth, int *savedPaddingDepth) const = 0;
-    virtual void adjustIndent(const QList<CPlusPlus::Token> &tokens, int lexerState, int *indentDepth, int *paddingDepth) const = 0;
+    virtual void adjustIndent(const CPlusPlus::Tokens &tokens, int lexerState, int *indentDepth, int *paddingDepth) const = 0;
 
     class State;
     class BlockData
@@ -251,7 +251,7 @@ private:
     QStack<State> m_currentState;
     QStack<State> m_newStates;
 
-    QList<CPlusPlus::Token> m_tokens;
+    CPlusPlus::Tokens m_tokens;
     QString m_currentLine;
     CPlusPlus::Token m_currentToken;
     int m_tokenIndex;
@@ -276,7 +276,7 @@ public:
 
 protected:
     virtual void onEnter(int newState, int *indentDepth, int *savedIndentDepth, int *paddingDepth, int *savedPaddingDepth) const;
-    virtual void adjustIndent(const QList<CPlusPlus::Token> &tokens, int lexerState, int *indentDepth, int *paddingDepth) const;
+    virtual void adjustIndent(const CPlusPlus::Tokens &tokens, int lexerState, int *indentDepth, int *paddingDepth) const;
 
     virtual void saveBlockData(QTextBlock *block, const BlockData &data) const;
     virtual bool loadBlockData(const QTextBlock &block, BlockData *data) const;

src/plugins/cpptools/cppcompletionassist.cpp

@@ -387,7 +387,7 @@ int CppFunctionHintModel::activeArgument(const QString &prefix) const
     int argnr = 0;
     int parcount = 0;
     SimpleLexer tokenize;
-    QList<Token> tokens = tokenize(prefix);
+    Tokens tokens = tokenize(prefix);
     for (int i = 0; i < tokens.count(); ++i) {
         const Token &tk = tokens.at(i);
         if (tk.is(T_LPAREN))
@@ -686,7 +686,7 @@ bool CppCompletionAssistProcessor::accepts() const
                     tokenize.setLanguageFeatures(features);
                     tokenize.setSkipComments(false);
 
-                    const QList<Token> &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
+                    const Tokens &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
                     const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1));
                     const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
 
@@ -789,7 +789,7 @@ int CppCompletionAssistProcessor::startOfOperator(int pos,
         SimpleLexer tokenize;
         tokenize.setLanguageFeatures(m_languageFeatures);
         tokenize.setSkipComments(false);
-        const QList<Token> &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
+        const Tokens &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
         const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1)); // get the token at the left of the cursor
         const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
 

src/plugins/cpptools/cppprojects.cpp

@@ -137,11 +137,6 @@ ProjectInfo::ProjectInfo(QPointer<ProjectExplorer::Project> project)
     : m_project(project)
 {}
 
-ProjectInfo::operator bool() const
-{
-    return isValid();
-}
-
 bool ProjectInfo::isValid() const
 {
     return !m_project.isNull();

src/plugins/cpptools/cppprojects.h

@@ -140,7 +140,6 @@ public:
     ProjectInfo();
     ProjectInfo(QPointer<ProjectExplorer::Project> project);
 
-    operator bool() const;
     bool isValid() const;
 
     QPointer<ProjectExplorer::Project> project() const;

src/plugins/cpptools/doxygengenerator.cpp

@@ -80,7 +80,7 @@ QString DoxygenGenerator::generate(QTextCursor cursor)
     QTextBlock block = cursor.block();
     while (block.isValid()) {
         const QString &text = block.text();
-        const QList<Token> &tks = lexer(text);
+        const Tokens &tks = lexer(text);
         foreach (const Token &tk, tks) {
             if (tk.is(T_SEMICOLON) || tk.is(T_LBRACE)) {
                 // No need to continue beyond this, we might already have something meaningful.