[glibmm] Gio::IOStream: Change IOStreamSpliceFlags to IOStream::SpliceFlags.



commit 73c0d2673e583bb5e2e8cb42d50ea32706f6265b
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 18 18:27:18 2017 +0200

    Gio::IOStream: Change IOStreamSpliceFlags to IOStream::SpliceFlags.

 gio/src/iostream.ccg |    4 ++--
 gio/src/iostream.hg  |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gio/src/iostream.ccg b/gio/src/iostream.ccg
index 6242c79..a278ddf 100644
--- a/gio/src/iostream.ccg
+++ b/gio/src/iostream.ccg
@@ -51,7 +51,7 @@ IOStream::close_async(const SlotAsyncReady& slot, int io_priority)
 
 void
 IOStream::splice_async(const Glib::RefPtr<IOStream>& stream2, const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable, IOStreamSpliceFlags flags, int io_priority)
+  const Glib::RefPtr<Cancellable>& cancellable, SpliceFlags flags, int io_priority)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -64,7 +64,7 @@ IOStream::splice_async(const Glib::RefPtr<IOStream>& stream2, const SlotAsyncRea
 
 void
 IOStream::splice_async(const Glib::RefPtr<IOStream>& stream2, const SlotAsyncReady& slot,
-  IOStreamSpliceFlags flags, int io_priority)
+  SpliceFlags flags, int io_priority)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
diff --git a/gio/src/iostream.hg b/gio/src/iostream.hg
index 0f6a3cf..1051b96 100644
--- a/gio/src/iostream.hg
+++ b/gio/src/iostream.hg
@@ -28,8 +28,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(IOStreamSpliceFlags, GIOStreamSpliceFlags, NO_GTYPE)
-
 /** IOStream - Base class for implementing read/write streams.
  * IOStream represents an object that has both read and write streams.
  * Generally the two streams acts as separate input and output streams, but
@@ -65,6 +63,8 @@ class IOStream : public Glib::Object
 
 public:
 
+  _WRAP_ENUM(SpliceFlags, GIOStreamSpliceFlags, NO_GTYPE)
+
   /**  Asyncronously splice the output stream to the input stream of @a
    * stream2, and splice the output stream of @a stream2 to the input stream of
    * this stream.
@@ -75,21 +75,21 @@ public:
    * @param stream2 The second IOStream.
    * @param slot A SlotAsyncReady slot.
    * @param cancellable A Cancellable object.
-   * @param flags A set of IOStreamSpliceFlags.
+   * @param flags A set of SpliceFlags.
    * @param io_priority The io priority of the request.
    *
    * @newin{2,34}
    */
   void splice_async(const Glib::RefPtr<IOStream>& stream2,
     const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
-    IOStreamSpliceFlags flags = Gio::IOStreamSpliceFlags::NONE,
+    SpliceFlags flags = SpliceFlags::NONE,
     int io_priority = Glib::PRIORITY_DEFAULT);
   _IGNORE(g_io_stream_splice_async)
 
   /// A non-cancellable version of splice_async().
   void splice_async(const Glib::RefPtr<IOStream>& stream2,
     const SlotAsyncReady& slot,
-    IOStreamSpliceFlags flags = Gio::IOStreamSpliceFlags::NONE,
+    SpliceFlags flags = SpliceFlags::NONE,
     int io_priority = Glib::PRIORITY_DEFAULT);
 
   _WRAP_METHOD(static bool splice_finish(const Glib::RefPtr<AsyncResult>& result), 
g_io_stream_splice_finish, errthrow)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]