glibmm r566 - in trunk: . gio gio/src tools/m4

[jjongsma svn gnome org]

Author: jjongsma
Date: Sun Feb  3 03:22:09 2008
New Revision: 566
URL: http://svn.gnome.org/viewvc/glibmm?rev=566&view=rev

Log:
	* gio/giomm.h:
	* gio/src/Makefile_list_of_hg.am_fragment:
	* gio/src/filteroutputstream.ccg:
	* gio/src/filteroutputstream.hg:
	* tools/m4/convert_gio.m4: add FilterOutputStream class



Added:
   trunk/gio/src/filteroutputstream.ccg
   trunk/gio/src/filteroutputstream.hg
Modified:
   trunk/ChangeLog
   trunk/gio/giomm.h
   trunk/gio/src/Makefile_list_of_hg.am_fragment
   trunk/tools/m4/convert_gio.m4

Modified: trunk/gio/giomm.h
==============================================================================
--- trunk/gio/giomm.h	(original)
+++ trunk/gio/giomm.h	Sun Feb  3 03:22:09 2008
@@ -23,6 +23,7 @@
 #include <giomm/appinfo.h>
 #include <giomm/asyncresult.h>
 #include <giomm/bufferedinputstream.h>
+#include <giomm/bufferedoutputstream.h>
 #include <giomm/cancellable.h>
 #include <giomm/datainputstream.h>
 #include <giomm/drive.h>
@@ -36,6 +37,7 @@
 #include <giomm/filemonitor.h>
 #include <giomm/fileoutputstream.h>
 #include <giomm/filterinputstream.h>
+#include <giomm/filteroutputstream.h>
 #include <giomm/icon.h>
 #include <giomm/init.h>
 #include <giomm/inputstream.h>

Modified: trunk/gio/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- trunk/gio/src/Makefile_list_of_hg.am_fragment	(original)
+++ trunk/gio/src/Makefile_list_of_hg.am_fragment	Sun Feb  3 03:22:09 2008
@@ -7,10 +7,10 @@
 files_win32_hg =
 files_general_hg = appinfo.hg asyncresult.hg cancellable.hg drive.hg error.hg file.hg fileattributeinfo.hg \
 				   fileattributeinfolist.hg fileenumerator.hg fileicon.hg fileinfo.hg fileinputstream.hg fileoutputstream.hg \
-				   filemonitor.hg filterinputstream.hg \
+				   filemonitor.hg filterinputstream.hg filteroutputstream.hg \
 				   icon.hg inputstream.hg loadableicon.hg mount.hg mountoperation.hg outputstream.hg \
 				   seekable.hg simpleasyncresult.hg volume.hg volumemonitor.hg bufferedinputstream.hg \
-				   datainputstream.hg
+				   bufferedoutputstream.hg datainputstream.hg
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 

Added: trunk/gio/src/filteroutputstream.ccg
==============================================================================
--- (empty file)
+++ trunk/gio/src/filteroutputstream.ccg	Sun Feb  3 03:22:09 2008
@@ -0,0 +1,20 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* Copyright (C) 2008 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gio/gio.h>

Added: trunk/gio/src/filteroutputstream.hg
==============================================================================
--- (empty file)
+++ trunk/gio/src/filteroutputstream.hg	Sun Feb  3 03:22:09 2008
@@ -0,0 +1,42 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* Copyright (C) 2008 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <giomm/outputstream.h>
+#include <glibmm/object.h>
+
+_DEFS(giomm,gio)
+_PINCLUDE(giomm/private/outputstream_p.h)
+
+namespace Gio
+{
+
+class FilterOutputStream : public Gio::OutputStream
+{
+  _CLASS_GOBJECT(FilterOutputStream, GFilterOutputStream, G_FILTER_OUTPUT_STREAM, Gio::OutputStream, GOutputStream)
+public:
+  _WRAP_METHOD(Glib::RefPtr<OutputStream> get_base_stream(),
+               g_filter_output_stream_get_base_stream,
+               refreturn)
+
+  _WRAP_METHOD(Glib::RefPtr<const OutputStream> get_base_stream() const,
+               g_filter_output_stream_get_base_stream,
+               refreturn, constversion)
+};
+
+} // namespace Gio

Modified: trunk/tools/m4/convert_gio.m4
==============================================================================
--- trunk/tools/m4/convert_gio.m4	(original)
+++ trunk/tools/m4/convert_gio.m4	Sun Feb  3 03:22:09 2008
@@ -90,6 +90,10 @@
 _CONVERSION(`GPasswordSave',`PasswordSave',`($2)$3')
 _CONVERSION(`PasswordSave',`GPasswordSave',`($2)$3')
 
+# OutputStream
+_CONVERSION(`GOutputStream*',`Glib::RefPtr<OutputStream>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<OutputStream>&',`GOutputStream*',__CONVERT_CONST_REFPTR_TO_P)
+
 #Volume
 _CONVERSION(`GVolume*',`Glib::RefPtr<Volume>',`Glib::wrap($3)')