REFAC: Fix warning about boost bind

Compiling with Boost a somewhat recent version of Boost would produce
warnings about deprecated usage of boost::bind.
These have been fixed now.

The warning was
The practice of declaring the Bind placeholders (_1, _2, ...) in the
global namespace is deprecated. Please use
<boost/bind/bind.hpp> + using namespace boost::placeholders, or
define BOOST_BIND_GLOBAL_PLACEHOLDERS to retain the current behavior.

Fixes #4295

5 files changed, 510 insertions, 612 deletions

diff --git a/src/murmur/MurmurGRPCImpl.h b/src/murmur/MurmurGRPCImpl.h
index 69ec36d2a..0b9b688d3 100644
--- a/src/murmur/MurmurGRPCImpl.h
+++ b/src/murmur/MurmurGRPCImpl.h
@@ -9,7 +9,7 @@
 
 #		include <QtCore/QCoreApplication>
 
-#		include <boost/bind.hpp>
+#		include <boost/bind/bind.hpp>
 
 #		pragma GCC diagnostic push
 #		pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -140,7 +140,7 @@ public:
 	RPCCall(MurmurRPCImpl *rpcImpl) : m_refs(0), rpc(rpcImpl) { ref(); }
 	virtual ~RPCCall() {}
 	virtual ::boost::function< void(bool) > *done() {
-		auto done_fn = ::boost::bind(&RPCCall::finish, this, _1);
+		auto done_fn = ::boost::bind(&RPCCall::finish, this, boost::placeholders::_1);
 		return new ::boost::function< void(bool) >(done_fn);
 	}
 
@@ -215,7 +215,7 @@ public:
 
 private:
 	void *writeCB() {
-		auto callback = ::boost::bind(&RPCSingleStreamCall< InType, OutType >::writeCallback, this, _1);
+		auto callback = ::boost::bind(&RPCSingleStreamCall< InType, OutType >::writeCallback, this, boost::placeholders::_1);
 		return new ::boost::function< void(bool) >(callback);
 	}
 
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index 64b025ed5..a0a9317a1 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -21,8 +21,6 @@
 #include <QtCore/QSettings>
 #include <QtCore/QStack>
 
-#include <boost/bind.hpp>
-
 #include <openssl/err.h>
 
 #include <Ice/Ice.h>
diff --git a/src/murmur/MurmurIceWrapper.cpp b/src/murmur/MurmurIceWrapper.cpp
index 8e909529f..3b442ecbb 100644
--- a/src/murmur/MurmurIceWrapper.cpp
+++ b/src/murmur/MurmurIceWrapper.cpp
@@ -1,6 +1,6 @@
+// This file was auto-generated by scripts/generateIceWrapper.py on 2020-09-12 -- DO NOT EDIT MANUALLY!
 
