From c4ede7263d8ea457da8ee8c3879f32ec4bb435cb Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 19 Jul 2010 15:10:06 +0200
Subject: [PATCH] Get rid of the those ugly warnings.
---
src/libs/cplusplus/DeprecatedGenTemplateInstance.h | 2 +-
src/libs/cplusplus/LookupContext.cpp | 4 ++++
src/libs/cplusplus/LookupContext.h | 4 ++--
src/libs/cplusplus/ResolveExpression.h | 2 +-
src/plugins/texteditor/refactoringchanges.h | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
index 755fc341b59..f40c951ba50 100644
--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
@@ -46,7 +46,7 @@ public:
typedef QList< QPair<const Identifier *, FullySpecifiedType> > Substitution;
public:
- Q_DECL_DEPRECATED static FullySpecifiedType instantiate(const Name *className, Symbol *candidate, QSharedPointer<Control> control);
+ static FullySpecifiedType instantiate(const Name *className, Symbol *candidate, QSharedPointer<Control> control);
private:
DeprecatedGenTemplateInstance(QSharedPointer<Control> control, const Substitution &substitution);
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index dc8d3c06d59..e6e834de0e4 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -159,6 +159,10 @@ const Name *LookupContext::minimalName(const Name *name,
Scope *scope,
ClassOrNamespace *target) const
{
+ Q_UNUSED(name);
+ Q_UNUSED(scope);
+ Q_UNUSED(target);
+
qWarning() << "TODO:" << Q_FUNC_INFO;
#if 0
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index db6163f8d06..8dc459375a4 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/src/libs/cplusplus/LookupContext.h
@@ -231,8 +231,8 @@ public:
static QList<const Name *> fullyQualifiedName(Symbol *symbol);
static QList<const Name *> path(Symbol *symbol);
- Q_DECL_DEPRECATED const Name *minimalName(const Name *name, Scope *source,
- ClassOrNamespace *target) const;
+ const Name *minimalName(const Name *name, Scope *source,
+ ClassOrNamespace *target) const;
private:
// The current expression.
diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h
index 19692a37def..c57f88201ea 100644
--- a/src/libs/cplusplus/ResolveExpression.h
+++ b/src/libs/cplusplus/ResolveExpression.h
@@ -59,7 +59,7 @@ protected:
QList<LookupItem> switchResults(const QList<LookupItem> &symbols);
FullySpecifiedType instantiate(const Name *className, Symbol *candidate) const;
- Q_DECL_DEPRECATED QList<LookupItem> getMembers(ClassOrNamespace *binding, const Name *memberName) const;
+ QList<LookupItem> getMembers(ClassOrNamespace *binding, const Name *memberName) const;
void thisObject();
diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h
index f111123acd7..be3371bcc11 100644
--- a/src/plugins/texteditor/refactoringchanges.h
+++ b/src/plugins/texteditor/refactoringchanges.h
@@ -58,7 +58,7 @@ public:
virtual QStringList apply();
- Q_DECL_DEPRECATED int positionInFile(const QString &fileName, int line, int column = 0) const;
+ int positionInFile(const QString &fileName, int line, int column = 0) const;
static BaseTextEditor *editorForFile(const QString &fileName,
bool openIfClosed = false);
--
GitLab