X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgfileinputstream.h;h=4e37e07339c0e5e1ab46446f9b7ffdace94b782d;hb=c8d10470939847069b1a346d4c44f2adde3469f6;hp=c737f4f5bf9c77b8f2d8bb7ab3bfb3e5340e4951;hpb=41d1650c9b6b0b8368c0648d2885b83e18020303;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h
index c737f4f..4e37e07 100644
--- a/gio/gfileinputstream.h
+++ b/gio/gfileinputstream.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_INPUT_STREAM_H__
 #define __G_FILE_INPUT_STREAM_H__
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #include <gio/ginputstream.h>
-#include <gio/gfileinfo.h>
 
 G_BEGIN_DECLS
 
@@ -37,19 +38,18 @@ G_BEGIN_DECLS
 
 /**
  * GFileInputStream:
- * 
+ *
  * A subclass of GInputStream for opened files. This adds
  * a few file-specific operations and seeking.
  *
  * #GFileInputStream implements #GSeekable.
  **/
-typedef struct _GFileInputStream         GFileInputStream;
 typedef struct _GFileInputStreamClass    GFileInputStreamClass;
 typedef struct _GFileInputStreamPrivate  GFileInputStreamPrivate;
 
 struct _GFileInputStream
 {
-  GInputStream parent;
+  GInputStream parent_instance;
 
   /*< private >*/
   GFileInputStreamPrivate *priv;
@@ -59,26 +59,27 @@ struct _GFileInputStreamClass
 {
   GInputStreamClass parent_class;
 
-  goffset    (*tell)          (GFileInputStream     *stream);
-  gboolean   (*can_seek)      (GFileInputStream     *stream);
-  gboolean   (*seek)	      (GFileInputStream     *stream,
-			       goffset               offset,
-			       GSeekType             type,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  GFileInfo *(*query_info)    (GFileInputStream     *stream,
-			       char                 *attributes,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  void       (*query_info_async)  (GFileInputStream     *stream,
-				   char                 *attributes,
-				   int                   io_priority,
-				   GCancellable         *cancellable,
-				   GAsyncReadyCallback   callback,
-				   gpointer              user_data);
-  GFileInfo *(*query_info_finish) (GFileInputStream     *stream,
-				   GAsyncResult         *res,
-				   GError              **error);
+  goffset     (* tell)              (GFileInputStream     *stream);
+  gboolean    (* can_seek)          (GFileInputStream     *stream);
+  gboolean    (* seek)	            (GFileInputStream     *stream,
+                                     goffset               offset,
+                                     GSeekType             type,
+                                     GCancellable         *cancellable,
+                                     GError              **error);
+  GFileInfo * (* query_info)        (GFileInputStream     *stream,
+                                     const char           *attributes,
+                                     GCancellable         *cancellable,
+                                     GError              **error);
+  void        (* query_info_async)  (GFileInputStream     *stream,
+                                     const char           *attributes,
+                                     int                   io_priority,
+                                     GCancellable         *cancellable,
+                                     GAsyncReadyCallback   callback,
+                                     gpointer              user_data);
+  GFileInfo * (* query_info_finish) (GFileInputStream     *stream,
+                                     GAsyncResult         *result,
+                                     GError              **error);
+
   /*< private >*/
   /* Padding for future expansion */
   void (*_g_reserved1) (void);
@@ -88,30 +89,25 @@ struct _GFileInputStreamClass
   void (*_g_reserved5) (void);
 };
 
-GType g_file_input_stream_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GType      g_file_input_stream_get_type          (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
-						  char                 *attributes,
+						  const char           *attributes,
 						  GCancellable         *cancellable,
 						  GError              **error);
+GLIB_AVAILABLE_IN_ALL
 void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
-						  char                 *attributes,
+						  const char           *attributes,
 						  int                   io_priority,
 						  GCancellable         *cancellable,
 						  GAsyncReadyCallback   callback,
 						  gpointer              user_data);
+GLIB_AVAILABLE_IN_ALL
 GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream     *stream,
 						  GAsyncResult         *result,
 						  GError              **error);
-goffset    g_file_input_stream_tell              (GFileInputStream     *stream);
-gboolean   g_file_input_stream_can_seek          (GFileInputStream     *stream);
-gboolean   g_file_input_stream_seek              (GFileInputStream     *stream,
-						  goffset               offset,
-						  GSeekType             type,
-						  GCancellable         *cancellable,
-						  GError              **error);
-
-
 
 G_END_DECLS