diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h index 755fc341b59029f245df73eb1c8017358fba1e55..f40c951ba50e73e32c83bed06f70877e47d6b8ae 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 dc8d3c06d59ed7d665ecc79710e6f35ed0d29e87..e6e834de0e40463fe6c30663664039df9f3bcb2b 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 db6163f8d06af7aed5553011fa444f5e739e45bb..8dc459375a4283298ae14beeca69d7496a18a36a 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 19692a37def993f21b8d905a7d22b71305af901a..c57f88201ea667bb3597eb4b6d6ec95aa1a78929 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 f111123acd75b524bb184c35bd3348e425423c17..be3371bcc117b9be157cc68ce8c9fb82a5f97c1f 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);