Merge with 24abc68c7d7738a9cc5d85c19f9531d46d0a98af

--HG--
branch : develop
This commit is contained in:
cosina 2013-12-19 11:45:50 +01:00
commit c1bbd5a2e7
8 changed files with 9 additions and 9 deletions

4
dist/debian/control vendored
View File

@ -2,12 +2,12 @@ Source: valentina
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Roman Telezhinsky <dismine@gmail.com> Maintainer: Roman Telezhinsky <dismine@gmail.com>
Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.0.0), libqt5svg5-dev (>= 5.0.0), ccache (>= 3.1.9), g++ (>= 4.6.0), qt5-default (>= 5.0.0), qttools5-dev-tools (>= 5.0.0) Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.0.0), libqt5svg5-dev (>= 5.0.0), ccache (>= 3.1.7), g++ (>= 4.6.0), qt5-default (>= 5.0.0), qttools5-dev-tools (>= 5.0.0)
Standards-Version: 3.9.4 Standards-Version: 3.9.4
Homepage: https://bitbucket.org/dismine/valentina Homepage: https://bitbucket.org/dismine/valentina
Package: valentina Package: valentina
Architecture: i386 Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Pattern making program. Description: Pattern making program.
Open source project of creating a pattern making program, whose allow Open source project of creating a pattern making program, whose allow

View File

@ -49,7 +49,7 @@ public:
* @param e exception * @param e exception
*/ */
VException(const VException &e):what(e.What()){} VException(const VException &e):what(e.What()){}
virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){} virtual ~VException() noexcept (true){}
/** /**
* @brief raise method raise for exception * @brief raise method raise for exception
*/ */

View File

@ -57,7 +57,7 @@ public:
*/ */
VExceptionBadId(const VExceptionBadId &e) VExceptionBadId(const VExceptionBadId &e)
:VException(e), id(e.BadId()), key(e.BadKey()){} :VException(e), id(e.BadId()), key(e.BadKey()){}
virtual ~VExceptionBadId() Q_DECL_NOEXCEPT_EXPR(true){} virtual ~VExceptionBadId() noexcept (true){}
/** /**
* @brief ErrorMessage return main error message * @brief ErrorMessage return main error message
* @return main error message * @return main error message

View File

@ -49,7 +49,7 @@ public:
*/ */
VExceptionConversionError(const VExceptionConversionError &e) VExceptionConversionError(const VExceptionConversionError &e)
:VException(e), str(e.String()){} :VException(e), str(e.String()){}
virtual ~VExceptionConversionError() Q_DECL_NOEXCEPT_EXPR(true) {} virtual ~VExceptionConversionError() noexcept (true) {}
/** /**
* @brief ErrorMessage return main error message * @brief ErrorMessage return main error message
* @return main error message * @return main error message

View File

@ -53,7 +53,7 @@ public:
VExceptionEmptyParameter(const VExceptionEmptyParameter &e) VExceptionEmptyParameter(const VExceptionEmptyParameter &e)
:VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()),
lineNumber(e.LineNumber()){} lineNumber(e.LineNumber()){}
virtual ~VExceptionEmptyParameter() Q_DECL_NOEXCEPT_EXPR(true) {} virtual ~VExceptionEmptyParameter() noexcept (true) {}
/** /**
* @brief ErrorMessage return main error message * @brief ErrorMessage return main error message
* @return main error message * @return main error message

View File

@ -52,7 +52,7 @@ public:
VExceptionObjectError(const VExceptionObjectError &e) VExceptionObjectError(const VExceptionObjectError &e)
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()),
moreInfo(e.MoreInformation()){} moreInfo(e.MoreInformation()){}
virtual ~VExceptionObjectError() Q_DECL_NOEXCEPT_EXPR(true) {} virtual ~VExceptionObjectError() noexcept (true) {}
/** /**
* @brief ErrorMessage return main error message * @brief ErrorMessage return main error message
* @return main error message * @return main error message

View File

@ -51,7 +51,7 @@ public:
*/ */
VExceptionUniqueId(const VExceptionUniqueId &e) VExceptionUniqueId(const VExceptionUniqueId &e)
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){}
virtual ~VExceptionUniqueId() Q_DECL_NOEXCEPT_EXPR(true){} virtual ~VExceptionUniqueId() noexcept (true){}
/** /**
* @brief ErrorMessage return main error message * @brief ErrorMessage return main error message
* @return main error message * @return main error message

View File

@ -51,7 +51,7 @@ public:
*/ */
VExceptionWrongParameterId(const VExceptionWrongParameterId &e) VExceptionWrongParameterId(const VExceptionWrongParameterId &e)
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){}
virtual ~VExceptionWrongParameterId() Q_DECL_NOEXCEPT_EXPR(true){} virtual ~VExceptionWrongParameterId() noexcept (true){}
/** /**
* @brief ErrorMessage return main error message * @brief ErrorMessage return main error message
* @return main error message * @return main error message