Moved the Priorities enum into Though all the giomm stuff seems to already

2008-02-07  Murray Cumming  <murrayc@murrayc.com>

* glib/glibmm/Makefile.am:
* glib/glibmm/main.h: Moved the Priorities enum into
* glib/glibmm/priorities.h:
Though all the giomm stuff seems to already include main.h anyway. 
It probably shouldn't, and then we can include priorities.h only.

* gio/src/bufferedinputstream.hg:
* gio/src/file.hg:
* gio/src/fileenumerator.hg:
* gio/src/fileinputstream.hg:
* gio/src/fileoutputstream.hg:
* gio/src/gio_methods.defs:
* gio/src/inputstream.hg:
* gio/src/outputstream.hg: Use Glib::PRIORITY_DEFAULT instead of 
G_PRIORITY_DEFAULT.

* glib/src/iochannel.ccg: Add some ifdefs to avoid unused parameter 
warnings when exceptions are disabled, because our current trick for 
that is now causing another warning instead.

svn path=/trunk/; revision=589

1 files changed, 6 insertions, 6 deletions

diff --git a/gio/src/inputstream.hg b/gio/src/inputstream.hg
index 13d15118..f3e1a17d 100644
--- a/gio/src/inputstream.hg
+++ b/gio/src/inputstream.hg
@@ -181,7 +181,7 @@ public:
    * @param cancellable A Cancellable object.
    * @param io_priority The I/O priority of the request. 
    */
-  void read_async(void* buffer, gsize count, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
+  void read_async(void* buffer, gsize count, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = Glib::PRIORITY_DEFAULT);
 
   /** Request an asynchronous read of @a count bytes from the stream into the buffer
    * starting at @a buffer. When the operation is finished @a slot will be called. 
@@ -212,7 +212,7 @@ public:
    * @param slot Callback to call when the request is satisfied.
    * @param io_priority The I/O priority of the request. 
    */
-  void read_async(void* buffer, gsize count, const SlotAsyncReady& slot, int io_priority = G_PRIORITY_DEFAULT);
+  void read_async(void* buffer, gsize count, const SlotAsyncReady& slot, int io_priority = Glib::PRIORITY_DEFAULT);
   _IGNORE(g_input_stream_read_async)
 
   _WRAP_METHOD(gssize read_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -249,7 +249,7 @@ public:
    * @param cancellable A Cancellable object.
    * @param io_priority The I/O priority of the request. 
    */
-  void skip_async(gsize count, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
+  void skip_async(gsize count, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = Glib::PRIORITY_DEFAULT);
 
   /** Request an asynchronous skip of @a count bytes from the stream into the buffer
    * starting at @a buffer. When the operation is finished @a slot will be called. 
@@ -278,7 +278,7 @@ public:
    * @param slot Callback to call when the request is satisfied.
    * @param io_priority The I/O priority of the request. 
    */
-  void skip_async(gsize count, const SlotAsyncReady& slot, int io_priority = G_PRIORITY_DEFAULT);
+  void skip_async(gsize count, const SlotAsyncReady& slot, int io_priority = Glib::PRIORITY_DEFAULT);
   _IGNORE(g_input_stream_skip_async)
 
   _WRAP_METHOD(gssize skip_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -300,7 +300,7 @@ public:
    * @param cancellable A Cancellable object.
    * @param io_priority The I/O priority of the request. 
    */
-  void close_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
+  void close_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = Glib::PRIORITY_DEFAULT);
 
   /** Requests an asynchronous closes of the stream, releasing resources related to it.
    * When the operation is finished @a slot will be called. 
@@ -316,7 +316,7 @@ public:
    * @param slot Callback to call when the request is satisfied.
    * @param io_priority The I/O priority of the request. 
    */
-  void close_async(const SlotAsyncReady& slot, int io_priority = G_PRIORITY_DEFAULT);
+  void close_async(const SlotAsyncReady& slot, int io_priority = Glib::PRIORITY_DEFAULT);
   _IGNORE(g_input_stream_close_async)
 
   _WRAP_METHOD(gboolean close_finish(const Glib::RefPtr<AsyncResult>& result),