summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2015-07-17 10:05:17 +0200
committerMurray Cumming <murrayc@murrayc.com>2015-07-17 10:05:17 +0200
commite67a885cd7df6c165d38e4c6e6d19f5383fc5782 (patch)
tree3bb2ba11cb519e6701bf9c336ddf9232dda3d111 /glib
parentceefa5086bd31397317438cb7b778abfd3931425 (diff)
downloadglibmm-e67a885cd7df6c165d38e4c6e6d19f5383fc5782.tar.gz
IOChannel: Documentation: Mark vfuncs as deprecated.
Though we cannot hide them via GIOMM_DISABLE_DEPRECATED.
Diffstat (limited to 'glib')
-rw-r--r--glib/src/iochannel.hg40
1 files changed, 31 insertions, 9 deletions
diff --git a/glib/src/iochannel.hg b/glib/src/iochannel.hg
index 93bf749a..9c97ce78 100644
--- a/glib/src/iochannel.hg
+++ b/glib/src/iochannel.hg
@@ -78,15 +78,7 @@ class GlibmmIOChannel;
* set_encoding("ISO-8859-15"). To set the channel to no encoding, use
* set_encoding() without any arguments.
*
- * You can create an IOChannel with one of the static create methods, or
- * implement one yourself, in which case you have to 1)&nbsp;override all
- * _vfunc() members. 2)&nbsp;set the GIOChannel flags in your constructor.
- *
- * @note This feature of being able to implement a custom Glib::IOChannel is
- * deprecated in glibmm&nbsp;2.2. The vfunc interface has not yet stabilized
- * enough to allow that -- the C++ wrapper went in by pure accident. Besides,
- * it isn't terribly useful either. Thus please refrain from overriding any
- * IOChannel vfuncs.
+ * You can create an IOChannel with one of the static create methods.
*/
class IOChannel : public sigc::trackable
{
@@ -437,12 +429,42 @@ protected:
IOChannel(GIOChannel* gobject, bool take_copy);
#endif
+ //We don't put GLIBMM_DISABLE_DEPRECATED around these deprecated methods
+ //because they are virtual and that would make the ABI dependent on the ifdef.
+
+ /**
+ * @deprecated Custom Glib::IOChannel implementation was never really supported.
+ */
virtual IOStatus read_vfunc(char* buf, gsize count, gsize& bytes_read);
+
+ /**
+ * @deprecated Custom Glib::IOChannel implementation was never really supported.
+ */
virtual IOStatus write_vfunc(const char* buf, gsize count, gsize& bytes_written);
+
+ /**
+ * @deprecated Custom Glib::IOChannel implementation was never really supported.
+ */
virtual IOStatus seek_vfunc(gint64 offset, SeekType type);
+
+ /**
+ * @deprecated Custom Glib::IOChannel implementation was never really supported.
+ */
virtual IOStatus close_vfunc();
+
+ /**
+ * @deprecated Custom Glib::IOChannel implementation was never really supported.
+ */
virtual IOStatus set_flags_vfunc(IOFlags flags);
+
+ /**
+ * @deprecated Custom Glib::IOChannel implementation was never really supported.
+ */
virtual IOFlags get_flags_vfunc();
+
+ /**
+ * @deprecated Custom Glib::IOChannel implementation was never really supported.
+ */
virtual Glib::RefPtr<Glib::Source> create_watch_vfunc(IOCondition cond);
#ifndef DOXYGEN_SHOULD_SKIP_THIS