summaryrefslogtreecommitdiff
path: root/src/plugins/clangcodemodel/clangcompletion.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-02-04 17:01:07 +0200
committerOrgad Shaneh <orgads@gmail.com>2015-02-04 15:27:22 +0000
commit65e7db42b85cfbc7e41d249ee757b45c84daae59 (patch)
treeb0c775fbf5537b23c2d5e69895d9b2ce269fa95c /src/plugins/clangcodemodel/clangcompletion.cpp
parentf5225c0928c1591c1d996d973742097e74b18c55 (diff)
downloadqt-creator-65e7db42b85cfbc7e41d249ee757b45c84daae59.tar.gz
C++: Remove unneeded qualifications
Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I6fbe13ddc1485efe95c3156097bf41d90c0febac Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcompletion.cpp')
-rw-r--r--src/plugins/clangcodemodel/clangcompletion.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index 2c845d785c..c00d5b1e28 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -190,7 +190,7 @@ namespace Internal {
// ClangCompletionAssistProvider
// -----------------------------
ClangCompletionAssistProvider::ClangCompletionAssistProvider()
- : m_clangCompletionWrapper(new ClangCodeModel::ClangCompleter)
+ : m_clangCompletionWrapper(new ClangCompleter)
{
}
@@ -215,15 +215,15 @@ AssistInterface *ClangCompletionAssistProvider::createAssistInterface(
foreach (ProjectPart::Ptr part, parts) {
if (part.isNull())
continue;
- options = ClangCodeModel::Utils::createClangOptions(part, filePath);
+ options = Utils::createClangOptions(part, filePath);
pchInfo = PchManager::instance()->pchInfo(part);
if (!pchInfo.isNull())
- options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName()));
+ options.append(Utils::createPCHInclusionOptions(pchInfo->fileName()));
headerPaths = part->headerPaths;
break;
}
- return new ClangCodeModel::ClangCompletionAssistInterface(
+ return new ClangCompletionAssistInterface(
m_clangCompletionWrapper,
document, position, filePath, reason,
options, headerPaths, pchInfo);
@@ -287,7 +287,7 @@ public:
virtual int activeArgument(const QString &prefix) const;
private:
- QList<ClangCodeModel::CodeCompletionResult> m_functionSymbols;
+ QList<CodeCompletionResult> m_functionSymbols;
mutable int m_currentArg;
};
@@ -323,7 +323,7 @@ int ClangFunctionHintModel::activeArgument(const QString &prefix) const
SimpleLexer tokenize;
Tokens tokens = tokenize(prefix);
for (int i = 0; i < tokens.count(); ++i) {
- const CPlusPlus::Token &tk = tokens.at(i);
+ const Token &tk = tokens.at(i);
if (tk.is(T_LPAREN))
++parcount;
else if (tk.is(T_RPAREN))
@@ -544,7 +544,7 @@ ClangCompletionAssistInterface::ClangCompletionAssistInterface(ClangCompleter::P
const QString &fileName,
AssistReason reason,
const QStringList &options,
- const QList<CppTools::ProjectPart::HeaderPath> &headerPaths,
+ const QList<ProjectPart::HeaderPath> &headerPaths,
const PchInfo::Ptr &pchInfo)
: AssistInterface(document, position, fileName, reason)
, m_clangWrapper(clangWrapper)
@@ -719,7 +719,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
tokenize.setSkipComments(false);
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 CPlusPlus::Token tk = (tokenIdx == -1) ? CPlusPlus::Token() : tokens.at(tokenIdx);
+ const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
if (*kind == T_DOXY_COMMENT && !(tk.is(T_DOXY_COMMENT) || tk.is(T_CPP_DOXY_COMMENT))) {
*kind = T_EOF_SYMBOL;
@@ -740,7 +740,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
}
else if (*kind == T_LPAREN) {
if (tokenIdx > 0) {
- const CPlusPlus::Token &previousToken = tokens.at(tokenIdx - 1); // look at the token at the left of T_LPAREN
+ const Token &previousToken = tokens.at(tokenIdx - 1); // look at the token at the left of T_LPAREN
switch (previousToken.kind()) {
case T_IDENTIFIER:
case T_GREATER:
@@ -761,7 +761,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
if (tokens.size() >= 3) {
if (tokens.at(0).is(T_POUND) && tokens.at(1).is(T_IDENTIFIER) && (tokens.at(2).is(T_STRING_LITERAL) ||
tokens.at(2).is(T_ANGLE_STRING_LITERAL))) {
- const CPlusPlus::Token &directiveToken = tokens.at(1);
+ const Token &directiveToken = tokens.at(1);
QString directive = tc.block().text().mid(directiveToken.bytesBegin(),
directiveToken.bytes());
if (directive == QLatin1String("include") ||
@@ -830,7 +830,7 @@ bool ClangCompletionAssistProcessor::accepts() const
tokenize.setSkipComments(false);
const Tokens &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1));
- const CPlusPlus::Token tk = (tokenIdx == -1) ? CPlusPlus::Token() : tokens.at(tokenIdx);
+ const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
if (!tk.isComment() && !tk.isLiteral()) {
return true;
@@ -839,7 +839,7 @@ bool ClangCompletionAssistProcessor::accepts() const
&& tokens.at(0).kind() == T_POUND
&& tokens.at(1).kind() == T_IDENTIFIER) {
const QString &line = tc.block().text();
- const CPlusPlus::Token &idToken = tokens.at(1);
+ const Token &idToken = tokens.at(1);
const QStringRef &identifier =
line.midRef(idToken.bytesBegin(),
idToken.bytesEnd() - idToken.bytesBegin());