From 2ebaf3fe5b015b05e5acdabc0c12458b5f509832 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 11 Aug 2010 15:48:21 +0200
Subject: [PATCH] Get rid of the #warning directives.
---
src/libs/cplusplus/LookupContext.cpp | 4 ++--
src/libs/cplusplus/ResolveExpression.cpp | 7 ++++---
src/plugins/cpptools/cppcodecompletion.cpp | 2 +-
src/plugins/debugger/watchutils.cpp | 3 +--
src/shared/cplusplus/CheckExpression.cpp | 5 ++++-
src/shared/cplusplus/Symbols.cpp | 2 +-
tests/auto/cplusplus/ast/tst_ast.cpp | 2 +-
tests/auto/cplusplus/semantic/tst_semantic.cpp | 2 +-
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 1ddaaf73fa3..3221c5dd19d 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -283,7 +283,7 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const
} else if (Function *fun = scope->asFunction()) {
bindings()->lookupInScope(name, fun, &candidates, /*templateId = */ 0, /*binding=*/ 0);
-#warning robe: lookup in template parameters
+ // ### port me
#if 0
for (TemplateParameters *it = fun->templateParameters(); it && candidates.isEmpty(); it = it->previous())
bindings()->lookupInScope(name, it->scope(), &candidates, /* templateId = */ 0, /*binding=*/ 0);
@@ -310,7 +310,7 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const
break; // it's a formal argument.
} else if (Class *klass = scope->asClass()) {
-#warning robe: lookup in template parameters
+ // ### port me
#if 0
for (TemplateParameters *it = klass->templateParameters(); it && candidates.isEmpty(); it = it->previous())
bindings()->lookupInScope(name, it->scope(), &candidates, /* templateId = */ 0, /*binding=*/ 0);
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 18c6f4d60a6..34abe7be124 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -50,8 +50,6 @@ using namespace CPlusPlus;
namespace {
-const bool debug = ! qgetenv("CPLUSPLUS_DEBUG").isEmpty();
-
template <typename _Tp>
static QList<_Tp> removeDuplicates(const QList<_Tp> &results)
{
@@ -549,8 +547,11 @@ bool ResolveExpression::visit(ArrayAccessAST *ast)
QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const Name *memberName) const
{
+ Q_UNUSED(binding);
+ Q_UNUSED(memberName);
+
+ // ### port me
QList<LookupItem> members;
-#warning robe: enable template instantiation
#if 0
const QList<LookupItem> originalMembers = binding->find(memberName);
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index a3f328f0856..98e39ee8b2d 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -1852,7 +1852,7 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item, QChar t
if (! function->hasReturnType() && (function->identity() && !function->identity()->isDestructorNameId())) {
// Don't insert any magic, since the user might have just wanted to select the class
-#warning robe: "don't insert matching ( when the selected symbol is a template"
+ /// ### port me
#if 0
} else if (function->templateParameterCount() != 0 && typedChar != QLatin1Char('(')) {
// If there are no arguments, then we need the template specification
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index f81d0a8eb02..67d57f68a7f 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -124,8 +124,7 @@ QDebug operator<<(QDebug d, const Scope &scope)
str << " function";
if (scope.isFunction())
str << " prototype";
-#warning robe fix me
-#if 0
+#if 0 // ### port me
if (const Symbol *owner = &scope) {
str << " owner: ";
debugCppSymbolRecursion(str, o, *owner, false, 0);
diff --git a/src/shared/cplusplus/CheckExpression.cpp b/src/shared/cplusplus/CheckExpression.cpp
index 544dc95cead..1f402dca553 100644
--- a/src/shared/cplusplus/CheckExpression.cpp
+++ b/src/shared/cplusplus/CheckExpression.cpp
@@ -312,8 +312,10 @@ bool CheckExpression::visit(UnaryExpressionAST *ast)
bool CheckExpression::visit(QtMethodAST *ast)
{
+ (void) ast;
+ // ### port this code
+#if 0
const Name *name = 0;
-#warning robe set a valid scope
Scope *dummy = 0;
FullySpecifiedType methTy = semantic()->check(ast->declarator, FullySpecifiedType(),
dummy, &name);
@@ -328,6 +330,7 @@ bool CheckExpression::visit(QtMethodAST *ast)
"argument should be anonymous");
}
}
+#endif
return false;
}
diff --git a/src/shared/cplusplus/Symbols.cpp b/src/shared/cplusplus/Symbols.cpp
index 23f17de6df4..a2259e715ae 100644
--- a/src/shared/cplusplus/Symbols.cpp
+++ b/src/shared/cplusplus/Symbols.cpp
@@ -963,7 +963,7 @@ bool ObjCMethod::hasReturnType() const
unsigned ObjCMethod::argumentCount() const
{
-#warning robe implement me
+ // ### port me
return memberCount();
}
diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp
index e1c4074a79a..56869fe1010 100644
--- a/tests/auto/cplusplus/ast/tst_ast.cpp
+++ b/tests/auto/cplusplus/ast/tst_ast.cpp
@@ -22,7 +22,7 @@ public:
bool blockErrors = false,
bool qtMocRun = false)
{
- const StringLiteral *fileId = control.findOrInsertStringLiteral("<stdin>");
+ const StringLiteral *fileId = control.stringLiteral("<stdin>");
TranslationUnit *unit = new TranslationUnit(&control, fileId);
unit->setObjCEnabled(true);
unit->setQtMocRunEnabled(qtMocRun);
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp
index 6ae4eaaa945..56b78cde64f 100644
--- a/tests/auto/cplusplus/semantic/tst_semantic.cpp
+++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp
@@ -38,7 +38,7 @@ public:
bool enableObjc,
bool qtMocRun)
{
- const StringLiteral *fileId = control->findOrInsertStringLiteral("<stdin>");
+ const StringLiteral *fileId = control->stringLiteral("<stdin>");
TranslationUnit *unit = new TranslationUnit(control.data(), fileId);
unit->setSource(source.constData(), source.length());
unit->setObjCEnabled(enableObjc);
--
GitLab