Converted sigc++ slots to std::tr1::function.

This commit is contained in:
rakshasa
2013-08-24 00:14:25 +09:00
parent 629ebcbd54
commit 529eda5aab
39 changed files with 267 additions and 290 deletions
+16 -16
View File
@@ -38,31 +38,31 @@
#define RTORRENT_INPUT_BINDINGS_H
#include <map>
#include <sigc++/functors/slot.h>
#include <tr1/functional>
#include "display/attributes.h"
namespace input {
class Bindings : private std::map<int, sigc::slot0<void> > {
class Bindings : private std::map<int, std::tr1::function<void ()> > {
public:
typedef sigc::slot0<void> Slot;
typedef std::map<int, Slot > Base;
typedef std::tr1::function<void ()> slot_void;
typedef std::map<int, slot_void> base_type;
using Base::iterator;
using Base::const_iterator;
using Base::reverse_iterator;
using Base::const_reverse_iterator;
using base_type::iterator;
using base_type::const_iterator;
using base_type::reverse_iterator;
using base_type::const_reverse_iterator;
using Base::begin;
using Base::end;
using Base::rbegin;
using Base::rend;
using Base::find;
using base_type::begin;
using base_type::end;
using base_type::rbegin;
using base_type::rend;
using base_type::find;
using Base::erase;
using base_type::erase;
using Base::operator[];
using base_type::operator[];
Bindings() : m_enabled(true) {}
@@ -71,7 +71,7 @@ public:
bool pressed(int key);
void ignore(int key) { (*this)[key] = Slot(); }
void ignore(int key) { (*this)[key] = slot_void(); }
private:
bool m_enabled;