diff options
| author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
|---|---|---|
| committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
| commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
| tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/glibmm/error.h | |
| parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
| parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
| download | glibmm-gir-gmmproc.tar.gz | |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/glibmm/error.h')
| -rw-r--r-- | glib/glibmm/error.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glib/glibmm/error.h b/glib/glibmm/error.h index b68df859..1886d9a7 100644 --- a/glib/glibmm/error.h +++ b/glib/glibmm/error.h @@ -32,19 +32,19 @@ class Error : public Glib::Exception { public: Error(); - Error(GQuark domain, int code, const Glib::ustring& message); + Error(GQuark error_domain, int error_code, const Glib::ustring& message); explicit Error(GError* gobject, bool take_copy = false); Error(const Error& other); Error& operator=(const Error& other); - virtual ~Error() throw(); + virtual ~Error() noexcept; GQuark domain() const; int code() const; virtual Glib::ustring what() const; - bool matches(GQuark domain, int code) const; + bool matches(GQuark error_domain, int error_code) const; GError* gobj(); const GError* gobj() const; @@ -57,7 +57,7 @@ public: static void register_init(); static void register_cleanup(); - static void register_domain(GQuark domain, ThrowFunc throw_func); + static void register_domain(GQuark error_domain, ThrowFunc throw_func); static void throw_exception(GError* gobject) G_GNUC_NORETURN; |