2 files changed, 14 insertions, 16 deletions

diff --git a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp
index 60d669b..0de73f9 100644
--- a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp
+++ b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp
@@ -27,8 +27,8 @@ namespace Mad {
 namespace Server {
 namespace RequestHandlers {
 
-void ConnectionRequestHandlerGroup::handleDaemonListRequest(boost::shared_ptr<const Common::XmlPacket> packet _UNUSED_PARAMETER_, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+void ConnectionRequestHandlerGroup::handleDaemonListRequest(boost::shared_ptr<const Common::XmlPacket> /*packet*/, Common::XmlPacket *ret,
+    Common::Connection* /*connection*/) {
   // TODO Require authentication
 
   ret->setType("OK");
diff --git a/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp b/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp
index 0bb3cfa..b830920 100644
--- a/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp
+++ b/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp
@@ -17,8 +17,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-
 #include "UserRequestHandlerGroup.h"
 #include "../Application.h"
 
@@ -31,7 +29,7 @@ namespace Server {
 namespace RequestHandlers {
 
 void UserRequestHandlerGroup::handleUserListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time);
 
   const std::string &timestr = packet->get<const std::string&>("timestamp");
@@ -64,7 +62,7 @@ void UserRequestHandlerGroup::handleUserListRequest(boost::shared_ptr<const Comm
 }
 
 void UserRequestHandlerGroup::handleUserInfoRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time);
 
   const std::string &timestr = packet->get<const std::string&>("timestamp");
@@ -97,7 +95,7 @@ void UserRequestHandlerGroup::handleUserInfoRequest(boost::shared_ptr<const Comm
 }
 
 void UserRequestHandlerGroup::handleUserGroupListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time);
 
   const std::string &timestr = packet->get<const std::string&>("timestamp");
@@ -127,7 +125,7 @@ void UserRequestHandlerGroup::handleUserGroupListRequest(boost::shared_ptr<const
 }
 
 void UserRequestHandlerGroup::handleGroupListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time);
 
   const std::string &timestr = packet->get<const std::string&>("timestamp");
@@ -158,7 +156,7 @@ void UserRequestHandlerGroup::handleGroupListRequest(boost::shared_ptr<const Com
 }
 
 void UserRequestHandlerGroup::handleGroupInfoRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time);
 
   const std::string &timestr = packet->get<const std::string&>("timestamp");
@@ -189,7 +187,7 @@ void UserRequestHandlerGroup::handleGroupInfoRequest(boost::shared_ptr<const Com
 }
 
 void UserRequestHandlerGroup::handleGroupUserListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time);
 
   const std::string &timestr = packet->get<const std::string&>("timestamp");
@@ -217,7 +215,7 @@ void UserRequestHandlerGroup::handleGroupUserListRequest(boost::shared_ptr<const
 }
 
 void UserRequestHandlerGroup::handleFullUserGroupListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time);
 
   const std::string &timestr = packet->get<const std::string&>("timestamp");
@@ -248,7 +246,7 @@ void UserRequestHandlerGroup::handleFullUserGroupListRequest(boost::shared_ptr<c
 }
 
 void UserRequestHandlerGroup::handleUserAddRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   Common::UserInfo userInfo(packet->get<unsigned long>("uid"), packet->get<const std::string&>("username"));
   userInfo.setGid(packet->get<unsigned long>("gid"));
   userInfo.setFullName(packet->get<const std::string&>("fullName"));
@@ -259,7 +257,7 @@ void UserRequestHandlerGroup::handleUserAddRequest(boost::shared_ptr<const Commo
 }
 
 void UserRequestHandlerGroup::handleUserUpdateRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   Common::UserInfo userInfo(packet->get<unsigned long>("uid"), packet->get<const std::string&>("username"));
   userInfo.setGid(packet->get<unsigned long>("gid"));
   userInfo.setFullName(packet->get<const std::string&>("fullName"));
@@ -270,21 +268,21 @@ void UserRequestHandlerGroup::handleUserUpdateRequest(boost::shared_ptr<const Co
 }
 
 void UserRequestHandlerGroup::handleUserDeleteRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   application->getUserManager()->deleteUser(packet->get<unsigned long>("uid"));
 
   ret->setType("OK");
 }
 
 void UserRequestHandlerGroup::handleAddUserToGroupRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   application->getUserManager()->addUserToGroup(packet->get<unsigned long>("uid"), packet->get<unsigned long>("gid"));
 
   ret->setType("OK");
 }
 
 void UserRequestHandlerGroup::handleDeleteUserFromGroupRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret,
-    Common::Connection *connection _UNUSED_PARAMETER_) {
+    Common::Connection* /*connection*/) {
   application->getUserManager()->deleteUserFromGroup(packet->get<unsigned long>("uid"), packet->get<unsigned long>("gid"));
 
   ret->setType("OK");