diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2010-05-31 13:16:28 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2010-05-31 13:16:28 +0200 |
| commit | de7e9208edb460830accf5835afcbbf9ac4d212b (patch) | |
| tree | d74cd224716e60e11723a3ba2777f1a757c218fe /gio/src/loadableicon.ccg | |
| parent | f510673363137d691f5063bc68d9fa7bb3ef9709 (diff) | |
| download | glibmm-de7e9208edb460830accf5835afcbbf9ac4d212b.tar.gz | |
Remove the reduced API options and code, as discussed on mailing list.
* configure.ac: Removed the --enable-api-exceptions, --enable-api-properties,
--enable-api-vfuncs and --enable-api-default-signal-handlers options.
* build/reduced.m4: Removed.
* tools/m4/*.m4:
* tools/pm/Output.pm: Remove any use of ifdefs and auto_ptr for reduced API.
* *.[hg|ccg|h|cc]: Remove the idefed code.
Diffstat (limited to 'gio/src/loadableicon.ccg')
| -rw-r--r-- | gio/src/loadableicon.ccg | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg index 0a506b1e..34b024b2 100644 --- a/gio/src/loadableicon.ccg +++ b/gio/src/loadableicon.ccg @@ -24,13 +24,8 @@ namespace Gio { -#ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr<InputStream> LoadableIcon::load(int size, Glib::ustring& type, const Glib::RefPtr<Cancellable>& cancellable) -#else -Glib::RefPtr<InputStream> -LoadableIcon::load(int size, Glib::ustring& type, const Glib::RefPtr<Cancellable>& cancellable, std::auto_ptr<Glib::Error>& error) -#endif //GLIBMM_EXCEPTIONS_ENABLED { char* c_type; GError* gerror = 0; @@ -40,13 +35,8 @@ LoadableIcon::load(int size, Glib::ustring& type, const Glib::RefPtr<Cancellable &c_type, Glib::unwrap(cancellable), &gerror)); -#ifdef GLIBMM_EXCEPTIONS_ENABLED if(gerror) ::Glib::Error::throw_exception(gerror); -#else - if(gerror) - error = ::Glib::Error::throw_exception(gerror); -#endif //GLIBMM_EXCEPTIONS_ENABLED type = c_type; g_free(c_type); @@ -55,13 +45,8 @@ LoadableIcon::load(int size, Glib::ustring& type, const Glib::RefPtr<Cancellable return retval; } -#ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr<InputStream> LoadableIcon::load(int size, Glib::ustring& type) -#else -Glib::RefPtr<InputStream> -LoadableIcon::load(int size, Glib::ustring& type, std::auto_ptr<Glib::Error>& error) -#endif //GLIBMM_EXCEPTIONS_ENABLED { char* c_type; GError* gerror = 0; @@ -71,13 +56,8 @@ LoadableIcon::load(int size, Glib::ustring& type, std::auto_ptr<Glib::Error>& er &c_type, 0, &gerror)); -#ifdef GLIBMM_EXCEPTIONS_ENABLED if(gerror) ::Glib::Error::throw_exception(gerror); -#else - if(gerror) - error = ::Glib::Error::throw_exception(gerror); -#endif //GLIBMM_EXCEPTIONS_ENABLED type = c_type; g_free(c_type); |