X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fio%2Fbuffered.h;h=f078ea1094324d57d1533063aa457e019912ae2f;hb=991fabc1956b73a4007859058fb44171000b452e;hp=1de54d202456546cecf9604c01d9a766b061648d;hpb=31e72f50fbb34d86877e5110401c49ce3fefd4bb;p=libs%2Fcore.git

diff --git a/source/io/buffered.h b/source/io/buffered.h
index 1de54d2..f078ea1 100644
--- a/source/io/buffered.h
+++ b/source/io/buffered.h
@@ -1,43 +1,47 @@
 #ifndef MSP_IO_BUFFERED_H_
 #define MSP_IO_BUFFERED_H_
 
+#include <sigc++/trackable.h>
 #include "base.h"
 
 namespace Msp {
 namespace IO {
 
-class Buffered: public Base
+class Buffered: public Base, public sigc::trackable
 {
 private:
 	Base &below;
-	unsigned buf_size;
-	char *buf;
-	char *begin;
-	char *end;
-	Mode cur_op;
+	std::size_t buf_size = 0;
+	char *buf = nullptr;
+	char *begin = nullptr;
+	char *end = nullptr;
+	Mode cur_op = M_NONE;
 
 public:
-	Buffered(Base &, unsigned =8192);
+	Buffered(Base &, unsigned = 8192);
 	~Buffered();
 
+	void set_block(bool) override;
+	void set_inherit(bool) override;
+
 	void flush();
 
 protected:
-	unsigned do_write(const char *, unsigned);
-	unsigned do_read(char *, unsigned);
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
 public:
-	unsigned put(char);
+	std::size_t put(char) override;
 
 	bool getline(std::string &);
 	int get();
 
+	const Handle &get_handle(Mode) override;
+
 private:
 	void set_op(Mode);
 public:
 	Mode get_current_op() const { return cur_op; }
-	unsigned get_current_size() const;
-
-	virtual const Handle &get_event_handle();
+	std::size_t get_current_size() const;
 };
 
 } // namespace IO