diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/environment/Environment.cpp sear-0.6.3.good/environment/Environment.cpp --- sear-0.6.3/environment/Environment.cpp 2007-01-31 22:25:00.000000000 +0100 +++ sear-0.6.3.good/environment/Environment.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -37,11 +37,11 @@ m_weather->init(); - RenderSystem::getInstance().ContextCreated.connect(SigC::slot(*this, &Environment::contextCreated)); - RenderSystem::getInstance().ContextDestroyed.connect(SigC::slot(*this, &Environment::contextDestroyed)); + RenderSystem::getInstance().ContextCreated.connect(sigc::mem_fun(*this, &Environment::contextCreated)); + RenderSystem::getInstance().ContextDestroyed.connect(sigc::mem_fun(*this, &Environment::contextDestroyed)); // Clean up terrain data when leaving game world - System::instance()->LeftWorld.connect(SigC::slot(*this, &Environment::resetWorld)); + System::instance()->LeftWorld.connect(sigc::mem_fun(*this, &Environment::resetWorld)); m_initialised = true; } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/Button.cpp sear-0.6.3.good/gui/Button.cpp --- sear-0.6.3/gui/Button.cpp 2005-01-01 06:05:50.000000000 +0100 +++ sear-0.6.3.good/gui/Button.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -47,9 +47,9 @@ void Button::connectSignals() { - m_frame->MouseDown.connect(SigC::slot(*this, &Button::onPressed)); - m_frame->MouseUp.connect(SigC::slot(*this, &Button::onRelease)); - m_frame->MouseLeave.connect(SigC::slot(*this, &Button::onLeave)); + m_frame->MouseDown.connect(sigc::mem_fun(*this, &Button::onPressed)); + m_frame->MouseUp.connect(sigc::mem_fun(*this, &Button::onRelease)); + m_frame->MouseLeave.connect(sigc::mem_fun(*this, &Button::onLeave)); m_frame->setEvents(MOUSE_BUTTON_DOWN | MOUSE_BUTTON_UP | MOUSE_LEAVE); } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/Button.h sear-0.6.3.good/gui/Button.h --- sear-0.6.3/gui/Button.h 2008-04-05 15:53:37.000000000 +0200 +++ sear-0.6.3.good/gui/Button.h 2008-04-05 15:50:30.000000000 +0200 @@ -42,7 +42,7 @@ void onRelease(); void onLeave(); - SigC::Signal0<void> Clicked; + sigc::signal0<void> Clicked; }; } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/ConnectDialogue.cpp sear-0.6.3.good/gui/ConnectDialogue.cpp --- sear-0.6.3/gui/ConnectDialogue.cpp 2005-01-02 18:11:16.000000000 +0100 +++ sear-0.6.3.good/gui/ConnectDialogue.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -17,7 +17,7 @@ m_connectButton = new Button("Connect"); m_hostEntry = new TextEntry(20, "localhost"); - m_connectButton->Clicked.connect(SigC::slot(*this, &ConnectDialogue::connect)); + m_connectButton->Clicked.connect(sigc::mem_fun(*this, &ConnectDialogue::connect)); VBox * vb = new VBox(2, 4); vb->push_back(m_hostEntry); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/ConnectDialogue.h sear-0.6.3.good/gui/ConnectDialogue.h --- sear-0.6.3/gui/ConnectDialogue.h 2005-01-01 06:05:50.000000000 +0100 +++ sear-0.6.3.good/gui/ConnectDialogue.h 2008-04-05 15:50:30.000000000 +0200 @@ -27,7 +27,7 @@ ConnectDialogue(); virtual ~ConnectDialogue(); - SigC::Signal1<void, const std::string &> Connect; + sigc::signal1<void, const std::string &> Connect; }; } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/focus.cpp sear-0.6.3.good/gui/focus.cpp --- sear-0.6.3/gui/focus.cpp 2004-10-18 23:19:58.000000000 +0200 +++ sear-0.6.3.good/gui/focus.cpp 2008-04-05 15:50:30.000000000 +0200 @@ -9,7 +9,7 @@ namespace Sear { static Window * focusWindow = 0; -SigC::Signal1<void, Window *> focusChangedSignal; +sigc::signal1<void, Window *> focusChangedSignal; void grabFocus(Window * w) { @@ -32,7 +32,7 @@ return focusWindow; } -SigC::Signal1<void, Window *> & focusSignal() +sigc::signal1<void, Window *> & focusSignal() { return focusChangedSignal; } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/focus.h sear-0.6.3.good/gui/focus.h --- sear-0.6.3/gui/focus.h 2004-10-18 23:19:58.000000000 +0200 +++ sear-0.6.3.good/gui/focus.h 2008-04-05 15:50:30.000000000 +0200 @@ -14,7 +14,7 @@ void grabFocus(Window *); void dropFocus(Window *); Window * queryFocus(); -SigC::Signal1<void, Window *> & focusSignal(); +sigc::signal1<void, Window *> & focusSignal(); } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/LoginDialogue.cpp sear-0.6.3.good/gui/LoginDialogue.cpp --- sear-0.6.3/gui/LoginDialogue.cpp 2005-01-02 18:11:16.000000000 +0100 +++ sear-0.6.3.good/gui/LoginDialogue.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -21,8 +21,8 @@ m_passwordEntry = new TextEntry(10, "", true); m_realnameEntry = new TextEntry(20, ""); - m_loginButton->Clicked.connect(SigC::slot(*this, &LoginDialogue::login)); - m_createButton->Clicked.connect(SigC::slot(*this, &LoginDialogue::create)); + m_loginButton->Clicked.connect(sigc::mem_fun(*this, &LoginDialogue::login)); + m_createButton->Clicked.connect(sigc::mem_fun(*this, &LoginDialogue::create)); HBox * hb = new HBox(2); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/LoginDialogue.h sear-0.6.3.good/gui/LoginDialogue.h --- sear-0.6.3/gui/LoginDialogue.h 2005-01-02 18:11:16.000000000 +0100 +++ sear-0.6.3.good/gui/LoginDialogue.h 2008-04-05 15:50:30.000000000 +0200 @@ -31,8 +31,8 @@ LoginDialogue(); virtual ~LoginDialogue(); - SigC::Signal2<void, const std::string &, const std::string &> Login; - SigC::Signal3<void, const std::string &, const std::string &, const std::string &> Create; + sigc::signal2<void, const std::string &, const std::string &> Login; + sigc::signal3<void, const std::string &, const std::string &, const std::string &> Create; }; } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/TextEntry.cpp sear-0.6.3.good/gui/TextEntry.cpp --- sear-0.6.3/gui/TextEntry.cpp 2005-01-07 13:01:44.000000000 +0100 +++ sear-0.6.3.good/gui/TextEntry.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -54,9 +54,9 @@ m_frame->addChild(m_text); m_frame->setPos(x, y); m_frame->setSize(m_border * 2 + cw, m_border * 2 + ch); - m_frame->MouseDown.connect(SigC::slot(*this, &TextEntry::onPressed)); - m_frame->KeyPress.connect(SigC::slot(*this, &TextEntry::onKeyPress)); - focusSignal().connect(SigC::slot(*this, &TextEntry::onFocus)); + m_frame->MouseDown.connect(sigc::mem_fun(*this, &TextEntry::onPressed)); + m_frame->KeyPress.connect(sigc::mem_fun(*this, &TextEntry::onKeyPress)); + focusSignal().connect(sigc::mem_fun(*this, &TextEntry::onFocus)); m_frame->setEvents(MOUSE_BUTTON_DOWN | KEY_PRESS); m_caret->setPos((int)(m_caretPos * 10 * m_text->scale()) + m_border + 4, m_border); win->addChild(m_frame); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/ToggleButton.cpp sear-0.6.3.good/gui/ToggleButton.cpp --- sear-0.6.3/gui/ToggleButton.cpp 2005-01-01 06:05:51.000000000 +0100 +++ sear-0.6.3.good/gui/ToggleButton.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -30,9 +30,9 @@ void ToggleButton::connectSignals() { - m_frame->MouseDown.connect(SigC::slot(*this, &ToggleButton::onPressed)); - m_frame->MouseUp.connect(SigC::slot(*this, &ToggleButton::onRelease)); - // m_frame->MouseLeave.connect(SigC::slot(*this, &ToggleButton::onLeave)); + m_frame->MouseDown.connect(sigc::mem_fun(*this, &ToggleButton::onPressed)); + m_frame->MouseUp.connect(sigc::mem_fun(*this, &ToggleButton::onRelease)); + // m_frame->MouseLeave.connect(sigc::mem_fun(*this, &ToggleButton::onLeave)); m_frame->setEvents(MOUSE_BUTTON_DOWN | MOUSE_BUTTON_UP | MOUSE_LEAVE); } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/ToggleButton.h sear-0.6.3.good/gui/ToggleButton.h --- sear-0.6.3/gui/ToggleButton.h 2005-01-01 06:05:51.000000000 +0100 +++ sear-0.6.3.good/gui/ToggleButton.h 2008-04-05 15:50:30.000000000 +0200 @@ -27,7 +27,7 @@ void onRelease(); void onLeave(); - SigC::Signal0<void> UnClicked; + sigc::signal0<void> UnClicked; }; } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/Widget.h sear-0.6.3.good/gui/Widget.h --- sear-0.6.3/gui/Widget.h 2004-10-26 16:43:16.000000000 +0200 +++ sear-0.6.3.good/gui/Widget.h 2008-04-05 15:51:06.000000000 +0200 @@ -13,7 +13,7 @@ /// Higher level class defining any part in the gui. /// They key difference is that some widgets may not have a visible component. -class Widget : virtual public SigC::Object { +class Widget : virtual public sigc::trackable { private: // Private and unimplemented to prevent slicing Widget(const Widget &); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/gui/Window.h sear-0.6.3.good/gui/Window.h --- sear-0.6.3/gui/Window.h 2005-01-01 06:05:51.000000000 +0100 +++ sear-0.6.3.good/gui/Window.h 2008-04-05 15:50:30.000000000 +0200 @@ -83,11 +83,11 @@ virtual void render(Render *) = 0; - SigC::Signal0<void> MouseDown; - SigC::Signal0<void> MouseUp; - SigC::Signal0<void> MouseEnter; - SigC::Signal0<void> MouseLeave; - SigC::Signal2<void, SDLKey, Uint16> KeyPress; + sigc::signal0<void> MouseDown; + sigc::signal0<void> MouseUp; + sigc::signal0<void> MouseEnter; + sigc::signal0<void> MouseLeave; + sigc::signal2<void, SDLKey, Uint16> KeyPress; }; } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/ActionListenerSigC.h sear-0.6.3.good/guichan/ActionListenerSigC.h --- sear-0.6.3/guichan/ActionListenerSigC.h 2006-10-06 22:27:05.000000000 +0200 +++ sear-0.6.3.good/guichan/ActionListenerSigC.h 2008-04-05 15:50:30.000000000 +0200 @@ -19,7 +19,7 @@ } public: - SigC::Signal1<void, std::string> Action; + sigc::signal1<void, std::string> Action; }; } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Alert.cpp sear-0.6.3.good/guichan/Alert.cpp --- sear-0.6.3/guichan/Alert.cpp 2006-12-02 16:20:37.000000000 +0100 +++ sear-0.6.3.good/guichan/Alert.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -36,7 +36,7 @@ m_widgets.push_back(SPtr<gcn::Widget>(l1)); m_buttonListener = new ActionListenerSigC; - m_buttonListener->Action.connect(SigC::slot(*this, &Alert::actionPressed)); + m_buttonListener->Action.connect(sigc::mem_fun(*this, &Alert::actionPressed)); m_okButton = new gcn::Button("Okay"); m_widgets.push_back(SPtr<gcn::Widget>(m_okButton)); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Alert.h sear-0.6.3.good/guichan/Alert.h --- sear-0.6.3/guichan/Alert.h 2006-04-30 21:58:50.000000000 +0200 +++ sear-0.6.3.good/guichan/Alert.h 2008-04-05 15:51:06.000000000 +0200 @@ -22,7 +22,7 @@ class ActionListenerSigC; -class Alert : virtual public SigC::Object, public gcn::Window { +class Alert : virtual public sigc::trackable, public gcn::Window { protected: gcn::Button * m_okButton; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/CharacterWindow.cpp sear-0.6.3.good/guichan/CharacterWindow.cpp --- sear-0.6.3/guichan/CharacterWindow.cpp 2007-02-05 18:30:45.000000000 +0100 +++ sear-0.6.3.good/guichan/CharacterWindow.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -110,7 +110,7 @@ // vbox->pack(l1); m_buttonListener = new ActionListenerSigC; - m_buttonListener->Action.connect(SigC::slot(*this, &CharacterWindow::actionPressed)); + m_buttonListener->Action.connect(sigc::mem_fun(*this, &CharacterWindow::actionPressed)); m_characterListModel = new CharacterListModel; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/CharacterWindow.h sear-0.6.3.good/guichan/CharacterWindow.h --- sear-0.6.3/guichan/CharacterWindow.h 2007-01-27 22:02:18.000000000 +0100 +++ sear-0.6.3.good/guichan/CharacterWindow.h 2008-04-05 15:51:06.000000000 +0200 @@ -25,7 +25,7 @@ class ActionListenerSigC; class CharacterListModel; -class CharacterWindow : virtual public SigC::Object, public gcn::Window { +class CharacterWindow : virtual public sigc::trackable, public gcn::Window { protected: std::list<SPtr<gcn::Widget> > m_widgets; gcn::ListBox * m_characters; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/CommandLine.h sear-0.6.3.good/guichan/CommandLine.h --- sear-0.6.3/guichan/CommandLine.h 2006-01-16 17:15:59.000000000 +0100 +++ sear-0.6.3.good/guichan/CommandLine.h 2008-04-05 15:50:30.000000000 +0200 @@ -21,7 +21,7 @@ gcn::TextField::keyPress(key); } public: - SigC::Signal0<void> ReturnPressed; + sigc::signal0<void> ReturnPressed; }; } // namespace Sear diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/ConnectWindow.cpp sear-0.6.3.good/guichan/ConnectWindow.cpp --- sear-0.6.3/guichan/ConnectWindow.cpp 2007-01-25 18:32:28.000000000 +0100 +++ sear-0.6.3.good/guichan/ConnectWindow.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -80,7 +80,7 @@ m_serverListModel = new ServerListModel; m_buttonListener = new ActionListenerSigC; - m_buttonListener->Action.connect(SigC::slot(*this, &ConnectWindow::actionPressed)); + m_buttonListener->Action.connect(sigc::mem_fun(*this, &ConnectWindow::actionPressed)); m_servers = new DblClkListBox(m_serverListModel, m_buttonListener, "connect"); m_widgets.push_back(SPtr<gcn::Widget>(m_servers)); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/ConnectWindow.h sear-0.6.3.good/guichan/ConnectWindow.h --- sear-0.6.3/guichan/ConnectWindow.h 2006-10-09 10:06:04.000000000 +0200 +++ sear-0.6.3.good/guichan/ConnectWindow.h 2008-04-05 15:51:06.000000000 +0200 @@ -24,7 +24,7 @@ class ActionListenerSigC; class ServerListModel; -class ConnectWindow : virtual public SigC::Object, public gcn::Window { +class ConnectWindow : virtual public sigc::trackable, public gcn::Window { protected: std::list<SPtr<gcn::Widget> > m_widgets; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/ConsoleWindow.cpp sear-0.6.3.good/guichan/ConsoleWindow.cpp --- sear-0.6.3/guichan/ConsoleWindow.cpp 2006-10-06 22:40:55.000000000 +0200 +++ sear-0.6.3.good/guichan/ConsoleWindow.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -57,7 +57,7 @@ m_entry->setWidth(400); m_entry->setTabInEnabled(false); m_entry->setTabOutEnabled(false); - m_entry->ReturnPressed.connect(SigC::slot(*this, &ConsoleWindow::lineEntered)); + m_entry->ReturnPressed.connect(sigc::mem_fun(*this, &ConsoleWindow::lineEntered)); vbox->pack(m_entry); @@ -65,7 +65,7 @@ resizeToContent(); - System::instance()->pushedMessage.connect(SigC::slot(*this, &ConsoleWindow::pushMessage)); + System::instance()->pushedMessage.connect(sigc::mem_fun(*this, &ConsoleWindow::pushMessage)); } ConsoleWindow::~ConsoleWindow() diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/ConsoleWindow.h sear-0.6.3.good/guichan/ConsoleWindow.h --- sear-0.6.3/guichan/ConsoleWindow.h 2006-04-30 22:19:20.000000000 +0200 +++ sear-0.6.3.good/guichan/ConsoleWindow.h 2008-04-05 15:51:06.000000000 +0200 @@ -20,7 +20,7 @@ class CommandLine; -class ConsoleWindow : public gcn::Window, virtual public SigC::Object { +class ConsoleWindow : public gcn::Window, virtual public sigc::trackable { protected: std::list<SPtr<gcn::Widget> > m_widgets; gcn::TextBox * m_textBox; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Inventory.cpp sear-0.6.3.good/guichan/Inventory.cpp --- sear-0.6.3/guichan/Inventory.cpp 2007-01-27 12:13:26.000000000 +0100 +++ sear-0.6.3.good/guichan/Inventory.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -90,7 +90,7 @@ m_widgets.push_back(SPtr<gcn::Widget>(hbox)); m_buttonListener = new ActionListenerSigC; - m_buttonListener->Action.connect(SigC::slot(*this, &Inventory::actionPressed)); + m_buttonListener->Action.connect(sigc::mem_fun(*this, &Inventory::actionPressed)); gcn::Button * button = new gcn::Button("Wield"); m_widgets.push_back(SPtr<gcn::Widget>(button)); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Inventory.h sear-0.6.3.good/guichan/Inventory.h --- sear-0.6.3/guichan/Inventory.h 2007-01-23 19:20:25.000000000 +0100 +++ sear-0.6.3.good/guichan/Inventory.h 2008-04-05 15:51:06.000000000 +0200 @@ -22,7 +22,7 @@ class InventoryListAdaptor; class ActionListenerSigC; -class Inventory : virtual public SigC::Object, public gcn::Window { +class Inventory : virtual public sigc::trackable, public gcn::Window { protected: std::list<SPtr<gcn::Widget> > m_widgets; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/LoginWindow.h sear-0.6.3.good/guichan/LoginWindow.h --- sear-0.6.3/guichan/LoginWindow.h 2006-04-30 22:27:22.000000000 +0200 +++ sear-0.6.3.good/guichan/LoginWindow.h 2008-04-05 15:51:06.000000000 +0200 @@ -26,7 +26,7 @@ class ActionListenerSigC; -class LoginWindow : virtual public SigC::Object, public gcn::Window { +class LoginWindow : virtual public sigc::trackable, public gcn::Window { protected: std::list<SPtr<gcn::Widget> > m_widgets; gcn::Button * m_loginButton; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/OptionsWindow.cpp sear-0.6.3.good/guichan/OptionsWindow.cpp --- sear-0.6.3/guichan/OptionsWindow.cpp 2006-10-06 22:28:03.000000000 +0200 +++ sear-0.6.3.good/guichan/OptionsWindow.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -37,7 +37,7 @@ setOpaque(true); m_buttonListener = new ActionListenerSigC; - m_buttonListener->Action.connect(SigC::slot(*this, &OptionsWindow::actionPressed)); + m_buttonListener->Action.connect(sigc::mem_fun(*this, &OptionsWindow::actionPressed)); gcn::Box * vbox = new gcn::VBox(6); m_widgets.push_back(SPtr<gcn::Widget>(vbox)); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/OptionsWindow.h sear-0.6.3.good/guichan/OptionsWindow.h --- sear-0.6.3/guichan/OptionsWindow.h 2006-04-30 22:30:40.000000000 +0200 +++ sear-0.6.3.good/guichan/OptionsWindow.h 2008-04-05 15:51:06.000000000 +0200 @@ -24,7 +24,7 @@ class ActionListenerSigC; class RootWidget; -class OptionsWindow : virtual public SigC::Object, public gcn::Window { +class OptionsWindow : virtual public sigc::trackable, public gcn::Window { public: typedef std::map<std::string, std::pair<int, int> > CoordDict; protected: diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Overlay.cpp sear-0.6.3.good/guichan/Overlay.cpp --- sear-0.6.3/guichan/Overlay.cpp 2006-07-15 14:31:50.000000000 +0200 +++ sear-0.6.3.good/guichan/Overlay.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -54,7 +54,7 @@ } if (m_top == 0) { - avatar->Hear.connect(SigC::slot(*this, &Overlay::heard)); + avatar->Hear.connect(sigc::mem_fun(*this, &Overlay::heard)); m_top = rw; m_selfStatus = SPtr<StatusWindow>(new StatusWindow(avatar->getEntity())); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Overlay.h sear-0.6.3.good/guichan/Overlay.h --- sear-0.6.3/guichan/Overlay.h 2006-05-06 20:43:06.000000000 +0200 +++ sear-0.6.3.good/guichan/Overlay.h 2008-04-05 15:51:06.000000000 +0200 @@ -30,7 +30,7 @@ class TaskWindow; class WorldEntity; -class Overlay : virtual public SigC::Object { +class Overlay : virtual public sigc::trackable { friend class SPtr<Overlay>; public: typedef std::map<Eris::EntityRef, SPtr<SpeechBubble> > BubbleMap; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Panel.cpp sear-0.6.3.good/guichan/Panel.cpp --- sear-0.6.3/guichan/Panel.cpp 2006-10-06 22:36:47.000000000 +0200 +++ sear-0.6.3.good/guichan/Panel.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -45,7 +45,7 @@ m_hbox = new gcn::HBox(6); m_buttonListener = new ActionListenerSigC; - m_buttonListener->Action.connect(SigC::slot(*this, &Panel::actionPressed)); + m_buttonListener->Action.connect(sigc::mem_fun(*this, &Panel::actionPressed)); add(m_hbox); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Panel.h sear-0.6.3.good/guichan/Panel.h --- sear-0.6.3/guichan/Panel.h 2006-04-30 19:07:30.000000000 +0200 +++ sear-0.6.3.good/guichan/Panel.h 2008-04-05 15:51:06.000000000 +0200 @@ -31,7 +31,7 @@ class RootWidget; class ConsoleWindow; -class Panel : virtual public SigC::Object, +class Panel : virtual public sigc::trackable, public ConsoleObject, public gcn::Window { public: diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/RenameDialog.h sear-0.6.3.good/guichan/RenameDialog.h --- sear-0.6.3/guichan/RenameDialog.h 2007-01-27 12:09:50.000000000 +0100 +++ sear-0.6.3.good/guichan/RenameDialog.h 2008-04-05 15:51:06.000000000 +0200 @@ -27,7 +27,7 @@ class ActionListenerSigC; -class RenameDialog : virtual public SigC::Object, public gcn::Window { +class RenameDialog : virtual public sigc::trackable, public gcn::Window { protected: std::list<SPtr<gcn::Widget> > m_widgets; gcn::Button * m_renameButton; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/StatusWindow.h sear-0.6.3.good/guichan/StatusWindow.h --- sear-0.6.3/guichan/StatusWindow.h 2006-04-30 22:42:14.000000000 +0200 +++ sear-0.6.3.good/guichan/StatusWindow.h 2008-04-05 15:51:06.000000000 +0200 @@ -25,7 +25,7 @@ namespace Sear { -class StatusWindow : // virtual public SigC::Object, +class StatusWindow : // virtual public sigc::trackable, public gcn::Window { protected: std::list<SPtr<gcn::Widget> > m_widgets; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/TaskWindow.h sear-0.6.3.good/guichan/TaskWindow.h --- sear-0.6.3/guichan/TaskWindow.h 2006-04-30 23:22:07.000000000 +0200 +++ sear-0.6.3.good/guichan/TaskWindow.h 2008-04-05 15:51:06.000000000 +0200 @@ -25,7 +25,7 @@ namespace Sear { -class TaskWindow : // virtual public SigC::Object, +class TaskWindow : // virtual public sigc::trackable, public gcn::Window { protected: std::list<SPtr<gcn::Widget> > m_widgets; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/VideoOptions.cpp sear-0.6.3.good/guichan/VideoOptions.cpp --- sear-0.6.3/guichan/VideoOptions.cpp 2006-10-06 22:31:13.000000000 +0200 +++ sear-0.6.3.good/guichan/VideoOptions.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -94,7 +94,7 @@ setOpaque(true); m_buttonListener = new ActionListenerSigC; - m_buttonListener->Action.connect(SigC::slot(*this, &VideoOptions::actionPressed)); + m_buttonListener->Action.connect(sigc::mem_fun(*this, &VideoOptions::actionPressed)); gcn::Box * vbox = new gcn::VBox(6); m_widgets.push_back(SPtr<gcn::Widget>(vbox)); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/VideoOptions.h sear-0.6.3.good/guichan/VideoOptions.h --- sear-0.6.3/guichan/VideoOptions.h 2006-10-06 22:30:23.000000000 +0200 +++ sear-0.6.3.good/guichan/VideoOptions.h 2008-04-05 15:51:06.000000000 +0200 @@ -23,7 +23,7 @@ class RootWidget; class ResolutionListModel; -class VideoOptions : virtual public SigC::Object, public gcn::Window, virtual public gcn::ActionListener { +class VideoOptions : virtual public sigc::trackable, public gcn::Window, virtual public gcn::ActionListener { protected: std::list<SPtr<gcn::Widget> > m_widgets; RootWidget * m_top; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/guichan/Workarea.cpp sear-0.6.3.good/guichan/Workarea.cpp --- sear-0.6.3/guichan/Workarea.cpp 2006-10-25 18:28:48.000000000 +0200 +++ sear-0.6.3.good/guichan/Workarea.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -158,8 +158,8 @@ m_system->getActionHandler()->addHandler("inventory_open", "/panel_toggle Inventory"); - RenderSystem::getInstance().ContextCreated.connect(SigC::slot(*this, &Workarea::contextCreated)); - RenderSystem::getInstance().ContextDestroyed.connect(SigC::slot(*this, &Workarea::contextDestroyed)); + RenderSystem::getInstance().ContextCreated.connect(sigc::mem_fun(*this, &Workarea::contextCreated)); + RenderSystem::getInstance().ContextDestroyed.connect(sigc::mem_fun(*this, &Workarea::contextDestroyed)); } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/loaders/3ds.cpp sear-0.6.3.good/loaders/3ds.cpp --- sear-0.6.3/loaders/3ds.cpp 2008-04-05 15:53:37.000000000 +0200 +++ sear-0.6.3.good/loaders/3ds.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -205,7 +205,7 @@ ThreeDS::ThreeDS() : Model(), m_initialised(false) { - m_config.sige.connect(SigC::slot(*this, &ThreeDS::varconf_error_callback)); + m_config.sige.connect(sigc::mem_fun(*this, &ThreeDS::varconf_error_callback)); } ThreeDS::~ThreeDS() { diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/loaders/LibModelFile.cpp sear-0.6.3.good/loaders/LibModelFile.cpp --- sear-0.6.3/loaders/LibModelFile.cpp 2008-04-05 15:53:37.000000000 +0200 +++ sear-0.6.3.good/loaders/LibModelFile.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -199,7 +199,7 @@ LibModelFile::LibModelFile() : Model(), m_initialised(false) { - m_config.sige.connect(SigC::slot(*this, &LibModelFile::varconf_error_callback)); + m_config.sige.connect(sigc::mem_fun(*this, &LibModelFile::varconf_error_callback)); } LibModelFile::~LibModelFile() { diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/loaders/ModelHandler.cpp sear-0.6.3.good/loaders/ModelHandler.cpp --- sear-0.6.3/loaders/ModelHandler.cpp 2007-01-31 00:20:37.000000000 +0100 +++ sear-0.6.3.good/loaders/ModelHandler.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -65,11 +65,11 @@ void ModelHandler::init() { assert (m_initialised == false); - m_model_records.sigsv.connect(SigC::slot(*this, &ModelHandler::varconf_callback)); - m_model_records.sige.connect(SigC::slot(*this, &ModelHandler::varconf_error_callback)); + m_model_records.sigsv.connect(sigc::mem_fun(*this, &ModelHandler::varconf_callback)); + m_model_records.sige.connect(sigc::mem_fun(*this, &ModelHandler::varconf_error_callback)); m_timeout = new Eris::Timeout(60000); - m_timeout->Expired.connect(SigC::slot(*this, &ModelHandler::TimeoutExpired)); + m_timeout->Expired.connect(sigc::mem_fun(*this, &ModelHandler::TimeoutExpired)); // Add default record varconf::Config &m_model_records = ModelSystem::getInstance().getModelRecords(); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/loaders/ObjectHandler.cpp sear-0.6.3.good/loaders/ObjectHandler.cpp --- sear-0.6.3/loaders/ObjectHandler.cpp 2006-09-17 21:42:42.000000000 +0200 +++ sear-0.6.3.good/loaders/ObjectHandler.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -75,8 +75,8 @@ void ObjectHandler::loadObjectRecords(const std::string &filename) { varconf::Config config; - config.sigsv.connect(SigC::slot(*this, &ObjectHandler::varconf_callback)); - config.sige.connect(SigC::slot(*this, &ObjectHandler::varconf_error_callback)); + config.sigsv.connect(sigc::mem_fun(*this, &ObjectHandler::varconf_callback)); + config.sige.connect(sigc::mem_fun(*this, &ObjectHandler::varconf_error_callback)); config.readFromFile(filename); } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/renderers/Camera.cpp sear-0.6.3.good/renderers/Camera.cpp --- sear-0.6.3/renderers/Camera.cpp 2007-01-28 16:54:24.000000000 +0100 +++ sear-0.6.3.good/renderers/Camera.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -85,7 +85,7 @@ updateValues(); // Connect callback to check for updates - System::instance()->getGeneral().sigsv.connect(SigC::slot(*this, &Camera::varconf_callback)); + System::instance()->getGeneral().sigsv.connect(sigc::mem_fun(*this, &Camera::varconf_callback)); m_initialised = true; diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/renderers/GL.cpp sear-0.6.3.good/renderers/GL.cpp --- sear-0.6.3/renderers/GL.cpp 2007-01-27 12:38:48.000000000 +0100 +++ sear-0.6.3.good/renderers/GL.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -538,7 +538,7 @@ if (debug) std::cout << "GL: Initialise" << std::endl; - System::instance()->getGeneral().sigsv.connect(SigC::slot(*this, &GL::varconf_callback)); + System::instance()->getGeneral().sigsv.connect(sigc::mem_fun(*this, &GL::varconf_callback)); m_initialised = true; } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/renderers/Graphics.cpp sear-0.6.3.good/renderers/Graphics.cpp --- sear-0.6.3/renderers/Graphics.cpp 2007-02-06 10:45:24.000000000 +0100 +++ sear-0.6.3.good/renderers/Graphics.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -143,7 +143,7 @@ assert (m_initialised == false); if (m_initialised) shutdown(); // Add callbeck to detect updated options - m_system->getGeneral().sigsv.connect(SigC::slot(*this, &Graphics::varconf_callback)); + m_system->getGeneral().sigsv.connect(sigc::mem_fun(*this, &Graphics::varconf_callback)); // Create the compass m_compass = new Compass(580.f, 50.f); diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/renderers/RenderSystem.cpp sear-0.6.3.good/renderers/RenderSystem.cpp --- sear-0.6.3/renderers/RenderSystem.cpp 2007-01-31 00:20:37.000000000 +0100 +++ sear-0.6.3.good/renderers/RenderSystem.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -90,8 +90,8 @@ m_mouseState[CURSOR_USE] = m_textureManager->requestTextureID("cursor_use", false); m_mouseState[CURSOR_ATTACK] = m_textureManager->requestTextureID("cursor_attack", false); - ContextCreated.connect(SigC::slot(*this, &RenderSystem::contextCreated)); - ContextDestroyed.connect(SigC::slot(*this, &RenderSystem::contextDestroyed)); + ContextCreated.connect(sigc::mem_fun(*this, &RenderSystem::contextCreated)); + ContextDestroyed.connect(sigc::mem_fun(*this, &RenderSystem::contextDestroyed)); m_initialised = true; } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/renderers/StateManager.cpp sear-0.6.3.good/renderers/StateManager.cpp --- sear-0.6.3/renderers/StateManager.cpp 2007-01-26 17:26:04.000000000 +0100 +++ sear-0.6.3.good/renderers/StateManager.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -229,8 +229,8 @@ void StateManager::readFiles(const std::string &file_name) { assert(m_initialised); varconf::Config config; - config.sigsv.connect(SigC::slot(*this, &StateManager::varconf_callback)); - config.sige.connect(SigC::slot(*this, &StateManager::varconf_error_callback)); + config.sigsv.connect(sigc::mem_fun(*this, &StateManager::varconf_callback)); + config.sige.connect(sigc::mem_fun(*this, &StateManager::varconf_error_callback)); config.readFromFile(file_name); } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/renderers/TextureManager.cpp sear-0.6.3.good/renderers/TextureManager.cpp --- sear-0.6.3/renderers/TextureManager.cpp 2007-02-05 18:33:01.000000000 +0100 +++ sear-0.6.3.good/renderers/TextureManager.cpp 2008-04-05 15:50:11.000000000 +0200 @@ -158,7 +158,7 @@ m_baseMipmapLevel(0) { varconf::Config& cfg(System::instance()->getGeneral()); - cfg.sigsv.connect(SigC::slot(*this, &TextureManager::generalConfigChanged)); + cfg.sigsv.connect(sigc::mem_fun(*this, &TextureManager::generalConfigChanged)); } void TextureManager::init() @@ -175,7 +175,7 @@ m_texture_map.clear(); - m_texture_config.sige.connect(SigC::slot(*this, &TextureManager::varconf_error_callback)); + m_texture_config.sige.connect(sigc::mem_fun(*this, &TextureManager::varconf_error_callback)); m_initialised = true; } diff -u -r --exclude=.deps -x '\.o$' sear-0.6.3/src/System.h sear-0.6.3.good/src/System.h --- sear-0.6.3/src/System.h 2006-12-21 21:30:00.000000000 +0100 +++ sear-0.6.3.good/src/System.h 2008-04-05 15:50:30.000000000 +0200 @@ -260,7 +260,7 @@ void varconf_general_callback(const std::string &, const std::string &, varconf::Config &); void varconf_error_callback(const char *); - SigC::Signal3<void, std::string, int, int> pushedMessage; + sigc::signal3<void, std::string, int, int> pushedMessage; sigc::signal<void> EnteredWorld; sigc::signal<void> LeftWorld;