From fc351c8106c0ff5bfe0852f9010026a8aa59e0b2 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Sun, 26 Jun 2005 22:36:43 +0000
Subject: [PATCH] Redo Context class to use overridable virtual functions
 instead of C-style callbacks.  Note that this requires the memory callbacks
 to have a userdata pointer (so that we can pass the class instance).  Also,
 the Context class has to be passed into the constructors for Connection and
 Stanza.

---
 strophepp.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/strophepp.h b/strophepp.h
index 1a90c27..0b394d4 100644
--- a/strophepp.h
+++ b/strophepp.h
@@ -4,11 +4,6 @@
 #include "strophe.h"
 
 namespace XMPP {
-
-    typedef void (*alloc_handler)(const size_t size);
-    typedef void (*free_handler)(void *p);
-    typedef void (*realloc_handler)(void *p const size_t size);
-
     class Context {
     private:
 	xmpp_ctx_t *ctx;
@@ -17,10 +12,15 @@ namespace XMPP {
 	Context();
 	virtual ~Context();
 
-	void setAlloc(alloc_handler handler);
-	void setRealloc(realloc_handler handler);
-	void setFree(free_handler handler);
-	void setLogger(xmpp_log_handler handler, void * const userdata);
+	virtual void *alloc(const size_t size) = 0;
+	virtual void *realloc(void *p, const size_t size) = 0;
+	virtual void free(void *p) = 0;
+	virtual void log(xmpp_log_handler handler, void * const userdata) = 0;
+
+    private:
+	static void *callAlloc(const size_t size, void *userdata);
+	static void *callRealloc(void *p, const size_t size, void *userdata);
+	static void *callFree(void *p, void *userdata);
     }
 
     class Connection {
@@ -28,9 +28,10 @@ namespace XMPP {
 	xmpp_conn_t *conn;
 
     public:
-	Connection();
+	Connection(Context *ctx);
 	virtual ~Connection();
 	Connection *clone();
+	void operator delete(void *p);
 
 	const char *getJID();
 	void setJID(const char * const jid);
@@ -63,8 +64,9 @@ namespace XMPP {
 	xmpp_stanza_t *stanza;
 
     public:
-	Stanza();
+	Stanza(Context *ctx);
 	virtual ~Stanza();
+	void operator delete(void *p);
 	Stanza *clone();
 	Stanza *copy();