diff --git a/exception/vexception.h b/exception/vexception.h index 87b34cfc0..94b064d21 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -29,8 +29,8 @@ class VException : public QException { public: VException(const QString &what); - VException(const VException &e):what(e.What()){} - virtual ~VException() noexcept(true){} + VException(const VException &e):what(e.What()){} + virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){} inline void raise() const { throw *this; } inline VException *clone() const { return new VException(*this); } virtual QString ErrorMessage() const; diff --git a/exception/vexceptionbadid.h b/exception/vexceptionbadid.h index 6ddf034c5..dbf1b17a1 100644 --- a/exception/vexceptionbadid.h +++ b/exception/vexceptionbadid.h @@ -33,7 +33,7 @@ public: :VException(what), id(0), key(key){} VExceptionBadId(const VExceptionBadId &e) :VException(e), id(e.BadId()), key(e.BadKey()){} - virtual ~VExceptionBadId() noexcept(true){} + virtual ~VExceptionBadId() Q_DECL_NOEXCEPT_EXPR(true){} virtual QString ErrorMessage() const; inline qint64 BadId() const {return id; } inline QString BadKey() const {return key; } diff --git a/exception/vexceptionconversionerror.h b/exception/vexceptionconversionerror.h index bd8313b3d..0e88427ab 100644 --- a/exception/vexceptionconversionerror.h +++ b/exception/vexceptionconversionerror.h @@ -30,7 +30,7 @@ public: VExceptionConversionError(const QString &what, const QString &str); VExceptionConversionError(const VExceptionConversionError &e) :VException(e), str(e.String()){} - virtual ~VExceptionConversionError() noexcept(true) {} + virtual ~VExceptionConversionError() Q_DECL_NOEXCEPT_EXPR(true) {} virtual QString ErrorMessage() const; inline QString String() const {return str;} protected: diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h index c7fbae985..7dfbaa2ea 100644 --- a/exception/vexceptionemptyparameter.h +++ b/exception/vexceptionemptyparameter.h @@ -31,7 +31,7 @@ public: VExceptionEmptyParameter(const VExceptionEmptyParameter &e) :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionEmptyParameter() noexcept(true) {} + virtual ~VExceptionEmptyParameter() Q_DECL_NOEXCEPT_EXPR(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString Name() const {return name;} diff --git a/exception/vexceptionobjecterror.h b/exception/vexceptionobjecterror.h index f564347b8..76cdebbec 100644 --- a/exception/vexceptionobjecterror.h +++ b/exception/vexceptionobjecterror.h @@ -31,7 +31,7 @@ public: VExceptionObjectError(const VExceptionObjectError &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), moreInfo(e.MoreInformation()){} - virtual ~VExceptionObjectError() noexcept(true) {} + virtual ~VExceptionObjectError() Q_DECL_NOEXCEPT_EXPR(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString TagText() const {return tagText;} diff --git a/exception/vexceptionuniqueid.h b/exception/vexceptionuniqueid.h index d3d618598..f34f2e56e 100644 --- a/exception/vexceptionuniqueid.h +++ b/exception/vexceptionuniqueid.h @@ -30,7 +30,7 @@ public: VExceptionUniqueId(const QString &what, const QDomElement &domElement); VExceptionUniqueId(const VExceptionUniqueId &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionUniqueId() noexcept(true){} + virtual ~VExceptionUniqueId() Q_DECL_NOEXCEPT_EXPR(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString TagText() const {return tagText;} diff --git a/exception/vexceptionwrongparameterid.h b/exception/vexceptionwrongparameterid.h index 905f32f11..69de87b8c 100644 --- a/exception/vexceptionwrongparameterid.h +++ b/exception/vexceptionwrongparameterid.h @@ -30,7 +30,7 @@ public: VExceptionWrongParameterId(const QString &what, const QDomElement &domElement); VExceptionWrongParameterId(const VExceptionWrongParameterId &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionWrongParameterId() noexcept(true){} + virtual ~VExceptionWrongParameterId() Q_DECL_NOEXCEPT_EXPR(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString TagText() const {return tagText;}