Fix build with msvc2010

override on destructors are not very useful anyhow, but also msvc2010
doesn't like them at all.

Change-Id: I2d5f4b0d6148c5e66d2cba604d305707269d12e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-02-07 09:01:53 +01:00
parent e9cf16b701
commit 39a29dcfd9
9 changed files with 21 additions and 21 deletions

View File

@@ -49,7 +49,7 @@ class QMLJS_EXPORT JsonCheck : public AST::Visitor
{ {
public: public:
JsonCheck(Document::Ptr doc); JsonCheck(Document::Ptr doc);
~JsonCheck() QTC_OVERRIDE; ~JsonCheck();
QList<StaticAnalysis::Message> operator()(Utils::JsonSchema *schema); QList<StaticAnalysis::Message> operator()(Utils::JsonSchema *schema);

View File

@@ -49,7 +49,7 @@ class QMLJS_EXPORT Bind: protected AST::Visitor
public: public:
Bind(Document *doc, QList<DiagnosticMessage> *messages, Bind(Document *doc, QList<DiagnosticMessage> *messages,
bool isJsLibrary, const QList<ImportInfo> &jsImports); bool isJsLibrary, const QList<ImportInfo> &jsImports);
~Bind() QTC_OVERRIDE; ~Bind();
bool isJsLibrary() const; bool isJsLibrary() const;
QList<ImportInfo> imports() const; QList<ImportInfo> imports() const;

View File

@@ -53,7 +53,7 @@ class QMLJS_EXPORT Check: protected AST::Visitor
public: public:
// prefer taking root scope chain? // prefer taking root scope chain?
Check(Document::Ptr doc, const ContextPtr &context); Check(Document::Ptr doc, const ContextPtr &context);
~Check() QTC_OVERRIDE; ~Check();
QList<StaticAnalysis::Message> operator()(); QList<StaticAnalysis::Message> operator()();

View File

@@ -48,7 +48,7 @@ class QMLJS_EXPORT Evaluate: protected AST::Visitor
{ {
public: public:
Evaluate(const ScopeChain *scopeChain, ReferenceContext *referenceContext = 0); Evaluate(const ScopeChain *scopeChain, ReferenceContext *referenceContext = 0);
~Evaluate() QTC_OVERRIDE; ~Evaluate();
// same as value() // same as value()
const Value *operator()(AST::Node *ast); const Value *operator()(AST::Node *ast);

View File

@@ -354,7 +354,7 @@ class QMLJS_EXPORT Reference: public Value
{ {
public: public:
Reference(ValueOwner *valueOwner); Reference(ValueOwner *valueOwner);
~Reference() QTC_OVERRIDE; ~Reference();
ValueOwner *valueOwner() const; ValueOwner *valueOwner() const;
@@ -389,7 +389,7 @@ class QMLJS_EXPORT ObjectValue: public Value
{ {
public: public:
ObjectValue(ValueOwner *valueOwner); ObjectValue(ValueOwner *valueOwner);
~ObjectValue() QTC_OVERRIDE; ~ObjectValue();
ValueOwner *valueOwner() const; ValueOwner *valueOwner() const;
@@ -465,7 +465,7 @@ class QMLJS_EXPORT QmlEnumValue: public NumberValue
{ {
public: public:
QmlEnumValue(const CppComponentValue *owner, int index); QmlEnumValue(const CppComponentValue *owner, int index);
~QmlEnumValue() QTC_OVERRIDE; ~QmlEnumValue();
const QmlEnumValue *asQmlEnumValue() const QTC_OVERRIDE; const QmlEnumValue *asQmlEnumValue() const QTC_OVERRIDE;
@@ -488,7 +488,7 @@ public:
const QString &moduleName, const LanguageUtils::ComponentVersion &componentVersion, const QString &moduleName, const LanguageUtils::ComponentVersion &componentVersion,
const LanguageUtils::ComponentVersion &importVersion, int metaObjectRevision, const LanguageUtils::ComponentVersion &importVersion, int metaObjectRevision,
ValueOwner *valueOwner); ValueOwner *valueOwner);
~CppComponentValue() QTC_OVERRIDE; ~CppComponentValue();
const CppComponentValue *asCppComponentValue() const QTC_OVERRIDE; const CppComponentValue *asCppComponentValue() const QTC_OVERRIDE;
@@ -538,7 +538,7 @@ class QMLJS_EXPORT FunctionValue: public ObjectValue
{ {
public: public:
FunctionValue(ValueOwner *valueOwner); FunctionValue(ValueOwner *valueOwner);
~FunctionValue() QTC_OVERRIDE; ~FunctionValue();
virtual const Value *returnValue() const; virtual const Value *returnValue() const;
@@ -569,7 +569,7 @@ class QMLJS_EXPORT Function: public FunctionValue
{ {
public: public:
Function(ValueOwner *valueOwner); Function(ValueOwner *valueOwner);
~Function() QTC_OVERRIDE; ~Function();
void addArgument(const Value *argument, const QString &name = QString()); void addArgument(const Value *argument, const QString &name = QString());
void setReturnValue(const Value *returnValue); void setReturnValue(const Value *returnValue);
@@ -745,7 +745,7 @@ class QMLJS_EXPORT QmlPrototypeReference: public Reference
{ {
public: public:
QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, ValueOwner *valueOwner); QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, ValueOwner *valueOwner);
~QmlPrototypeReference() QTC_OVERRIDE; ~QmlPrototypeReference();
const QmlPrototypeReference *asQmlPrototypeReference() const QTC_OVERRIDE; const QmlPrototypeReference *asQmlPrototypeReference() const QTC_OVERRIDE;
@@ -765,7 +765,7 @@ class QMLJS_EXPORT ASTVariableReference: public Reference
public: public:
ASTVariableReference(AST::VariableDeclaration *ast, const Document *doc, ValueOwner *valueOwner); ASTVariableReference(AST::VariableDeclaration *ast, const Document *doc, ValueOwner *valueOwner);
~ASTVariableReference() QTC_OVERRIDE; ~ASTVariableReference();
private: private:
const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE; const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
@@ -781,7 +781,7 @@ class QMLJS_EXPORT ASTFunctionValue: public FunctionValue
public: public:
ASTFunctionValue(AST::FunctionExpression *ast, const Document *doc, ValueOwner *valueOwner); ASTFunctionValue(AST::FunctionExpression *ast, const Document *doc, ValueOwner *valueOwner);
~ASTFunctionValue() QTC_OVERRIDE; ~ASTFunctionValue();
AST::FunctionExpression *ast() const; AST::FunctionExpression *ast() const;
@@ -800,7 +800,7 @@ class QMLJS_EXPORT ASTPropertyReference: public Reference
public: public:
ASTPropertyReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner); ASTPropertyReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTPropertyReference() QTC_OVERRIDE; ~ASTPropertyReference();
const ASTPropertyReference *asAstPropertyReference() const QTC_OVERRIDE; const ASTPropertyReference *asAstPropertyReference() const QTC_OVERRIDE;
@@ -822,7 +822,7 @@ class QMLJS_EXPORT ASTSignal: public FunctionValue
public: public:
ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner); ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTSignal() QTC_OVERRIDE; ~ASTSignal();
const ASTSignal *asAstSignal() const QTC_OVERRIDE; const ASTSignal *asAstSignal() const QTC_OVERRIDE;
@@ -853,7 +853,7 @@ public:
AST::UiObjectInitializer *initializer, AST::UiObjectInitializer *initializer,
const Document *doc, const Document *doc,
ValueOwner *valueOwner); ValueOwner *valueOwner);
~ASTObjectValue() QTC_OVERRIDE; ~ASTObjectValue();
const ASTObjectValue *asAstObjectValue() const QTC_OVERRIDE; const ASTObjectValue *asAstObjectValue() const QTC_OVERRIDE;

View File

@@ -52,7 +52,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
public: public:
IosBuildStep(ProjectExplorer::BuildStepList *parent); IosBuildStep(ProjectExplorer::BuildStepList *parent);
~IosBuildStep() QTC_OVERRIDE; ~IosBuildStep();
bool init() QTC_OVERRIDE; bool init() QTC_OVERRIDE;
void run(QFutureInterface<bool> &fi) QTC_OVERRIDE; void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
@@ -92,7 +92,7 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
IosBuildStepConfigWidget(IosBuildStep *buildStep); IosBuildStepConfigWidget(IosBuildStep *buildStep);
~IosBuildStepConfigWidget() QTC_OVERRIDE; ~IosBuildStepConfigWidget();
QString displayName() const QTC_OVERRIDE; QString displayName() const QTC_OVERRIDE;
QString summaryText() const QTC_OVERRIDE; QString summaryText() const QTC_OVERRIDE;

View File

@@ -66,7 +66,7 @@ public:
friend class IosDeployStepFactory; friend class IosDeployStepFactory;
IosDeployStep(ProjectExplorer::BuildStepList *bc); IosDeployStep(ProjectExplorer::BuildStepList *bc);
~IosDeployStep() QTC_OVERRIDE; ~IosDeployStep();
bool fromMap(const QVariantMap &map) QTC_OVERRIDE; bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const QTC_OVERRIDE; QVariantMap toMap() const QTC_OVERRIDE;

View File

@@ -46,7 +46,7 @@ class IosDeployStepWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
IosDeployStepWidget(IosDeployStep *step); IosDeployStepWidget(IosDeployStep *step);
~IosDeployStepWidget() QTC_OVERRIDE; ~IosDeployStepWidget();
private: private:
QString summaryText() const QTC_OVERRIDE; QString summaryText() const QTC_OVERRIDE;

View File

@@ -44,7 +44,7 @@ class IosRunControl : public ProjectExplorer::RunControl
public: public:
explicit IosRunControl(IosRunConfiguration *runConfig); explicit IosRunControl(IosRunConfiguration *runConfig);
~IosRunControl() QTC_OVERRIDE; ~IosRunControl();
void start() QTC_OVERRIDE; void start() QTC_OVERRIDE;