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
+5 -5
View File
@@ -45,8 +45,8 @@ namespace input {
class TextInput : private std::string {
public:
typedef std::string Base;
typedef sigc::slot0<void> SlotDirty;
typedef std::string Base;
typedef std::tr1::function<void ()> slot_void;
using Base::c_str;
using Base::empty;
@@ -64,8 +64,8 @@ public:
void clear() { m_pos = 0; m_alt = false; Base::clear(); }
void slot_dirty(SlotDirty s) { m_slotDirty = s; }
void mark_dirty() { m_slotDirty(); }
void slot_dirty(slot_void s) { m_slot_dirty = s; }
void mark_dirty() { if (m_slot_dirty) m_slot_dirty(); }
std::string& str() { return *this; }
@@ -75,7 +75,7 @@ private:
size_type m_pos;
bool m_alt;
SlotDirty m_slotDirty;
slot_void m_slot_dirty;
Bindings m_bindings;
};