diff options
| author | Matthias Schiffer <matthias@gamezock.de> | 2009-05-18 19:53:51 +0200 |
|---|---|---|
| committer | Matthias Schiffer <matthias@gamezock.de> | 2009-05-18 19:53:51 +0200 |
| commit | fc3c50063f659584b2145addab8236a479a031b7 (patch) | |
| tree | 0aa7057cb9fa7523ace98e0776d46609de58954e /src/Daemon/RequestHandlers | |
| parent | a3e566c4d3631076e29f3651554603184b6351a7 (diff) | |
| download | mad-fc3c50063f659584b2145addab8236a479a031b7.tar mad-fc3c50063f659584b2145addab8236a479a031b7.zip | |
Von sigc++ auf boost-signals migriert
Diffstat (limited to 'src/Daemon/RequestHandlers')
| -rw-r--r-- | src/Daemon/RequestHandlers/CommandRequestHandler.cpp | 12 | ||||
| -rw-r--r-- | src/Daemon/RequestHandlers/Makefile.in | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/Daemon/RequestHandlers/CommandRequestHandler.cpp b/src/Daemon/RequestHandlers/CommandRequestHandler.cpp index 939f1f0..f7f21de 100644 --- a/src/Daemon/RequestHandlers/CommandRequestHandler.cpp +++ b/src/Daemon/RequestHandlers/CommandRequestHandler.cpp @@ -22,6 +22,8 @@ #include <Common/Logger.h> #include <Common/SystemManager.h> +#include <boost/bind.hpp> + namespace Mad { namespace Daemon { namespace RequestHandlers { @@ -36,7 +38,7 @@ void CommandRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished().emit(); + signalFinished()(); return; } @@ -46,11 +48,11 @@ void CommandRequestHandler::handlePacket(const Common::XmlPacket &packet) { std::string command = packet["command"]; if(command == "reboot") { - if(Common::SystemManager::get()->shutdown(sigc::mem_fun(this, &CommandRequestHandler::sendReply))) + if(Common::SystemManager::get()->shutdown(boost::bind(&CommandRequestHandler::sendReply, this))) return; } else { - if(Common::SystemManager::get()->reboot(sigc::mem_fun(this, &CommandRequestHandler::sendReply))) + if(Common::SystemManager::get()->reboot(boost::bind(&CommandRequestHandler::sendReply, this))) return; } @@ -60,7 +62,7 @@ void CommandRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished().emit(); + signalFinished()(); } void CommandRequestHandler::sendReply() { @@ -69,7 +71,7 @@ void CommandRequestHandler::sendReply() { sendPacket(packet); - signalFinished().emit(); + signalFinished()(); } } diff --git a/src/Daemon/RequestHandlers/Makefile.in b/src/Daemon/RequestHandlers/Makefile.in index 3de4cbe..8b34d1a 100644 --- a/src/Daemon/RequestHandlers/Makefile.in +++ b/src/Daemon/RequestHandlers/Makefile.in @@ -39,6 +39,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_signals.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/ax_lib_mysql.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -82,6 +83,7 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -213,8 +215,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sigc_CFLAGS = @sigc_CFLAGS@ -sigc_LIBS = @sigc_LIBS@ srcdir = @srcdir@ sys_symbol_underscore = @sys_symbol_underscore@ sysconfdir = @sysconfdir@ |