Index: cpp/frams/loggers/loggers.h
===================================================================
--- cpp/frams/mhandlers/mhandlers.h	(revision 373)
+++ cpp/frams/loggers/loggers.h	(revision 375)
@@ -3,52 +3,52 @@
 // See LICENSE.txt for details.
 
-#ifndef _MHANDLERS_H_
-#define _MHANDLERS_H_
+#ifndef _FRAMS_LOGGERS_H_
+#define _FRAMS_LOGGERS_H_
 
 #include <frams/util/list.h>
 #include <frams/util/sstring.h>
-#include <common/hmessage.h>
+#include <common/log.h>
 #include <common/threads.h>
 
-class MessageHandlerBase;
+class LoggerBase;
 
-class MessageHandlerManager
+class LoggerManager
 {
-	friend class MessageHandlerBase;
-	SListTempl<MessageHandlerBase*> handlers;
-	void send(int level, const char *o, const char *m, const char *bl, int w);
+	friend class LoggerBase;
+	SListTempl<LoggerBase*> handlers;
+	void send(int level, const char *o, const char *m, int w, const char *bl);
 public:
-	int find(MessageHandlerBase *r) { return handlers.find(r); }
-	int add(MessageHandlerBase *r);
+	int find(LoggerBase *r) { return handlers.find(r); }
+	int add(LoggerBase *r);
 	void remove(int i);
-	void remove(MessageHandlerBase *r);
+	void remove(LoggerBase *r);
 	void removeAll();
-	void send(const char *o, const char *m, const char *bl, int w)
+	void send(const char *o, const char *m, int w, const char *bl)
 	{
-		send(handlers.size() - 1, o, m, bl, w);
+		send(handlers.size() - 1, o, m, w, bl);
 	}
-	~MessageHandlerManager() { removeAll(); }
+	~LoggerManager() { removeAll(); }
 };
 
-extern THREAD_LOCAL_DECL(MessageHandlerManager, message_handler_manager_instance);
+extern THREAD_LOCAL_DECL(LoggerManager, message_handler_manager_instance);
 
 ////////////////////////////////////////
 
-class MessageHandlerBase
+class LoggerBase
 {
-	friend class MessageHandlerManager;
+	friend class LoggerManager;
 protected:
-	MessageHandlerManager* manager;
+	LoggerManager* manager;
 	int options;
 
 public:
 
-	enum HandlerOptions
+	enum LoggerOptions
 	{
 		DontBlock = 1, CannotBeBlocked = 2, Enable = 4, Paused = 8
 	};
 
-	void Hprintf(const char *o, const char *m, int w, const char *bl, ...);
-	void send(const char *o, const char *m, const char *bl, int w);
+	void logPrintf(const char *o, const char *m, int w, const char *bl, ...);
+	void send(const char *o, const char *m, int w, const char *bl);
 
 	bool isEnabled() { return manager ? true : false; }
@@ -59,19 +59,19 @@
 	void resume();
 
-	MessageHandlerBase(int opts = 0) :manager(NULL), options(opts)
+	LoggerBase(int opts = 0) :manager(NULL), options(opts)
 	{
 		if (options&Enable) enable();
 	}
-	virtual ~MessageHandlerBase()
+	virtual ~LoggerBase()
 	{
 		disable();
 	}
 
-	virtual void handle(const char *o, const char *m, const char *bl, int w) {}
+	virtual void handle(const char *o, const char *m, int w, const char *bl) {}
 };
 
 ///////////////////////////////////////////
 
-class MessageHandlerToMemory : public MessageHandlerBase
+class LoggerToMemory : public LoggerBase
 {
 protected:
@@ -81,5 +81,5 @@
 public:
 
-	void reset() { maxlevel = HMLV_INFO - 1; errcount = warncount = storedcount = infocount = 0; msgs = 0; }
+	void reset() { maxlevel = LOG_INFO - 1; errcount = warncount = storedcount = infocount = 0; msgs = 0; }
 
 	enum Options2
@@ -95,22 +95,22 @@
 	const SString& getMessages() { return msgs; }
 
-	MessageHandlerToMemory(int opts = 0, int minimal_level_to_store = HMLV_ERROR) :MessageHandlerBase(opts), minleveltostore(minimal_level_to_store)
+	LoggerToMemory(int opts = 0, int minimal_level_to_store = LOG_ERROR) :LoggerBase(opts), minleveltostore(minimal_level_to_store)
 	{
 		reset();
 	}
 
-	void handle(const char *o, const char *m, const char *bl, int w);
+	void handle(const char *o, const char *m, int w, const char *bl);
 };
 
-class RedirectingMessageHandler : public MessageHandlerBase
+class RedirectingLogger : public LoggerBase
 {
-	MessageHandlerManager *other_manager;
+	LoggerManager *other_manager;
 public:
-	RedirectingMessageHandler(MessageHandlerManager *other_mgr,int opts=0)
-		:MessageHandlerBase(opts), other_manager(other_mgr) {}
+	RedirectingLogger(LoggerManager *other_mgr,int opts=0)
+		:LoggerBase(opts), other_manager(other_mgr) {}
 
-	void handle(const char *o, const char *m, const char *bl, int w)
+	void handle(const char *o, const char *m, int w, const char *bl)
 	{
-		other_manager->send(o, m, bl, w);
+		other_manager->send(o, m, w, bl);
 	}
 };
