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 > Substitution; public: - Q_DECL_DEPRECATED static FullySpecifiedType instantiate(const Name *className, Symbol *candidate, QSharedPointer control); + static FullySpecifiedType instantiate(const Name *className, Symbol *candidate, QSharedPointer control); private: DeprecatedGenTemplateInstance(QSharedPointer 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 fullyQualifiedName(Symbol *symbol); static QList 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 switchResults(const QList &symbols); FullySpecifiedType instantiate(const Name *className, Symbol *candidate) const; - Q_DECL_DEPRECATED QList getMembers(ClassOrNamespace *binding, const Name *memberName) const; + QList 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);