Removed sigc++ dependency and replaced it with TR1 functional.

Author: rakshasa

README

@@ -20,8 +20,7 @@ to the mailinglist.
 
 LIBRARY DEPENDENCIES
 
-  libsigc++ 2.0 (deb: libsigc++-2.0-dev)
-  g++ >= 3.3
+  g++ >= 4.2.1
 
 SIGC++
 
@@ -34,4 +33,4 @@ POLLING
 
  "libtorrent/src/torrent/poll.h" provides an abstract class for
 implementing any kind of polling the client wishes to use. Currently
-epoll and select based polling is included.
+epoll and select based polling is included.

configure.ac

@@ -95,10 +95,6 @@ AC_ARG_ENABLE(cyrus-rc4,
   ]
 )
 
-PKG_CHECK_MODULES(STUFF, sigc++-2.0,
-	          CXXFLAGS="$CXXFLAGS $STUFF_CFLAGS";
-		  LIBS="$LIBS $STUFF_LIBS")
-
 AC_CHECK_FUNCS(posix_memalign)
 
 TORRENT_CHECK_MADVISE()

src/download/download_main.h

@@ -39,7 +39,6 @@
 
 #include <deque>
 #include <rak/functional.h>
-#include <sigc++/signal.h>
 
 #include "globals.h"
 

src/download/download_wrapper.cc

@@ -39,7 +39,6 @@
 #include <iterator>
 #include <stdlib.h>
 #include <rak/file_stat.h>
-#include <sigc++/adaptors/bind.h>
 
 #include "data/chunk_list.h"
 #include "data/hash_queue.h"
@@ -108,8 +107,8 @@ DownloadWrapper::initialize(const std::string& hash, const std::string& id) {
 
   info()->mutable_local_id().assign(id.c_str());
 
-  info()->slot_left() = sigc::mem_fun(m_main->file_list(), &FileList::left_bytes);
-  info()->slot_completed() = sigc::mem_fun(m_main->file_list(), &FileList::completed_bytes);
+  info()->slot_left()      = tr1::bind(&FileList::left_bytes, m_main->file_list());
+  info()->slot_completed() = tr1::bind(&FileList::completed_bytes, m_main->file_list());
 
   file_list()->mutable_data()->mutable_hash().assign(hash.c_str());
 

src/download/download_wrapper.h

@@ -37,11 +37,7 @@
 #ifndef LIBTORRENT_DOWNLOAD_WRAPPER_H
 #define LIBTORRENT_DOWNLOAD_WRAPPER_H
 
-#include <sigc++/connection.h>
-#include <sigc++/signal.h>
-
 #include "data/chunk_handle.h"
-
 #include "download_main.h"
 
 namespace torrent {
@@ -59,10 +55,6 @@ class Peer;
 
 class DownloadWrapper {
 public:
-  typedef sigc::signal0<void>                     Signal;
-  typedef sigc::signal1<void, uint32_t>           SignalChunk;
-  typedef sigc::signal1<void, const std::string&> SignalString;
-
   DownloadWrapper();
   ~DownloadWrapper();
 
@@ -126,9 +118,6 @@ class DownloadWrapper {
   std::string         m_hash;
 
   int                 m_connectionType;
-
-  sigc::connection    m_connectionChunkPassed;
-  sigc::connection    m_connectionChunkFailed;
 };
 
 }

src/torrent/download.cc

@@ -39,8 +39,6 @@
 #define __STDC_FORMAT_MACROS
 
 #include <inttypes.h>
-#include <sigc++/adaptors/bind.h>
-#include <sigc++/adaptors/hide.h>
 
 #include "data/block.h"
 #include "data/block_list.h"

src/torrent/download.h

@@ -40,8 +40,6 @@
 #include <list>
 #include <vector>
 #include <string>
-#include <sigc++/connection.h>
-#include <sigc++/functors/slot.h>
 
 #include <torrent/common.h>
 #include <torrent/peer/peer.h>

src/tracker/tracker_udp.cc

@@ -40,7 +40,6 @@
 
 #include <sys/types.h>
 
-#include <sigc++/adaptors/bind.h>
 #include <torrent/connection_manager.h>
 #include <cstdio>
 
@@ -56,6 +55,8 @@
 #include "tracker_udp.h"
 #include "manager.h"
 
+namespace tr1 { using namespace std::tr1; }
+
 #define LT_LOG_TRACKER(log_level, log_fmt, ...)                         \
   lt_log_print_info(LOG_TRACKER_##log_level, m_parent->info(), "tracker", "[%u] " log_fmt, group(), __VA_ARGS__);
 
@@ -109,7 +110,10 @@ TrackerUdp::send_state(int state) {
 
   m_sendState = state;
   m_slot_resolver = manager->connection_manager()->resolver()(hostname, PF_INET, SOCK_DGRAM,
-                                                              sigc::mem_fun(this, &TrackerUdp::start_announce));
+                                                              tr1::bind(&TrackerUdp::start_announce,
+                                                                        this,
+                                                                        tr1::placeholders::_1,
+                                                                        tr1::placeholders::_2));
 }
 
 void