-// Auto-generated by scripts/mkwrapper.pl . Do not edit manually.
-
+#include <boost/bind/bind.hpp>
 
 void ::Murmur::ServerI::isRunning_async(const ::Murmur::AMD_Server_isRunningPtr &cb, const ::Ice::Current &current) {
 	// qWarning() << "isRunning" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
@@ -11,25 +11,26 @@ void ::Murmur::ServerI::isRunning_async(const ::Murmur::AMD_Server_isRunningPtr
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_isRunning_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_isRunning_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_isRunning_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_isRunning, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_isRunning_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_isRunning, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -42,23 +43,25 @@ void ::Murmur::ServerI::start_async(const ::Murmur::AMD_Server_startPtr &cb, con
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_start_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_start_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_start_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Server_start_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_start, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
@@ -72,23 +75,25 @@ void ::Murmur::ServerI::stop_async(const ::Murmur::AMD_Server_stopPtr &cb, const
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_stop_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_stop_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_stop_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Server_stop_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_stop, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
@@ -102,25 +107,26 @@ void ::Murmur::ServerI::delete_async(const ::Murmur::AMD_Server_deletePtr &cb, c
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_delete_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_delete_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_delete_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_delete, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_delete_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_delete, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -133,29 +139,30 @@ void ::Murmur::ServerI::id_async(const ::Murmur::AMD_Server_idPtr &cb, const ::I
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_id_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_id_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_id_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Server_id_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_id, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::addCallback_async(const ::Murmur::AMD_Server_addCallbackPtr &cb,
-										  const ::Murmur::ServerCallbackPrx &p1, const ::Ice::Current &current) {
+void ::Murmur::ServerI::addCallback_async(const ::Murmur::AMD_Server_addCallbackPtr &cb, const ServerCallbackPrx& p1, const ::Ice::Current &current) {
 	// qWarning() << "addCallback" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_addCallback_ALL
 #	ifdef ACCESS_Server_addCallback_READ
@@ -164,30 +171,30 @@ void ::Murmur::ServerI::addCallback_async(const ::Murmur::AMD_Server_addCallback
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_addCallback_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_addCallback_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_addCallback_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_addCallback, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_addCallback_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_addCallback, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::removeCallback_async(const ::Murmur::AMD_Server_removeCallbackPtr &cb,
-											 const ::Murmur::ServerCallbackPrx &p1, const ::Ice::Current &current) {
+void ::Murmur::ServerI::removeCallback_async(const ::Murmur::AMD_Server_removeCallbackPtr &cb, const ServerCallbackPrx& p1, const ::Ice::Current &current) {
 	// qWarning() << "removeCallback" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_removeCallback_ALL
 #	ifdef ACCESS_Server_removeCallback_READ
@@ -196,31 +203,30 @@ void ::Murmur::ServerI::removeCallback_async(const ::Murmur::AMD_Server_removeCa
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_removeCallback_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_removeCallback_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_removeCallback_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_removeCallback, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_removeCallback_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_removeCallback, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setAuthenticator_async(const ::Murmur::AMD_Server_setAuthenticatorPtr &cb,
-											   const ::Murmur::ServerAuthenticatorPrx &p1,
-											   const ::Ice::Current &current) {
+void ::Murmur::ServerI::setAuthenticator_async(const ::Murmur::AMD_Server_setAuthenticatorPtr &cb, const ServerAuthenticatorPrx& p1, const ::Ice::Current &current) {
 	// qWarning() << "setAuthenticator" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setAuthenticator_ALL
 #	ifdef ACCESS_Server_setAuthenticator_READ
@@ -229,30 +235,30 @@ void ::Murmur::ServerI::setAuthenticator_async(const ::Murmur::AMD_Server_setAut
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setAuthenticator_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setAuthenticator_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setAuthenticator_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_setAuthenticator, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_setAuthenticator_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setAuthenticator, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getConf_async(const ::Murmur::AMD_Server_getConfPtr &cb, const ::std::string &p1,
-									  const ::Ice::Current &current) {
+void ::Murmur::ServerI::getConf_async(const ::Murmur::AMD_Server_getConfPtr &cb, const ::std::string& p1, const ::Ice::Current &current) {
 	// qWarning() << "getConf" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getConf_ALL
 #	ifdef ACCESS_Server_getConf_READ
@@ -261,25 +267,26 @@ void ::Murmur::ServerI::getConf_async(const ::Murmur::AMD_Server_getConfPtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getConf_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getConf_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getConf_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getConf, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getConf_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getConf, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -292,30 +299,30 @@ void ::Murmur::ServerI::getAllConf_async(const ::Murmur::AMD_Server_getAllConfPt
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getAllConf_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getAllConf_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getAllConf_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getAllConf, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_getAllConf_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getAllConf, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setConf_async(const ::Murmur::AMD_Server_setConfPtr &cb, const ::std::string &p1,
-									  const ::std::string &p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::setConf_async(const ::Murmur::AMD_Server_setConfPtr &cb, const ::std::string& p1, const ::std::string& p2, const ::Ice::Current &current) {
 	// qWarning() << "setConf" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setConf_ALL
 #	ifdef ACCESS_Server_setConf_READ
@@ -324,30 +331,30 @@ void ::Murmur::ServerI::setConf_async(const ::Murmur::AMD_Server_setConfPtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setConf_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setConf_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setConf_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_setConf, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_setConf_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setConf, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setSuperuserPassword_async(const ::Murmur::AMD_Server_setSuperuserPasswordPtr &cb,
-												   const ::std::string &p1, const ::Ice::Current &current) {
+void ::Murmur::ServerI::setSuperuserPassword_async(const ::Murmur::AMD_Server_setSuperuserPasswordPtr &cb, const ::std::string& p1, const ::Ice::Current &current) {
 	// qWarning() << "setSuperuserPassword" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setSuperuserPassword_ALL
 #	ifdef ACCESS_Server_setSuperuserPassword_READ
@@ -356,30 +363,30 @@ void ::Murmur::ServerI::setSuperuserPassword_async(const ::Murmur::AMD_Server_se
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setSuperuserPassword_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setSuperuserPassword_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setSuperuserPassword_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_setSuperuserPassword, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_setSuperuserPassword_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setSuperuserPassword, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getLog_async(const ::Murmur::AMD_Server_getLogPtr &cb, ::Ice::Int p1, ::Ice::Int p2,
-									 const ::Ice::Current &current) {
+void ::Murmur::ServerI::getLog_async(const ::Murmur::AMD_Server_getLogPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::Ice::Current &current) {
 	// qWarning() << "getLog" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getLog_ALL
 #	ifdef ACCESS_Server_getLog_READ
@@ -388,25 +395,26 @@ void ::Murmur::ServerI::getLog_async(const ::Murmur::AMD_Server_getLogPtr &cb, :
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getLog_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getLog_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getLog_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getLog, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_getLog_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getLog, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -419,25 +427,26 @@ void ::Murmur::ServerI::getLogLen_async(const ::Murmur::AMD_Server_getLogLenPtr
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getLogLen_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getLogLen_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getLogLen_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getLogLen, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_getLogLen_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getLogLen, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -450,30 +459,30 @@ void ::Murmur::ServerI::getUsers_async(const ::Murmur::AMD_Server_getUsersPtr &c
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getUsers_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getUsers_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getUsers_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getUsers, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_getUsers_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getUsers, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getChannels_async(const ::Murmur::AMD_Server_getChannelsPtr &cb,
-										  const ::Ice::Current &current) {
+void ::Murmur::ServerI::getChannels_async(const ::Murmur::AMD_Server_getChannelsPtr &cb, const ::Ice::Current &current) {
 	// qWarning() << "getChannels" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getChannels_ALL
 #	ifdef ACCESS_Server_getChannels_READ
@@ -482,30 +491,30 @@ void ::Murmur::ServerI::getChannels_async(const ::Murmur::AMD_Server_getChannels
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getChannels_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getChannels_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getChannels_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getChannels, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_getChannels_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getChannels, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getCertificateList_async(const ::Murmur::AMD_Server_getCertificateListPtr &cb, ::Ice::Int p1,
-												 const ::Ice::Current &current) {
+void ::Murmur::ServerI::getCertificateList_async(const ::Murmur::AMD_Server_getCertificateListPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getCertificateList" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getCertificateList_ALL
 #	ifdef ACCESS_Server_getCertificateList_READ
@@ -514,25 +523,26 @@ void ::Murmur::ServerI::getCertificateList_async(const ::Murmur::AMD_Server_getC
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getCertificateList_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getCertificateList_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getCertificateList_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_getCertificateList, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getCertificateList_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getCertificateList, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -545,25 +555,26 @@ void ::Murmur::ServerI::getTree_async(const ::Murmur::AMD_Server_getTreePtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getTree_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getTree_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getTree_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getTree, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_getTree_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getTree, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -576,30 +587,30 @@ void ::Murmur::ServerI::getBans_async(const ::Murmur::AMD_Server_getBansPtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getBans_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getBans_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getBans_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getBans, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_getBans_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getBans, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setBans_async(const ::Murmur::AMD_Server_setBansPtr &cb, const ::Murmur::BanList &p1,
-									  const ::Ice::Current &current) {
+void ::Murmur::ServerI::setBans_async(const ::Murmur::AMD_Server_setBansPtr &cb, const BanList& p1, const ::Ice::Current &current) {
 	// qWarning() << "setBans" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setBans_ALL
 #	ifdef ACCESS_Server_setBans_READ
@@ -608,30 +619,30 @@ void ::Murmur::ServerI::setBans_async(const ::Murmur::AMD_Server_setBansPtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setBans_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setBans_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setBans_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_setBans, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_setBans_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setBans, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::kickUser_async(const ::Murmur::AMD_Server_kickUserPtr &cb, ::Ice::Int p1,
-									   const ::std::string &p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::kickUser_async(const ::Murmur::AMD_Server_kickUserPtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::Ice::Current &current) {
 	// qWarning() << "kickUser" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_kickUser_ALL
 #	ifdef ACCESS_Server_kickUser_READ
@@ -640,30 +651,30 @@ void ::Murmur::ServerI::kickUser_async(const ::Murmur::AMD_Server_kickUserPtr &c
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_kickUser_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_kickUser_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_kickUser_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_kickUser, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_kickUser_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_kickUser, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getState_async(const ::Murmur::AMD_Server_getStatePtr &cb, ::Ice::Int p1,
-									   const ::Ice::Current &current) {
+void ::Murmur::ServerI::getState_async(const ::Murmur::AMD_Server_getStatePtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getState" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getState_ALL
 #	ifdef ACCESS_Server_getState_READ
@@ -672,30 +683,30 @@ void ::Murmur::ServerI::getState_async(const ::Murmur::AMD_Server_getStatePtr &c
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getState_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getState_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getState_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getState, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getState_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getState, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setState_async(const ::Murmur::AMD_Server_setStatePtr &cb, const ::Murmur::User &p1,
-									   const ::Ice::Current &current) {
+void ::Murmur::ServerI::setState_async(const ::Murmur::AMD_Server_setStatePtr &cb, const User& p1, const ::Ice::Current &current) {
 	// qWarning() << "setState" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setState_ALL
 #	ifdef ACCESS_Server_setState_READ
@@ -704,30 +715,30 @@ void ::Murmur::ServerI::setState_async(const ::Murmur::AMD_Server_setStatePtr &c
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setState_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setState_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setState_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_setState, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_setState_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setState, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::sendMessage_async(const ::Murmur::AMD_Server_sendMessagePtr &cb, ::Ice::Int p1,
-										  const ::std::string &p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::sendMessage_async(const ::Murmur::AMD_Server_sendMessagePtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::Ice::Current &current) {
 	// qWarning() << "sendMessage" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_sendMessage_ALL
 #	ifdef ACCESS_Server_sendMessage_READ
@@ -736,30 +747,30 @@ void ::Murmur::ServerI::sendMessage_async(const ::Murmur::AMD_Server_sendMessage
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_sendMessage_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_sendMessage_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_sendMessage_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_sendMessage, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_sendMessage_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_sendMessage, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::hasPermission_async(const ::Murmur::AMD_Server_hasPermissionPtr &cb, ::Ice::Int p1,
-											::Ice::Int p2, ::Ice::Int p3, const ::Ice::Current &current) {
+void ::Murmur::ServerI::hasPermission_async(const ::Murmur::AMD_Server_hasPermissionPtr &cb, ::Ice::Int p1, ::Ice::Int p2, ::Ice::Int p3, const ::Ice::Current &current) {
 	// qWarning() << "hasPermission" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_hasPermission_ALL
 #	ifdef ACCESS_Server_hasPermission_READ
@@ -768,30 +779,30 @@ void ::Murmur::ServerI::hasPermission_async(const ::Murmur::AMD_Server_hasPermis
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_hasPermission_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_hasPermission_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_hasPermission_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_hasPermission, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
+#endif // ACCESS_Server_hasPermission_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_hasPermission, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::effectivePermissions_async(const ::Murmur::AMD_Server_effectivePermissionsPtr &cb,
-												   ::Ice::Int p1, ::Ice::Int p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::effectivePermissions_async(const ::Murmur::AMD_Server_effectivePermissionsPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::Ice::Current &current) {
 	// qWarning() << "effectivePermissions" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_effectivePermissions_ALL
 #	ifdef ACCESS_Server_effectivePermissions_READ
@@ -800,32 +811,30 @@ void ::Murmur::ServerI::effectivePermissions_async(const ::Murmur::AMD_Server_ef
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_effectivePermissions_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_effectivePermissions_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_effectivePermissions_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_effectivePermissions, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_effectivePermissions_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_effectivePermissions, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::addContextCallback_async(const ::Murmur::AMD_Server_addContextCallbackPtr &cb, ::Ice::Int p1,
-												 const ::std::string &p2, const ::std::string &p3,
-												 const ::Murmur::ServerContextCallbackPrx &p4, ::Ice::Int p5,
-												 const ::Ice::Current &current) {
+void ::Murmur::ServerI::addContextCallback_async(const ::Murmur::AMD_Server_addContextCallbackPtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::std::string& p3, const ServerContextCallbackPrx& p4, ::Ice::Int p5, const ::Ice::Current &current) {
 	// qWarning() << "addContextCallback" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_addContextCallback_ALL
 #	ifdef ACCESS_Server_addContextCallback_READ
@@ -834,31 +843,30 @@ void ::Murmur::ServerI::addContextCallback_async(const ::Murmur::AMD_Server_addC
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_addContextCallback_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_addContextCallback_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_addContextCallback_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_addContextCallback, cb,
-											  QString::fromStdString(current.id.name).toInt(), p1, p2, p3, p4, p5));
+#endif // ACCESS_Server_addContextCallback_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_addContextCallback, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3, p4, p5));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::removeContextCallback_async(const ::Murmur::AMD_Server_removeContextCallbackPtr &cb,
-													const ::Murmur::ServerContextCallbackPrx &p1,
-													const ::Ice::Current &current) {
+void ::Murmur::ServerI::removeContextCallback_async(const ::Murmur::AMD_Server_removeContextCallbackPtr &cb, const ServerContextCallbackPrx& p1, const ::Ice::Current &current) {
 	// qWarning() << "removeContextCallback" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_removeContextCallback_ALL
 #	ifdef ACCESS_Server_removeContextCallback_READ
@@ -867,30 +875,30 @@ void ::Murmur::ServerI::removeContextCallback_async(const ::Murmur::AMD_Server_r
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_removeContextCallback_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_removeContextCallback_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_removeContextCallback_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_removeContextCallback, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_removeContextCallback_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_removeContextCallback, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getChannelState_async(const ::Murmur::AMD_Server_getChannelStatePtr &cb, ::Ice::Int p1,
-											  const ::Ice::Current &current) {
+void ::Murmur::ServerI::getChannelState_async(const ::Murmur::AMD_Server_getChannelStatePtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getChannelState" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getChannelState_ALL
 #	ifdef ACCESS_Server_getChannelState_READ
@@ -899,30 +907,30 @@ void ::Murmur::ServerI::getChannelState_async(const ::Murmur::AMD_Server_getChan
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getChannelState_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getChannelState_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getChannelState_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_getChannelState, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getChannelState_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getChannelState, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setChannelState_async(const ::Murmur::AMD_Server_setChannelStatePtr &cb,
-											  const ::Murmur::Channel &p1, const ::Ice::Current &current) {
+void ::Murmur::ServerI::setChannelState_async(const ::Murmur::AMD_Server_setChannelStatePtr &cb, const Channel& p1, const ::Ice::Current &current) {
 	// qWarning() << "setChannelState" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setChannelState_ALL
 #	ifdef ACCESS_Server_setChannelState_READ
@@ -931,30 +939,30 @@ void ::Murmur::ServerI::setChannelState_async(const ::Murmur::AMD_Server_setChan
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setChannelState_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setChannelState_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setChannelState_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_setChannelState, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_setChannelState_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setChannelState, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::removeChannel_async(const ::Murmur::AMD_Server_removeChannelPtr &cb, ::Ice::Int p1,
-											const ::Ice::Current &current) {
+void ::Murmur::ServerI::removeChannel_async(const ::Murmur::AMD_Server_removeChannelPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "removeChannel" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_removeChannel_ALL
 #	ifdef ACCESS_Server_removeChannel_READ
@@ -963,30 +971,30 @@ void ::Murmur::ServerI::removeChannel_async(const ::Murmur::AMD_Server_removeCha
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_removeChannel_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_removeChannel_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_removeChannel_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_removeChannel, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_removeChannel_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_removeChannel, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::addChannel_async(const ::Murmur::AMD_Server_addChannelPtr &cb, const ::std::string &p1,
-										 ::Ice::Int p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::addChannel_async(const ::Murmur::AMD_Server_addChannelPtr &cb, const ::std::string& p1, ::Ice::Int p2, const ::Ice::Current &current) {
 	// qWarning() << "addChannel" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_addChannel_ALL
 #	ifdef ACCESS_Server_addChannel_READ
@@ -995,30 +1003,30 @@ void ::Murmur::ServerI::addChannel_async(const ::Murmur::AMD_Server_addChannelPt
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_addChannel_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_addChannel_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_addChannel_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_addChannel, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_addChannel_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_addChannel, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::sendMessageChannel_async(const ::Murmur::AMD_Server_sendMessageChannelPtr &cb, ::Ice::Int p1,
-												 bool p2, const ::std::string &p3, const ::Ice::Current &current) {
+void ::Murmur::ServerI::sendMessageChannel_async(const ::Murmur::AMD_Server_sendMessageChannelPtr &cb, ::Ice::Int p1, bool p2, const ::std::string& p3, const ::Ice::Current &current) {
 	// qWarning() << "sendMessageChannel" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_sendMessageChannel_ALL
 #	ifdef ACCESS_Server_sendMessageChannel_READ
@@ -1027,30 +1035,30 @@ void ::Murmur::ServerI::sendMessageChannel_async(const ::Murmur::AMD_Server_send
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_sendMessageChannel_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_sendMessageChannel_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_sendMessageChannel_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_sendMessageChannel, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
+#endif // ACCESS_Server_sendMessageChannel_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_sendMessageChannel, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getACL_async(const ::Murmur::AMD_Server_getACLPtr &cb, ::Ice::Int p1,
-									 const ::Ice::Current &current) {
+void ::Murmur::ServerI::getACL_async(const ::Murmur::AMD_Server_getACLPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getACL" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getACL_ALL
 #	ifdef ACCESS_Server_getACL_READ
@@ -1059,31 +1067,30 @@ void ::Murmur::ServerI::getACL_async(const ::Murmur::AMD_Server_getACLPtr &cb, :
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getACL_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getACL_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getACL_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getACL, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getACL_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getACL, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setACL_async(const ::Murmur::AMD_Server_setACLPtr &cb, ::Ice::Int p1,
-									 const ::Murmur::ACLList &p2, const ::Murmur::GroupList &p3, bool p4,
-									 const ::Ice::Current &current) {
+void ::Murmur::ServerI::setACL_async(const ::Murmur::AMD_Server_setACLPtr &cb, ::Ice::Int p1, const ACLList& p2, const GroupList& p3, bool p4, const ::Ice::Current &current) {
 	// qWarning() << "setACL" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setACL_ALL
 #	ifdef ACCESS_Server_setACL_READ
@@ -1092,30 +1099,30 @@ void ::Murmur::ServerI::setACL_async(const ::Murmur::AMD_Server_setACLPtr &cb, :
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setACL_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setACL_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setACL_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_setACL, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3, p4));
+#endif // ACCESS_Server_setACL_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setACL, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3, p4));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::addUserToGroup_async(const ::Murmur::AMD_Server_addUserToGroupPtr &cb, ::Ice::Int p1,
-											 ::Ice::Int p2, const ::std::string &p3, const ::Ice::Current &current) {
+void ::Murmur::ServerI::addUserToGroup_async(const ::Murmur::AMD_Server_addUserToGroupPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::std::string& p3, const ::Ice::Current &current) {
 	// qWarning() << "addUserToGroup" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_addUserToGroup_ALL
 #	ifdef ACCESS_Server_addUserToGroup_READ
@@ -1124,31 +1131,30 @@ void ::Murmur::ServerI::addUserToGroup_async(const ::Murmur::AMD_Server_addUserT
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_addUserToGroup_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_addUserToGroup_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_addUserToGroup_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_addUserToGroup, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
+#endif // ACCESS_Server_addUserToGroup_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_addUserToGroup, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::removeUserFromGroup_async(const ::Murmur::AMD_Server_removeUserFromGroupPtr &cb, ::Ice::Int p1,
-												  ::Ice::Int p2, const ::std::string &p3,
-												  const ::Ice::Current &current) {
+void ::Murmur::ServerI::removeUserFromGroup_async(const ::Murmur::AMD_Server_removeUserFromGroupPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::std::string& p3, const ::Ice::Current &current) {
 	// qWarning() << "removeUserFromGroup" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_removeUserFromGroup_ALL
 #	ifdef ACCESS_Server_removeUserFromGroup_READ
@@ -1157,31 +1163,30 @@ void ::Murmur::ServerI::removeUserFromGroup_async(const ::Murmur::AMD_Server_rem
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_removeUserFromGroup_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_removeUserFromGroup_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_removeUserFromGroup_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_removeUserFromGroup, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
+#endif // ACCESS_Server_removeUserFromGroup_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_removeUserFromGroup, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::redirectWhisperGroup_async(const ::Murmur::AMD_Server_redirectWhisperGroupPtr &cb,
-												   ::Ice::Int p1, const ::std::string &p2, const ::std::string &p3,
-												   const ::Ice::Current &current) {
+void ::Murmur::ServerI::redirectWhisperGroup_async(const ::Murmur::AMD_Server_redirectWhisperGroupPtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::std::string& p3, const ::Ice::Current &current) {
 	// qWarning() << "redirectWhisperGroup" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_redirectWhisperGroup_ALL
 #	ifdef ACCESS_Server_redirectWhisperGroup_READ
@@ -1190,30 +1195,30 @@ void ::Murmur::ServerI::redirectWhisperGroup_async(const ::Murmur::AMD_Server_re
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_redirectWhisperGroup_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_redirectWhisperGroup_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_redirectWhisperGroup_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_redirectWhisperGroup, cb,
-											  QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
+#endif // ACCESS_Server_redirectWhisperGroup_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_redirectWhisperGroup, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getUserNames_async(const ::Murmur::AMD_Server_getUserNamesPtr &cb, const ::Murmur::IdList &p1,
-										   const ::Ice::Current &current) {
+void ::Murmur::ServerI::getUserNames_async(const ::Murmur::AMD_Server_getUserNamesPtr &cb, const IdList& p1, const ::Ice::Current &current) {
 	// qWarning() << "getUserNames" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getUserNames_ALL
 #	ifdef ACCESS_Server_getUserNames_READ
@@ -1222,30 +1227,30 @@ void ::Murmur::ServerI::getUserNames_async(const ::Murmur::AMD_Server_getUserNam
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getUserNames_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getUserNames_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getUserNames_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getUserNames, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getUserNames_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getUserNames, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getUserIds_async(const ::Murmur::AMD_Server_getUserIdsPtr &cb, const ::Murmur::NameList &p1,
-										 const ::Ice::Current &current) {
+void ::Murmur::ServerI::getUserIds_async(const ::Murmur::AMD_Server_getUserIdsPtr &cb, const NameList& p1, const ::Ice::Current &current) {
 	// qWarning() << "getUserIds" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getUserIds_ALL
 #	ifdef ACCESS_Server_getUserIds_READ
@@ -1254,30 +1259,30 @@ void ::Murmur::ServerI::getUserIds_async(const ::Murmur::AMD_Server_getUserIdsPt
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getUserIds_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getUserIds_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getUserIds_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getUserIds, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getUserIds_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getUserIds, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::registerUser_async(const ::Murmur::AMD_Server_registerUserPtr &cb,
-										   const ::Murmur::UserInfoMap &p1, const ::Ice::Current &current) {
+void ::Murmur::ServerI::registerUser_async(const ::Murmur::AMD_Server_registerUserPtr &cb, const UserInfoMap& p1, const ::Ice::Current &current) {
 	// qWarning() << "registerUser" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_registerUser_ALL
 #	ifdef ACCESS_Server_registerUser_READ
@@ -1286,30 +1291,30 @@ void ::Murmur::ServerI::registerUser_async(const ::Murmur::AMD_Server_registerUs
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_registerUser_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_registerUser_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_registerUser_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_registerUser, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_registerUser_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_registerUser, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::unregisterUser_async(const ::Murmur::AMD_Server_unregisterUserPtr &cb, ::Ice::Int p1,
-											 const ::Ice::Current &current) {
+void ::Murmur::ServerI::unregisterUser_async(const ::Murmur::AMD_Server_unregisterUserPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "unregisterUser" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_unregisterUser_ALL
 #	ifdef ACCESS_Server_unregisterUser_READ
@@ -1318,30 +1323,30 @@ void ::Murmur::ServerI::unregisterUser_async(const ::Murmur::AMD_Server_unregist
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_unregisterUser_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_unregisterUser_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_unregisterUser_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_unregisterUser, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_unregisterUser_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_unregisterUser, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::updateRegistration_async(const ::Murmur::AMD_Server_updateRegistrationPtr &cb, ::Ice::Int p1,
-												 const ::Murmur::UserInfoMap &p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::updateRegistration_async(const ::Murmur::AMD_Server_updateRegistrationPtr &cb, ::Ice::Int p1, const UserInfoMap& p2, const ::Ice::Current &current) {
 	// qWarning() << "updateRegistration" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_updateRegistration_ALL
 #	ifdef ACCESS_Server_updateRegistration_READ
@@ -1350,30 +1355,30 @@ void ::Murmur::ServerI::updateRegistration_async(const ::Murmur::AMD_Server_upda
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_updateRegistration_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_updateRegistration_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_updateRegistration_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_updateRegistration, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_updateRegistration_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_updateRegistration, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getRegistration_async(const ::Murmur::AMD_Server_getRegistrationPtr &cb, ::Ice::Int p1,
-											  const ::Ice::Current &current) {
+void ::Murmur::ServerI::getRegistration_async(const ::Murmur::AMD_Server_getRegistrationPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getRegistration" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getRegistration_ALL
 #	ifdef ACCESS_Server_getRegistration_READ
@@ -1382,30 +1387,30 @@ void ::Murmur::ServerI::getRegistration_async(const ::Murmur::AMD_Server_getRegi
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getRegistration_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getRegistration_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getRegistration_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_getRegistration, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getRegistration_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getRegistration, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getRegisteredUsers_async(const ::Murmur::AMD_Server_getRegisteredUsersPtr &cb,
-												 const ::std::string &p1, const ::Ice::Current &current) {
+void ::Murmur::ServerI::getRegisteredUsers_async(const ::Murmur::AMD_Server_getRegisteredUsersPtr &cb, const ::std::string& p1, const ::Ice::Current &current) {
 	// qWarning() << "getRegisteredUsers" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getRegisteredUsers_ALL
 #	ifdef ACCESS_Server_getRegisteredUsers_READ
@@ -1414,30 +1419,30 @@ void ::Murmur::ServerI::getRegisteredUsers_async(const ::Murmur::AMD_Server_getR
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getRegisteredUsers_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getRegisteredUsers_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getRegisteredUsers_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_getRegisteredUsers, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getRegisteredUsers_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getRegisteredUsers, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::verifyPassword_async(const ::Murmur::AMD_Server_verifyPasswordPtr &cb, const ::std::string &p1,
-											 const ::std::string &p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::verifyPassword_async(const ::Murmur::AMD_Server_verifyPasswordPtr &cb, const ::std::string& p1, const ::std::string& p2, const ::Ice::Current &current) {
 	// qWarning() << "verifyPassword" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_verifyPassword_ALL
 #	ifdef ACCESS_Server_verifyPassword_READ
@@ -1446,30 +1451,30 @@ void ::Murmur::ServerI::verifyPassword_async(const ::Murmur::AMD_Server_verifyPa
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_verifyPassword_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_verifyPassword_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_verifyPassword_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_verifyPassword, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_verifyPassword_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_verifyPassword, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getTexture_async(const ::Murmur::AMD_Server_getTexturePtr &cb, ::Ice::Int p1,
-										 const ::Ice::Current &current) {
+void ::Murmur::ServerI::getTexture_async(const ::Murmur::AMD_Server_getTexturePtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getTexture" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getTexture_ALL
 #	ifdef ACCESS_Server_getTexture_READ
@@ -1478,30 +1483,30 @@ void ::Murmur::ServerI::getTexture_async(const ::Murmur::AMD_Server_getTexturePt
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getTexture_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getTexture_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getTexture_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getTexture, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getTexture_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getTexture, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::setTexture_async(const ::Murmur::AMD_Server_setTexturePtr &cb, ::Ice::Int p1,
-										 const ::Murmur::Texture &p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::setTexture_async(const ::Murmur::AMD_Server_setTexturePtr &cb, ::Ice::Int p1, const Texture& p2, const ::Ice::Current &current) {
 	// qWarning() << "setTexture" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_setTexture_ALL
 #	ifdef ACCESS_Server_setTexture_READ
@@ -1510,25 +1515,26 @@ void ::Murmur::ServerI::setTexture_async(const ::Murmur::AMD_Server_setTexturePt
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_setTexture_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_setTexture_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_setTexture_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_setTexture, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_setTexture_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_setTexture, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
@@ -1541,31 +1547,30 @@ void ::Murmur::ServerI::getUptime_async(const ::Murmur::AMD_Server_getUptimePtr
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getUptime_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getUptime_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getUptime_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie =
-		new ExecEvent(boost::bind(&impl_Server_getUptime, cb, QString::fromStdString(current.id.name).toInt()));
+#endif // ACCESS_Server_getUptime_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getUptime, cb, QString::fromStdString(current.id.name).toInt()));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::updateCertificate_async(const ::Murmur::AMD_Server_updateCertificatePtr &cb,
-												const ::std::string &p1, const ::std::string &p2,
-												const ::std::string &p3, const ::Ice::Current &current) {
+void ::Murmur::ServerI::updateCertificate_async(const ::Murmur::AMD_Server_updateCertificatePtr &cb, const ::std::string& p1, const ::std::string& p2, const ::std::string& p3, const ::Ice::Current &current) {
 	// qWarning() << "updateCertificate" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_updateCertificate_ALL
 #	ifdef ACCESS_Server_updateCertificate_READ
@@ -1574,30 +1579,30 @@ void ::Murmur::ServerI::updateCertificate_async(const ::Murmur::AMD_Server_updat
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_updateCertificate_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_updateCertificate_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_updateCertificate_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_updateCertificate, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
+#endif // ACCESS_Server_updateCertificate_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_updateCertificate, cb, QString::fromStdString(current.id.name).toInt(), p1, p2, p3));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::startListening_async(const ::Murmur::AMD_Server_startListeningPtr &cb, ::Ice::Int p1,
-											 ::Ice::Int p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::startListening_async(const ::Murmur::AMD_Server_startListeningPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::Ice::Current &current) {
 	// qWarning() << "startListening" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_startListening_ALL
 #	ifdef ACCESS_Server_startListening_READ
@@ -1606,30 +1611,30 @@ void ::Murmur::ServerI::startListening_async(const ::Murmur::AMD_Server_startLis
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_startListening_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_startListening_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_startListening_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_startListening, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_startListening_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_startListening, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::stopListening_async(const ::Murmur::AMD_Server_stopListeningPtr &cb, ::Ice::Int p1,
-											::Ice::Int p2, const ::Ice::Current &current) {
+void ::Murmur::ServerI::stopListening_async(const ::Murmur::AMD_Server_stopListeningPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::Ice::Current &current) {
 	// qWarning() << "stopListening" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_stopListening_ALL
 #	ifdef ACCESS_Server_stopListening_READ
@@ -1638,30 +1643,30 @@ void ::Murmur::ServerI::stopListening_async(const ::Murmur::AMD_Server_stopListe
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_stopListening_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_stopListening_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_stopListening_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_stopListening, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_stopListening_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_stopListening, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::isListening_async(const ::Murmur::AMD_Server_isListeningPtr &cb, ::Ice::Int p1, ::Ice::Int p2,
-										  const ::Ice::Current &current) {
+void ::Murmur::ServerI::isListening_async(const ::Murmur::AMD_Server_isListeningPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::Ice::Current &current) {
 	// qWarning() << "isListening" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_isListening_ALL
 #	ifdef ACCESS_Server_isListening_READ
@@ -1670,30 +1675,30 @@ void ::Murmur::ServerI::isListening_async(const ::Murmur::AMD_Server_isListening
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_isListening_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_isListening_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_isListening_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_isListening, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
+#endif // ACCESS_Server_isListening_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_isListening, cb, QString::fromStdString(current.id.name).toInt(), p1, p2));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getListeningChannels_async(const ::Murmur::AMD_Server_getListeningChannelsPtr &cb,
-												   ::Ice::Int p1, const ::Ice::Current &current) {
+void ::Murmur::ServerI::getListeningChannels_async(const ::Murmur::AMD_Server_getListeningChannelsPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getListeningChannels" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getListeningChannels_ALL
 #	ifdef ACCESS_Server_getListeningChannels_READ
@@ -1702,30 +1707,30 @@ void ::Murmur::ServerI::getListeningChannels_async(const ::Murmur::AMD_Server_ge
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getListeningChannels_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getListeningChannels_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getListeningChannels_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_getListeningChannels, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getListeningChannels_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getListeningChannels, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::ServerI::getListeningUsers_async(const ::Murmur::AMD_Server_getListeningUsersPtr &cb, ::Ice::Int p1,
-												const ::Ice::Current &current) {
+void ::Murmur::ServerI::getListeningUsers_async(const ::Murmur::AMD_Server_getListeningUsersPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getListeningUsers" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Server_getListeningUsers_ALL
 #	ifdef ACCESS_Server_getListeningUsers_READ
@@ -1734,30 +1739,30 @@ void ::Murmur::ServerI::getListeningUsers_async(const ::Murmur::AMD_Server_getLi
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Server_getListeningUsers_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Server_getListeningUsers_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Server_getListeningUsers_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
-	ExecEvent *ie = new ExecEvent(
-		boost::bind(&impl_Server_getListeningUsers, cb, QString::fromStdString(current.id.name).toInt(), p1));
+#endif // ACCESS_Server_getListeningUsers_ALL
+
+	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Server_getListeningUsers, cb, QString::fromStdString(current.id.name).toInt(), p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::getServer_async(const ::Murmur::AMD_Meta_getServerPtr &cb, ::Ice::Int p1,
-									  const ::Ice::Current &current) {
+void ::Murmur::MetaI::getServer_async(const ::Murmur::AMD_Meta_getServerPtr &cb, ::Ice::Int p1, const ::Ice::Current &current) {
 	// qWarning() << "getServer" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Meta_getServer_ALL
 #	ifdef ACCESS_Meta_getServer_READ
@@ -1766,23 +1771,25 @@ void ::Murmur::MetaI::getServer_async(const ::Murmur::AMD_Meta_getServerPtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_getServer_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_getServer_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_getServer_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_getServer_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_getServer, cb, current.adapter, p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
@@ -1796,29 +1803,30 @@ void ::Murmur::MetaI::newServer_async(const ::Murmur::AMD_Meta_newServerPtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_newServer_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_newServer_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_newServer_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_newServer_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_newServer, cb, current.adapter));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::getBootedServers_async(const ::Murmur::AMD_Meta_getBootedServersPtr &cb,
-											 const ::Ice::Current &current) {
+void ::Murmur::MetaI::getBootedServers_async(const ::Murmur::AMD_Meta_getBootedServersPtr &cb, const ::Ice::Current &current) {
 	// qWarning() << "getBootedServers" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Meta_getBootedServers_ALL
 #	ifdef ACCESS_Meta_getBootedServers_READ
@@ -1827,29 +1835,30 @@ void ::Murmur::MetaI::getBootedServers_async(const ::Murmur::AMD_Meta_getBootedS
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_getBootedServers_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_getBootedServers_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_getBootedServers_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_getBootedServers_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_getBootedServers, cb, current.adapter));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::getAllServers_async(const ::Murmur::AMD_Meta_getAllServersPtr &cb,
-										  const ::Ice::Current &current) {
+void ::Murmur::MetaI::getAllServers_async(const ::Murmur::AMD_Meta_getAllServersPtr &cb, const ::Ice::Current &current) {
 	// qWarning() << "getAllServers" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Meta_getAllServers_ALL
 #	ifdef ACCESS_Meta_getAllServers_READ
@@ -1858,29 +1867,30 @@ void ::Murmur::MetaI::getAllServers_async(const ::Murmur::AMD_Meta_getAllServers
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_getAllServers_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_getAllServers_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_getAllServers_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_getAllServers_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_getAllServers, cb, current.adapter));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::getDefaultConf_async(const ::Murmur::AMD_Meta_getDefaultConfPtr &cb,
-										   const ::Ice::Current &current) {
+void ::Murmur::MetaI::getDefaultConf_async(const ::Murmur::AMD_Meta_getDefaultConfPtr &cb, const ::Ice::Current &current) {
 	// qWarning() << "getDefaultConf" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Meta_getDefaultConf_ALL
 #	ifdef ACCESS_Meta_getDefaultConf_READ
@@ -1889,23 +1899,25 @@ void ::Murmur::MetaI::getDefaultConf_async(const ::Murmur::AMD_Meta_getDefaultCo
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_getDefaultConf_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_getDefaultConf_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_getDefaultConf_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_getDefaultConf_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_getDefaultConf, cb, current.adapter));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
@@ -1919,29 +1931,30 @@ void ::Murmur::MetaI::getVersion_async(const ::Murmur::AMD_Meta_getVersionPtr &c
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_getVersion_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_getVersion_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_getVersion_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_getVersion_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_getVersion, cb, current.adapter));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::addCallback_async(const ::Murmur::AMD_Meta_addCallbackPtr &cb,
-										const ::Murmur::MetaCallbackPrx &p1, const ::Ice::Current &current) {
+void ::Murmur::MetaI::addCallback_async(const ::Murmur::AMD_Meta_addCallbackPtr &cb, const MetaCallbackPrx& p1, const ::Ice::Current &current) {
 	// qWarning() << "addCallback" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Meta_addCallback_ALL
 #	ifdef ACCESS_Meta_addCallback_READ
@@ -1950,29 +1963,30 @@ void ::Murmur::MetaI::addCallback_async(const ::Murmur::AMD_Meta_addCallbackPtr
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_addCallback_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_addCallback_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_addCallback_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_addCallback_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_addCallback, cb, current.adapter, p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::removeCallback_async(const ::Murmur::AMD_Meta_removeCallbackPtr &cb,
-										   const ::Murmur::MetaCallbackPrx &p1, const ::Ice::Current &current) {
+void ::Murmur::MetaI::removeCallback_async(const ::Murmur::AMD_Meta_removeCallbackPtr &cb, const MetaCallbackPrx& p1, const ::Ice::Current &current) {
 	// qWarning() << "removeCallback" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Meta_removeCallback_ALL
 #	ifdef ACCESS_Meta_removeCallback_READ
@@ -1981,23 +1995,25 @@ void ::Murmur::MetaI::removeCallback_async(const ::Murmur::AMD_Meta_removeCallba
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_removeCallback_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_removeCallback_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_removeCallback_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_removeCallback_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_removeCallback, cb, current.adapter, p1));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
@@ -2011,29 +2027,30 @@ void ::Murmur::MetaI::getUptime_async(const ::Murmur::AMD_Meta_getUptimePtr &cb,
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_getUptime_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_getUptime_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_getUptime_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_getUptime_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_getUptime, cb, current.adapter));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::getSliceChecksums_async(const ::Murmur::AMD_Meta_getSliceChecksumsPtr &cb,
-											  const ::Ice::Current &current) {
+void ::Murmur::MetaI::getSliceChecksums_async(const ::Murmur::AMD_Meta_getSliceChecksumsPtr &cb, const ::Ice::Current &current) {
 	// qWarning() << "getSliceChecksums" << meta->mp.qsIceSecretRead.isNull() << meta->mp.qsIceSecretRead.isEmpty();
 #ifndef ACCESS_Meta_getSliceChecksums_ALL
 #	ifdef ACCESS_Meta_getSliceChecksums_READ
@@ -2042,147 +2059,29 @@ void ::Murmur::MetaI::getSliceChecksums_async(const ::Murmur::AMD_Meta_getSliceC
 #	else
 	if (!meta->mp.qsIceSecretRead.isNull() || !meta->mp.qsIceSecretWrite.isNull()) {
 		bool ok = !meta->mp.qsIceSecretWrite.isEmpty();
-#	endif
+#	endif // ACCESS_Meta_getSliceChecksums_READ
 		::Ice::Context::const_iterator i = current.ctx.find("secret");
-		ok                               = ok && (i != current.ctx.end());
+		ok = ok && (i != current.ctx.end());
 		if (ok) {
 			const QString &secret = u8((*i).second);
 #	ifdef ACCESS_Meta_getSliceChecksums_READ
 			ok = ((secret == meta->mp.qsIceSecretRead) || (secret == meta->mp.qsIceSecretWrite));
 #	else
 			ok = (secret == meta->mp.qsIceSecretWrite);
-#	endif
+#	endif // ACCESS_Meta_getSliceChecksums_READ
 		}
+
 		if (!ok) {
 			cb->ice_exception(InvalidSecretException());
 			return;
 		}
 	}
-#endif
+#endif // ACCESS_Meta_getSliceChecksums_ALL
+
 	ExecEvent *ie = new ExecEvent(boost::bind(&impl_Meta_getSliceChecksums, cb, current.adapter));
 	QCoreApplication::instance()->postEvent(mi, ie);
 }
 
-void ::Murmur::MetaI::getSlice_async(const ::Murmur::AMD_Meta_getSlicePtr &cb, const Ice::Current &) {
-	cb->ice_response(std::string(
-		"// Copyright 2005-2020 The Mumble Developers. All rights reserved.\n// Use of this source code is governed by "
-		"a BSD-style license\n// that can be found in the LICENSE file at the root of the\n// Mumble source tree or at "
-		"<https://www.mumble.info/LICENSE>.\n#include <Ice/SliceChecksumDict.ice>\nmodule "
-		"Murmur\n{\n[\"python:seq:tuple\"] sequence<byte> NetAddress;\nstruct User {\nint session;\nint userid;\nbool "
-		"mute;\nbool deaf;\nbool suppress;\nbool prioritySpeaker;\nbool selfMute;\nbool selfDeaf;\nbool "
-		"recording;\nint channel;\nstring name;\nint onlinesecs;\nint bytespersec;\nint version;\nstring "
-		"release;\nstring os;\nstring osversion;\nstring identity;\nstring context;\nstring comment;\nNetAddress "
-		"address;\nbool tcponly;\nint idlesecs;\nfloat udpPing;\nfloat tcpPing;\n};\nsequence<int> IntList;\nstruct "
-		"TextMessage {\nIntList sessions;\nIntList channels;\nIntList trees;\nstring text;\n};\nstruct Channel {\nint "
-		"id;\nstring name;\nint parent;\nIntList links;\nstring description;\nbool temporary;\nint "
-		"position;\n};\nstruct Group {\nstring name;\nbool inherited;\nbool inherit;\nbool inheritable;\nIntList "
-		"add;\nIntList remove;\nIntList members;\n};\nconst int PermissionWrite = 0x01;\nconst int PermissionTraverse "
-		"= 0x02;\nconst int PermissionEnter = 0x04;\nconst int PermissionSpeak = 0x08;\nconst int PermissionWhisper = "
-		"0x100;\nconst int PermissionMuteDeafen = 0x10;\nconst int PermissionMove = 0x20;\nconst int "
-		"PermissionMakeChannel = 0x40;\nconst int PermissionMakeTempChannel = 0x400;\nconst int PermissionLinkChannel "
-		"= 0x80;\nconst int PermissionTextMessage = 0x200;\nconst int PermissionKick = 0x10000;\nconst int "
-		"PermissionBan = 0x20000;\nconst int PermissionRegister = 0x40000;\nconst int PermissionRegisterSelf = "
-		"0x80000;\nstruct ACL {\nbool applyHere;\nbool applySubs;\nbool inherited;\nint userid;\nstring group;\nint "
-		"allow;\nint deny;\n};\nstruct Ban {\nNetAddress address;\nint bits;\nstring name;\nstring hash;\nstring "
-		"reason;\nint start;\nint duration;\n};\nstruct LogEntry {\nint timestamp;\nstring txt;\n};\nclass "
-		"Tree;\nsequence<Tree> TreeList;\nenum ChannelInfo { ChannelDescription, ChannelPosition };\nenum UserInfo { "
-		"UserName, UserEmail, UserComment, UserHash, UserPassword, UserLastActive, UserKDFIterations "
-		"};\ndictionary<int, User> UserMap;\ndictionary<int, Channel> ChannelMap;\nsequence<Channel> "
-		"ChannelList;\nsequence<User> UserList;\nsequence<Group> GroupList;\nsequence<ACL> "
-		"ACLList;\nsequence<LogEntry> LogList;\nsequence<Ban> BanList;\nsequence<int> IdList;\nsequence<string> "
-		"NameList;\ndictionary<int, string> NameMap;\ndictionary<string, int> IdMap;\nsequence<byte> "
-		"Texture;\ndictionary<string, string> ConfigMap;\nsequence<string> GroupNameList;\nsequence<byte> "
-		"CertificateDer;\nsequence<CertificateDer> CertificateList;\ndictionary<UserInfo, string> UserInfoMap;\nclass "
-		"Tree {\nChannel c;\nTreeList children;\nUserList users;\n};\nexception MurmurException {};\nexception "
-		"InvalidSessionException extends MurmurException {};\nexception InvalidChannelException extends "
-		"MurmurException {};\nexception InvalidServerException extends MurmurException {};\nexception "
-		"ServerBootedException extends MurmurException {};\nexception ServerFailureException extends MurmurException "
-		"{};\nexception InvalidUserException extends MurmurException {};\nexception InvalidTextureException extends "
-		"MurmurException {};\nexception InvalidCallbackException extends MurmurException {};\nexception "
-		"InvalidSecretException extends MurmurException {};\nexception NestingLimitException extends MurmurException "
-		"{};\nexception WriteOnlyException extends MurmurException {};\nexception InvalidInputDataException extends "
-		"MurmurException {};\ninterface ServerCallback {\nidempotent void userConnected(User state);\nidempotent void "
-		"userDisconnected(User state);\nidempotent void userStateChanged(User state);\nidempotent void "
-		"userTextMessage(User state, TextMessage message);\nidempotent void channelCreated(Channel state);\nidempotent "
-		"void channelRemoved(Channel state);\nidempotent void channelStateChanged(Channel state);\n};\nconst int "
-		"ContextServer = 0x01;\nconst int ContextChannel = 0x02;\nconst int ContextUser = 0x04;\ninterface "
-		"ServerContextCallback {\nidempotent void contextAction(string action, User usr, int session, int "
-		"channelid);\n};\ninterface ServerAuthenticator {\nidempotent int authenticate(string name, string pw, "
-		"CertificateList certificates, string certhash, bool certstrong, out string newname, out GroupNameList "
-		"groups);\nidempotent bool getInfo(int id, out UserInfoMap info);\nidempotent int nameToId(string "
-		"name);\nidempotent string idToName(int id);\nidempotent Texture idToTexture(int id);\n};\ninterface "
-		"ServerUpdatingAuthenticator extends ServerAuthenticator {\nint registerUser(UserInfoMap info);\nint "
-		"unregisterUser(int id);\nidempotent NameMap getRegisteredUsers(string filter);\nidempotent int setInfo(int "
-		"id, UserInfoMap info);\nidempotent int setTexture(int id, Texture tex);\n};\n[\"amd\"] interface Server "
-		"{\nidempotent bool isRunning() throws InvalidSecretException;\nvoid start() throws ServerBootedException, "
-		"ServerFailureException, InvalidSecretException;\nvoid stop() throws ServerBootedException, "
-		"InvalidSecretException;\nvoid delete() throws ServerBootedException, InvalidSecretException;\nidempotent int "
-		"id() throws InvalidSecretException;\nvoid addCallback(ServerCallback *cb) throws ServerBootedException, "
-		"InvalidCallbackException, InvalidSecretException;\nvoid removeCallback(ServerCallback *cb) throws "
-		"ServerBootedException, InvalidCallbackException, InvalidSecretException;\nvoid "
-		"setAuthenticator(ServerAuthenticator *auth) throws ServerBootedException, InvalidCallbackException, "
-		"InvalidSecretException;\nidempotent string getConf(string key) throws InvalidSecretException, "
-		"WriteOnlyException;\nidempotent ConfigMap getAllConf() throws InvalidSecretException;\nidempotent void "
-		"setConf(string key, string value) throws InvalidSecretException;\nidempotent void setSuperuserPassword(string "
-		"pw) throws InvalidSecretException;\nidempotent LogList getLog(int first, int last) throws "
-		"InvalidSecretException;\nidempotent int getLogLen() throws InvalidSecretException;\nidempotent UserMap "
-		"getUsers() throws ServerBootedException, InvalidSecretException;\nidempotent ChannelMap getChannels() throws "
-		"ServerBootedException, InvalidSecretException;\nidempotent CertificateList getCertificateList(int session) "
-		"throws ServerBootedException, InvalidSessionException, InvalidSecretException;\nidempotent Tree getTree() "
-		"throws ServerBootedException, InvalidSecretException;\nidempotent BanList getBans() throws "
-		"ServerBootedException, InvalidSecretException;\nidempotent void setBans(BanList bans) throws "
-		"ServerBootedException, InvalidSecretException;\nvoid kickUser(int session, string reason) throws "
-		"ServerBootedException, InvalidSessionException, InvalidSecretException;\nidempotent User getState(int "
-		"session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;\nidempotent void "
-		"setState(User state) throws ServerBootedException, InvalidSessionException, InvalidChannelException, "
-		"InvalidSecretException;\nvoid sendMessage(int session, string text) throws ServerBootedException, "
-		"InvalidSessionException, InvalidSecretException;\nbool hasPermission(int session, int channelid, int perm) "
-		"throws ServerBootedException, InvalidSessionException, InvalidChannelException, "
-		"InvalidSecretException;\nidempotent int effectivePermissions(int session, int channelid) throws "
-		"ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;\nvoid "
-		"addContextCallback(int session, string action, string text, ServerContextCallback *cb, int ctx) throws "
-		"ServerBootedException, InvalidCallbackException, InvalidSecretException;\nvoid "
-		"removeContextCallback(ServerContextCallback *cb) throws ServerBootedException, InvalidCallbackException, "
-		"InvalidSecretException;\nidempotent Channel getChannelState(int channelid) throws ServerBootedException, "
-		"InvalidChannelException, InvalidSecretException;\nidempotent void setChannelState(Channel state) throws "
-		"ServerBootedException, InvalidChannelException, InvalidSecretException, NestingLimitException;\nvoid "
-		"removeChannel(int channelid) throws ServerBootedException, InvalidChannelException, "
-		"InvalidSecretException;\nint addChannel(string name, int parent) throws ServerBootedException, "
-		"InvalidChannelException, InvalidSecretException, NestingLimitException;\nvoid sendMessageChannel(int "
-		"channelid, bool tree, string text) throws ServerBootedException, InvalidChannelException, "
-		"InvalidSecretException;\nidempotent void getACL(int channelid, out ACLList acls, out GroupList groups, out "
-		"bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;\nidempotent void "
-		"setACL(int channelid, ACLList acls, GroupList groups, bool inherit) throws ServerBootedException, "
-		"InvalidChannelException, InvalidSecretException;\nidempotent void addUserToGroup(int channelid, int session, "
-		"string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, "
-		"InvalidSecretException;\nidempotent void removeUserFromGroup(int channelid, int session, string group) throws "
-		"ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;\nidempotent "
-		"void redirectWhisperGroup(int session, string source, string target) throws ServerBootedException, "
-		"InvalidSessionException, InvalidSecretException;\nidempotent NameMap getUserNames(IdList ids) throws "
-		"ServerBootedException, InvalidSecretException;\nidempotent IdMap getUserIds(NameList names) throws "
-		"ServerBootedException, InvalidSecretException;\nint registerUser(UserInfoMap info) throws "
-		"ServerBootedException, InvalidUserException, InvalidSecretException;\nvoid unregisterUser(int userid) throws "
-		"ServerBootedException, InvalidUserException, InvalidSecretException;\nidempotent void updateRegistration(int "
-		"userid, UserInfoMap info) throws ServerBootedException, InvalidUserException, "
-		"InvalidSecretException;\nidempotent UserInfoMap getRegistration(int userid) throws ServerBootedException, "
-		"InvalidUserException, InvalidSecretException;\nidempotent NameMap getRegisteredUsers(string filter) throws "
-		"ServerBootedException, InvalidSecretException;\nidempotent int verifyPassword(string name, string pw) throws "
-		"ServerBootedException, InvalidSecretException;\nidempotent Texture getTexture(int userid) throws "
-		"ServerBootedException, InvalidUserException, InvalidSecretException;\nidempotent void setTexture(int userid, "
-		"Texture tex) throws ServerBootedException, InvalidUserException, InvalidTextureException, "
-		"InvalidSecretException;\nidempotent int getUptime() throws ServerBootedException, InvalidSecretException;\n "
-		"idempotent void updateCertificate(string certificate, string privateKey, string passphrase) throws "
-		"ServerBootedException, InvalidSecretException, InvalidInputDataException;\n \n idempotent void "
-		"startListening(int userid, int channelid);\n \n idempotent void stopListening(int userid, int channelid);\n "
-		"\n idempotent bool isListening(int userid, int channelid);\n \n idempotent IntList getListeningChannels(int "
-		"userid);\n \n idempotent IntList getListeningUsers(int channelid);\n};\ninterface MetaCallback {\nvoid "
-		"started(Server *srv);\nvoid stopped(Server *srv);\n};\nsequence<Server *> ServerList;\n[\"amd\"] interface "
-		"Meta {\nidempotent Server *getServer(int id) throws InvalidSecretException;\nServer *newServer() throws "
-		"InvalidSecretException;\nidempotent ServerList getBootedServers() throws InvalidSecretException;\nidempotent "
-		"ServerList getAllServers() throws InvalidSecretException;\nidempotent ConfigMap getDefaultConf() throws "
-		"InvalidSecretException;\nidempotent void getVersion(out int major, out int minor, out int patch, out string "
-		"text);\nvoid addCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;\nvoid "
-		"removeCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;\nidempotent int "
-		"getUptime();\nidempotent string getSlice();\nidempotent Ice::SliceChecksumDict "
-		"getSliceChecksums();\n};\n};\n"));
+void ::Murmur::MetaI::getSlice_async(const ::Murmur::AMD_Meta_getSlicePtr &cb, const Ice::Current&) {
+	cb->ice_response(std::string("\n\n\n\n#include <Ice/SliceChecksumDict.ice>\nmodule Murmur\n{\n\n[\"python:seq:tuple\"] sequence<byte> NetAddress;\n\nstruct User {\nint session;\nint userid;\nbool mute;\nbool deaf;\nbool suppress;\nbool prioritySpeaker;\nbool selfMute;\nbool selfDeaf;\nbool recording;\nint channel;\nstring name;\nint onlinesecs;\nint bytespersec;\nint version;\nstring release;\nstring os;\nstring osversion;\nstring identity;\nstring context;\nstring comment;\nNetAddress address;\nbool tcponly;\nint idlesecs;\nfloat udpPing;\nfloat tcpPing;\n};\nsequence<int> IntList;\n\nstruct TextMessage {\nIntList sessions;\nIntList channels;\nIntList trees;\nstring text;\n};\n\nstruct Channel {\nint id;\nstring name;\nint parent;\nIntList links;\nstring description;\nbool temporary;\nint position;\n};\n\nstruct Group {\nstring name;\nbool inherited;\nbool inherit;\nbool inheritable;\nIntList add;\nIntList remove;\nIntList members;\n};\n\nconst int PermissionWrite = 0x01;\nconst int PermissionTraverse = 0x02;\nconst int PermissionEnter = 0x04;\nconst int PermissionSpeak = 0x08;\nconst int PermissionWhisper = 0x100;\nconst int PermissionMuteDeafen = 0x10;\nconst int PermissionMove = 0x20;\nconst int PermissionMakeChannel = 0x40;\nconst int PermissionMakeTempChannel = 0x400;\nconst int PermissionLinkChannel = 0x80;\nconst int PermissionTextMessage = 0x200;\nconst int PermissionKick = 0x10000;\nconst int PermissionBan = 0x20000;\nconst int PermissionRegister = 0x40000;\nconst int PermissionRegisterSelf = 0x80000;\nconst int ResetUserContent = 0x100000;\n\nstruct ACL {\nbool applyHere;\nbool applySubs;\nbool inherited;\nint userid;\nstring group;\nint allow;\nint deny;\n};\n\nstruct Ban {\nNetAddress address;\nint bits;\nstring name;\nstring hash;\nstring reason;\nint start;\nint duration;\n};\n\nstruct LogEntry {\nint timestamp;\nstring txt;\n};\nclass Tree;\nsequence<Tree> TreeList;\nenum ChannelInfo { ChannelDescription, ChannelPosition };\nenum UserInfo { UserName, UserEmail, UserComment, UserHash, UserPassword, UserLastActive, UserKDFIterations };\ndictionary<int, User> UserMap;\ndictionary<int, Channel> ChannelMap;\nsequence<Channel> ChannelList;\nsequence<User> UserList;\nsequence<Group> GroupList;\nsequence<ACL> ACLList;\nsequence<LogEntry> LogList;\nsequence<Ban> BanList;\nsequence<int> IdList;\nsequence<string> NameList;\ndictionary<int, string> NameMap;\ndictionary<string, int> IdMap;\nsequence<byte> Texture;\ndictionary<string, string> ConfigMap;\nsequence<string> GroupNameList;\nsequence<byte> CertificateDer;\nsequence<CertificateDer> CertificateList;\n\ndictionary<UserInfo, string> UserInfoMap;\n\nclass Tree {\nChannel c;\nTreeList children;\nUserList users;\n};\nexception MurmurException {};\nexception InvalidSessionException extends MurmurException {};\nexception InvalidChannelException extends MurmurException {};\nexception InvalidServerException extends MurmurException {};\nexception ServerBootedException extends MurmurException {};\nexception ServerFailureException extends MurmurException {};\nexception InvalidUserException extends MurmurException {};\nexception InvalidTextureException extends MurmurException {};\nexception InvalidCallbackException extends MurmurException {};\nexception InvalidSecretException extends MurmurException {};\nexception NestingLimitException extends MurmurException {};\nexception WriteOnlyException extends MurmurException {};\nexception InvalidInputDataException extends MurmurException {};\n\ninterface ServerCallback {\nidempotent void userConnected(User state);\nidempotent void userDisconnected(User state);\nidempotent void userStateChanged(User state);\nidempotent void userTextMessage(User state, TextMessage message);\nidempotent void channelCreated(Channel state);\nidempotent void channelRemoved(Channel state);\nidempotent void channelStateChanged(Channel state);\n};\n\nconst int ContextServer = 0x01;\nconst int ContextChannel = 0x02;\nconst int ContextUser = 0x04;\n\ninterface ServerContextCallback {\nidempotent void contextAction(string action, User usr, int session, int channelid);\n};\n\ninterface ServerAuthenticator {\nidempotent int authenticate(string name, string pw, CertificateList certificates, string certhash, bool certstrong, out string newname, out GroupNameList groups);\n\nidempotent bool getInfo(int id, out UserInfoMap info);\n\nidempotent int nameToId(string name);\n\nidempotent string idToName(int id);\n\nidempotent Texture idToTexture(int id);\n};\n\ninterface ServerUpdatingAuthenticator extends ServerAuthenticator {\nint registerUser(UserInfoMap info);\n\nint unregisterUser(int id);\n\nidempotent NameMap getRegisteredUsers(string filter);\n\nidempotent int setInfo(int id, UserInfoMap info);\n\nidempotent int setTexture(int id, Texture tex);\n};\n\n[\"amd\"] interface Server {\nidempotent bool isRunning() throws InvalidSecretException;\n\nvoid start() throws ServerBootedException, ServerFailureException, InvalidSecretException;\n\nvoid stop() throws ServerBootedException, InvalidSecretException;\n\nvoid delete() throws ServerBootedException, InvalidSecretException;\n\nidempotent int id() throws InvalidSecretException;\n\nvoid addCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;\n\nvoid removeCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;\n\nvoid setAuthenticator(ServerAuthenticator *auth) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;\n\nidempotent string getConf(string key) throws InvalidSecretException, WriteOnlyException;\n\nidempotent ConfigMap getAllConf() throws InvalidSecretException;\n\nidempotent void setConf(string key, string value) throws InvalidSecretException;\n\nidempotent void setSuperuserPassword(string pw) throws InvalidSecretException;\n\nidempotent LogList getLog(int first, int last) throws InvalidSecretException;\n\nidempotent int getLogLen() throws InvalidSecretException;\n\nidempotent UserMap getUsers() throws ServerBootedException, InvalidSecretException;\n\nidempotent ChannelMap getChannels() throws ServerBootedException, InvalidSecretException;\n\nidempotent CertificateList getCertificateList(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;\n\nidempotent Tree getTree() throws ServerBootedException, InvalidSecretException;\n\nidempotent BanList getBans() throws ServerBootedException, InvalidSecretException;\n\nidempotent void setBans(BanList bans) throws ServerBootedException, InvalidSecretException;\n\nvoid kickUser(int session, string reason) throws ServerBootedException, InvalidSessionException, InvalidSecretException;\n\nidempotent User getState(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;\n\nidempotent void setState(User state) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;\n\nvoid sendMessage(int session, string text) throws ServerBootedException, InvalidSessionException, InvalidSecretException;\n\nbool hasPermission(int session, int channelid, int perm) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;\n\nidempotent int effectivePermissions(int session, int channelid) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;\n\nvoid addContextCallback(int session, string action, string text, ServerContextCallback *cb, int ctx) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;\n\nvoid removeContextCallback(ServerContextCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;\n\nidempotent Channel getChannelState(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;\n\nidempotent void setChannelState(Channel state) throws ServerBootedException, InvalidChannelException, InvalidSecretException, NestingLimitException;\n\nvoid removeChannel(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;\n\nint addChannel(string name, int parent) throws ServerBootedException, InvalidChannelException, InvalidSecretException, NestingLimitException;\n\nvoid sendMessageChannel(int channelid, bool tree, string text) throws ServerBootedException, InvalidChannelException, InvalidSecretException;\n\nidempotent void getACL(int channelid, out ACLList acls, out GroupList groups, out bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;\n\nidempotent void setACL(int channelid, ACLList acls, GroupList groups, bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;\n\nidempotent void addUserToGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;\n\nidempotent void removeUserFromGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;\n\nidempotent void redirectWhisperGroup(int session, string source, string target) throws ServerBootedException, InvalidSessionException, InvalidSecretException;\n\nidempotent NameMap getUserNames(IdList ids) throws ServerBootedException, InvalidSecretException;\n\nidempotent IdMap getUserIds(NameList names) throws ServerBootedException, InvalidSecretException;\n\nint registerUser(UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;\n\nvoid unregisterUser(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;\n\nidempotent void updateRegistration(int userid, UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;\n\nidempotent UserInfoMap getRegistration(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;\n\nidempotent NameMap getRegisteredUsers(string filter) throws ServerBootedException, InvalidSecretException;\n\nidempotent int verifyPassword(string name, string pw) throws ServerBootedException, InvalidSecretException;\n\nidempotent Texture getTexture(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;\n\nidempotent void setTexture(int userid, Texture tex) throws ServerBootedException, InvalidUserException, InvalidTextureException, InvalidSecretException;\n\nidempotent int getUptime() throws ServerBootedException, InvalidSecretException;\n\n idempotent void updateCertificate(string certificate, string privateKey, string passphrase) throws ServerBootedException, InvalidSecretException, InvalidInputDataException;\n \n idempotent void startListening(int userid, int channelid);\n \n idempotent void stopListening(int userid, int channelid);\n \n idempotent bool isListening(int userid, int channelid);\n \n idempotent IntList getListeningChannels(int userid);\n \n idempotent IntList getListeningUsers(int channelid);\n};\n\ninterface MetaCallback {\nvoid started(Server *srv);\n\nvoid stopped(Server *srv);\n};\nsequence<Server *> ServerList;\n\n[\"amd\"] interface Meta {\nidempotent Server *getServer(int id) throws InvalidSecretException;\n\nServer *newServer() throws InvalidSecretException;\n\nidempotent ServerList getBootedServers() throws InvalidSecretException;\n\nidempotent ServerList getAllServers() throws InvalidSecretException;\n\nidempotent ConfigMap getDefaultConf() throws InvalidSecretException;\n\nidempotent void getVersion(out int major, out int minor, out int patch, out string text);\n\nvoid addCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;\n\nvoid removeCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;\n\nidempotent int getUptime();\n\nidempotent string getSlice();\n\nidempotent Ice::SliceChecksumDict getSliceChecksums();\n};\n};\n"));
 }
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index d01dd31df..7d48b7267 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -36,7 +36,7 @@
 #include <QtNetwork/QHostInfo>
 #include <QtNetwork/QSslConfiguration>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #ifdef Q_OS_WIN
 #	include <qos2.h>
diff --git a/src/murmur_grpcwrapper_protoc_plugin/main.cpp b/src/murmur_grpcwrapper_protoc_plugin/main.cpp
index 3c832f05f..9d172524c 100644
--- a/src/murmur_grpcwrapper_protoc_plugin/main.cpp
+++ b/src/murmur_grpcwrapper_protoc_plugin/main.cpp
@@ -13,6 +13,7 @@
 #include <google/protobuf/io/printer.h>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/bind/bind.hpp>
 
 using namespace std;
 
@@ -38,7 +39,7 @@ public:
 
 	static void create(MurmurRPCImpl *rpc, ::$ns$::$service$::AsyncService *service) {
 		auto call = new $service$_$method$(rpc, service);
-		auto fn = ::boost::bind(&$service$_$method$::handle, call, _1);
+		auto fn = ::boost::bind(&$service$_$method$::handle, call, boost::placeholders::_1);
 		auto fn_ptr = new ::boost::function<void(bool)>(fn);
 		service->Request$method$(&call->context, &call->request, &call->stream, rpc->m_completionQueue.get(), rpc->m_completionQueue.get(), fn_ptr);
 	}
@@ -57,7 +58,7 @@ public:
 	void done(bool ok);
 
 	::boost::function<void(bool)> *callback(::boost::function<void($service$_$method$ *, bool)> cb) {
-		auto fn = ::boost::bind(&$service$_$method$::callbackAction, this, cb, _1);
+		auto fn = ::boost::bind(&$service$_$method$::callbackAction, this, cb, boost::placeholders::_1);
 		return new ::boost::function<void(bool)>(fn);
 	}
 
@@ -74,10 +75,10 @@ public:
 
 	static void create(MurmurRPCImpl *rpc, ::$ns$::$service$::AsyncService *service) {
 		auto call = new $service$_$method$(rpc, service);
-		auto done_fn = ::boost::bind(&$service$_$method$::handleDone, call, _1);
+		auto done_fn = ::boost::bind(&$service$_$method$::handleDone, call, boost::placeholders::_1);
 		auto done_fn_ptr = new ::boost::function<void(bool)>(done_fn);
 		call->context.AsyncNotifyWhenDone(done_fn_ptr);
-		auto fn = ::boost::bind(&$service$_$method$::handle, call, _1);
+		auto fn = ::boost::bind(&$service$_$method$::handle, call, boost::placeholders::_1);
 		auto fn_ptr = new ::boost::function<void(bool)>(fn);
 		service->Request$method$(&call->context, &call->request, &call->stream, rpc->m_completionQueue.get(), rpc->m_completionQueue.get(), fn_ptr);
 	}
@@ -115,7 +116,7 @@ public:
 
 	static void create(MurmurRPCImpl *rpc, ::$ns$::$service$::AsyncService *service) {
 		auto call = new $service$_$method$(rpc, service);
-		auto fn = ::boost::bind(&$service$_$method$::handle, call, _1);
+		auto fn = ::boost::bind(&$service$_$method$::handle, call, boost::placeholders::_1);
 		auto fn_ptr = new ::boost::function<void(bool)>(fn);
 		service->Request$method$(&call->context, &call->stream, rpc->m_completionQueue.get(), rpc->m_completionQueue.get(), fn_ptr);
 	}
@@ -166,7 +167,7 @@ public:
 	}
 
 	::boost::function<void(bool)> *callback(::boost::function<void($service$_$method$ *, bool)> cb) {
-		auto fn = ::boost::bind(&$service$_$method$::callbackAction, this, cb, _1);
+		auto fn = ::boost::bind(&$service$_$method$::callbackAction, this, cb, boost::placeholders::_1);
 		return new ::boost::function<void(bool)>(fn);
 	}
 
@@ -183,10 +184,10 @@ public:
 
 	static void create(MurmurRPCImpl *rpc, ::$ns$::$service$::AsyncService *service) {
 		auto call = new $service$_$method$(rpc, service);
-		auto done_fn = ::boost::bind(&$service$_$method$::handleDone, call, _1);
+		auto done_fn = ::boost::bind(&$service$_$method$::handleDone, call, boost::placeholders::_1);
 		auto done_fn_ptr = new ::boost::function<void(bool)>(done_fn);
 		call->context.AsyncNotifyWhenDone(done_fn_ptr);
-		auto fn = ::boost::bind(&$service$_$method$::handle, call, _1);
+		auto fn = ::boost::bind(&$service$_$method$::handle, call, boost::placeholders::_1);
 		auto fn_ptr = new ::boost::function<void(bool)>(fn);
 		service->Request$method$(&call->context, &call->stream, rpc->m_completionQueue.get(), rpc->m_completionQueue.get(), fn_ptr);
 	}