diff options
Diffstat (limited to 'src/uri.cpp')
| -rw-r--r-- | src/uri.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/uri.cpp b/src/uri.cpp index 49bdab63c..9178c8ae8 100644 --- a/src/uri.cpp +++ b/src/uri.cpp @@ -8,12 +8,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib.h> #include "uri.h" -#include <string> + #include <glibmm/ustring.h> #include <glibmm/miscutils.h> +#include "bad-uri-exception.h" + namespace Inkscape { URI::URI() { @@ -26,7 +27,7 @@ URI::URI(const URI &uri) { _impl = uri._impl; } -URI::URI(gchar const *preformed) throw(BadURIException) { +URI::URI(gchar const *preformed) { xmlURIPtr uri; if (!preformed) { throw MalformedURIException(); @@ -133,7 +134,7 @@ const gchar *URI::Impl::getOpaque() const { return (gchar *)_uri->opaque; } -gchar *URI::to_native_filename(gchar const* uri) throw(BadURIException) +gchar *URI::to_native_filename(gchar const* uri) { gchar *filename = NULL; URI tmp(uri); @@ -167,7 +168,7 @@ const std::string URI::getFullPath(std::string const &base) const { /* TODO !!! proper error handling */ -gchar *URI::toNativeFilename() const throw(BadURIException) { +gchar *URI::toNativeFilename() const { gchar *uriString = toString(); if (isRelativePath()) { return uriString; @@ -182,7 +183,7 @@ gchar *URI::toNativeFilename() const throw(BadURIException) { } } -URI URI::fromUtf8( gchar const* path ) throw (BadURIException) { +URI URI::fromUtf8( gchar const* path ) { if ( !path ) { throw MalformedURIException(); } @@ -216,7 +217,7 @@ URI URI::fromUtf8( gchar const* path ) throw (BadURIException) { } /* TODO !!! proper error handling */ -URI URI::from_native_filename(gchar const *path) throw(BadURIException) { +URI URI::from_native_filename(gchar const *path) { gchar *uri = g_filename_to_uri(path, NULL, NULL); URI result(uri); g_free( uri ); |