diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2017-04-18 11:22:45 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2017-04-18 21:29:34 +0200 |
| commit | 738136266abc41f5bfd719793face1b65f8b8c68 (patch) | |
| tree | 09a4a66c06d95558b38ae8c25808832139443c5c | |
| parent | d4196fab96fcac9943b36056aa8659bea66272a4 (diff) | |
| download | glibmm-738136266abc41f5bfd719793face1b65f8b8c68.tar.gz | |
Gio::Converter: Put enums inside class.
Change ConverterFlags and ConverterResult to Converter::Flags and Covnerter::Result.
| -rw-r--r-- | gio/src/converter.ccg | 3 | ||||
| -rw-r--r-- | gio/src/converter.hg | 9 | ||||
| -rw-r--r-- | tools/m4/convert_gio.m4 | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/gio/src/converter.ccg b/gio/src/converter.ccg index b80d676f..0f2d2002 100644 --- a/gio/src/converter.ccg +++ b/gio/src/converter.ccg @@ -19,6 +19,9 @@ #include <gio/gio.h> +using Flags = Gio::Converter::Flags; +using Result = Gio::Converter::Result; + namespace Gio { diff --git a/gio/src/converter.hg b/gio/src/converter.hg index 03195355..cde99f81 100644 --- a/gio/src/converter.hg +++ b/gio/src/converter.hg @@ -30,8 +30,6 @@ typedef struct _GConverterIface GConverterIface; namespace Gio { -_WRAP_ENUM(ConverterResult, GConverterResult) -_WRAP_ENUM(ConverterFlags, GConverterFlags) /** Converter - Data conversion interface. * Converter is implemented by objects that convert binary data in various @@ -47,11 +45,14 @@ class Converter : public Glib::Interface _CLASS_INTERFACE(Converter, GConverter, G_CONVERTER, GConverterIface) public: - _WRAP_METHOD(ConverterResult convert(const void* inbuf, gsize inbuf_size, void* outbuf, gsize outbuf_size, ConverterFlags flags, gsize& bytes_read, gsize& bytes_written), g_converter_convert, errthrow) + _WRAP_ENUM(Result, GConverterResult) + _WRAP_ENUM(Flags, GConverterFlags) + + _WRAP_METHOD(Result convert(const void* inbuf, gsize inbuf_size, void* outbuf, gsize outbuf_size, Flags flags, gsize& bytes_read, gsize& bytes_written), g_converter_convert, errthrow) _WRAP_METHOD(void reset(), g_converter_reset) #m4 _CONVERSION(`gsize*',`gsize&',`*($3)') - _WRAP_VFUNC(ConverterResult convert(const void* inbuf, gsize inbuf_size, void* outbuf, gsize outbuf_size, ConverterFlags flags, gsize& bytes_read, gsize& bytes_written), "convert", errthrow) + _WRAP_VFUNC(Result convert(const void* inbuf, gsize inbuf_size, void* outbuf, gsize outbuf_size, Flags flags, gsize& bytes_read, gsize& bytes_written), "convert", errthrow) _WRAP_VFUNC(void reset(), "reset") }; diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index d5aceb36..d4cf3b8a 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -29,8 +29,8 @@ _CONV_GIO_INCLASS_ENUM(AppInfo,CreateFlags) _CONV_GIO_INCLASS_ENUM(Application,Flags) _CONV_GIO_ENUM(AskPasswordFlags) _CONV_GIO_ENUM(BusType) -_CONV_GIO_ENUM(ConverterFlags) -_CONV_GIO_ENUM(ConverterResult) +_CONV_GIO_INCLASS_ENUM(Converter,Flags) +_CONV_GIO_INCLASS_ENUM(Converter,Result) _CONV_GIO_ENUM(CredentialsType) _CONV_GIO_ENUM(DataStreamByteOrder) _CONV_GIO_ENUM(DataStreamNewlineType) |