X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgfileoutputstream.h;h=bec9f9125dcc19e8a2af72776a91cef25140f5bc;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=853f5d4c3e82a9d58e2e254d412c5578dad527c3;hpb=2c362b7f9eb7cc81f37970e24c5b5dcdc56ea6d5;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h
index 853f5d4..bec9f91 100644
--- a/gio/gfileoutputstream.h
+++ b/gio/gfileoutputstream.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -23,8 +21,11 @@
 #ifndef __G_FILE_OUTPUT_STREAM_H__
 #define __G_FILE_OUTPUT_STREAM_H__
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #include <gio/goutputstream.h>
-#include <gio/gfileinfo.h>
 
 G_BEGIN_DECLS
 
@@ -37,18 +38,19 @@ G_BEGIN_DECLS
 
 /**
  * GFileOutputStream:
- * @parent: The parent #GOutputStream instance.
  *
- * Implements #GOutputStream and #GSeekable for file output operations. 
+ * A subclass of GOutputStream for opened files. This adds
+ * a few file-specific operations and seeking and truncating.
+ *
+ * #GFileOutputStream implements GSeekable.
  **/
-typedef struct _GFileOutputStream         GFileOutputStream;
 typedef struct _GFileOutputStreamClass    GFileOutputStreamClass;
 typedef struct _GFileOutputStreamPrivate  GFileOutputStreamPrivate;
 
 struct _GFileOutputStream
 {
-  GOutputStream parent;
-  
+  GOutputStream parent_instance;
+
   /*< private >*/
   GFileOutputStreamPrivate *priv;
 };
@@ -57,33 +59,33 @@ struct _GFileOutputStreamClass
 {
   GOutputStreamClass parent_class;
 
-  goffset    (*tell)          (GFileOutputStream     *stream);
-  gboolean   (*can_seek)      (GFileOutputStream     *stream);
-  gboolean   (*seek)	      (GFileOutputStream     *stream,
-			       goffset               offset,
-			       GSeekType             type,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  gboolean   (*can_truncate)  (GFileOutputStream    *stream);
-  gboolean   (*truncate_fn)   (GFileOutputStream    *stream,
-			       goffset               size,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  GFileInfo *(*query_info)    (GFileOutputStream    *stream,
-			       char                 *attributes,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  void       (*query_info_async)  (GFileOutputStream     *stream,
-				   char                 *attributes,
-				   int                   io_priority,
-				   GCancellable         *cancellable,
-				   GAsyncReadyCallback   callback,
-				   gpointer              user_data);
-  GFileInfo *(*query_info_finish) (GFileOutputStream     *stream,
-				   GAsyncResult         *res,
-				   GError              **error);
-  char      *(*get_etag)      (GFileOutputStream    *stream);
-    
+  goffset     (* tell)              (GFileOutputStream    *stream);
+  gboolean    (* can_seek)          (GFileOutputStream    *stream);
+  gboolean    (* seek)	            (GFileOutputStream    *stream,
+                                     goffset               offset,
+                                     GSeekType             type,
+                                     GCancellable         *cancellable,
+                                     GError              **error);
+  gboolean    (* can_truncate)      (GFileOutputStream    *stream);
+  gboolean    (* truncate_fn)       (GFileOutputStream    *stream,
+                                     goffset               size,
+                                     GCancellable         *cancellable,
+                                     GError              **error);
+  GFileInfo * (* query_info)        (GFileOutputStream    *stream,
+                                     const char           *attributes,
+                                     GCancellable         *cancellable,
+                                     GError              **error);
+  void        (* query_info_async)  (GFileOutputStream     *stream,
+                                     const char            *attributes,
+                                     int                   io_priority,
+                                     GCancellable         *cancellable,
+                                     GAsyncReadyCallback   callback,
+                                     gpointer              user_data);
+  GFileInfo * (* query_info_finish) (GFileOutputStream     *stream,
+                                     GAsyncResult         *result,
+                                     GError              **error);
+  char      * (* get_etag)          (GFileOutputStream    *stream);
+
   /* Padding for future expansion */
   void (*_g_reserved1) (void);
   void (*_g_reserved2) (void);
@@ -92,35 +94,28 @@ struct _GFileOutputStreamClass
   void (*_g_reserved5) (void);
 };
 
-GType g_file_output_stream_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GType      g_file_output_stream_get_type          (void) G_GNUC_CONST;
 
 
-GFileInfo *g_file_output_stream_query_info (GFileOutputStream  *stream,
-					    char               *attributes,
-					    GCancellable       *cancellable,
-					    GError            **error);
-void       g_file_output_stream_query_info_async  (GFileOutputStream     *stream,
-						   char                 *attributes,
+GLIB_AVAILABLE_IN_ALL
+GFileInfo *g_file_output_stream_query_info        (GFileOutputStream    *stream,
+                                                   const char           *attributes,
+                                                   GCancellable         *cancellable,
+                                                   GError              **error);
+GLIB_AVAILABLE_IN_ALL
+void       g_file_output_stream_query_info_async  (GFileOutputStream    *stream,
+						   const char           *attributes,
 						   int                   io_priority,
 						   GCancellable         *cancellable,
 						   GAsyncReadyCallback   callback,
 						   gpointer              user_data);
-GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream     *stream,
+GLIB_AVAILABLE_IN_ALL
+GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream    *stream,
 						   GAsyncResult         *result,
 						   GError              **error);
-char *     g_file_output_stream_get_etag      (GFileOutputStream  *stream);
-goffset    g_file_output_stream_tell          (GFileOutputStream  *stream);
-gboolean   g_file_output_stream_can_seek      (GFileOutputStream  *stream);
-gboolean   g_file_output_stream_seek          (GFileOutputStream  *stream,
-					       goffset             offset,
-					       GSeekType           type,
-					       GCancellable       *cancellable,
-					       GError            **error);
-gboolean   g_file_output_stream_can_truncate  (GFileOutputStream  *stream);
-gboolean   g_file_output_stream_truncate      (GFileOutputStream  *stream,
-					       goffset             size,
-					       GCancellable       *cancellable,
-					       GError            **error);
+GLIB_AVAILABLE_IN_ALL
+char *     g_file_output_stream_get_etag          (GFileOutputStream    *stream);
 
 G_END_DECLS