diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bad-uri-exception.h | 4 | ||||
| -rw-r--r-- | src/display/drawing-item.h | 2 | ||||
| -rw-r--r-- | src/extension/input.h | 12 | ||||
| -rw-r--r-- | src/io/inkscapestream.h | 8 | ||||
| -rw-r--r-- | src/util/expression-evaluator.h | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/bad-uri-exception.h b/src/bad-uri-exception.h index 6ebb10d13..450207187 100644 --- a/src/bad-uri-exception.h +++ b/src/bad-uri-exception.h @@ -9,12 +9,12 @@ class BadURIException : public std::exception {}; class UnsupportedURIException : public BadURIException { public: - char const *what() const throw() override { return "Unsupported URI"; } + char const *what() const noexcept override { return "Unsupported URI"; } }; class MalformedURIException : public BadURIException { public: - char const *what() const throw() override { return "Malformed URI"; } + char const *what() const noexcept override { return "Malformed URI"; } }; } diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h index b688b467c..5cd6c987f 100644 --- a/src/display/drawing-item.h +++ b/src/display/drawing-item.h @@ -59,7 +59,7 @@ struct CacheRecord typedef std::list<CacheRecord> CacheList; class InvalidItemException : public std::exception { - const char *what() const throw() override { + const char *what() const noexcept override { return "Invalid item in drawing"; } }; diff --git a/src/extension/input.h b/src/extension/input.h index 426f77ccc..c433272ca 100644 --- a/src/extension/input.h +++ b/src/extension/input.h @@ -31,16 +31,16 @@ public: /* this is a hack for this release, this will be private shortly */ public: struct open_failed : public std::exception { - ~open_failed() throw() override = default; - const char *what() const throw() override { return "Open failed"; } + ~open_failed() noexcept override = default; + const char *what() const noexcept override { return "Open failed"; } }; struct no_extension_found : public std::exception { - ~no_extension_found() throw() override = default; - const char *what() const throw() override { return "No suitable input extension found"; } + ~no_extension_found() noexcept override = default; + const char *what() const noexcept override { return "No suitable input extension found"; } }; struct open_cancelled : public std::exception { - ~open_cancelled() throw() override = default; - const char *what() const throw() override { return "Open was cancelled"; } + ~open_cancelled() noexcept override = default; + const char *what() const noexcept override { return "Open was cancelled"; } }; Input (Inkscape::XML::Node * in_repr, diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h index da6d320d8..2e0a7aa20 100644 --- a/src/io/inkscapestream.h +++ b/src/io/inkscapestream.h @@ -21,13 +21,13 @@ class StreamException : public std::exception { public: - StreamException(const char *theReason) throw() + StreamException(const char *theReason) noexcept { reason = theReason; } - StreamException(Glib::ustring &theReason) throw() + StreamException(Glib::ustring &theReason) noexcept { reason = theReason; } - ~StreamException() throw() override + ~StreamException() noexcept override = default; - char const *what() const throw() override + char const *what() const noexcept override { return reason.c_str(); } private: diff --git a/src/util/expression-evaluator.h b/src/util/expression-evaluator.h index 23b431a8e..343278c53 100644 --- a/src/util/expression-evaluator.h +++ b/src/util/expression-evaluator.h @@ -177,9 +177,9 @@ public: msgstr = os.str(); } - ~EvaluatorException() throw() override = default; // necessary to destroy the string object!!! + ~EvaluatorException() noexcept override = default; // necessary to destroy the string object!!! - const char *what() const throw () override { + const char *what() const noexcept override { return msgstr.c_str(); } protected: |