From 580ce9af9e9a241aac083107b18c9c81e1c1da0d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 15 Feb 2014 23:20:49 +0300 Subject: move deathlistener from base into listeners. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/gui/base/basiccontainer.hpp | 3 +- src/gui/base/deathlistener.hpp | 109 ---------------------------------------- src/gui/base/widget.cpp | 3 +- src/gui/base/widget.hpp | 2 +- src/listeners/deathlistener.h | 106 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 113 insertions(+), 114 deletions(-) delete mode 100644 src/gui/base/deathlistener.hpp create mode 100644 src/listeners/deathlistener.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fccf99fb6..d68026c5d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -774,7 +774,7 @@ SET(SRCS gui/base/basiccontainer.hpp gui/base/cliprectangle.hpp gui/base/color.hpp - gui/base/deathlistener.hpp + listeners/deathlistener.h gui/base/event.hpp gui/base/exception.hpp gui/base/focushandler.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 422b08586..7a74b3d17 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -161,7 +161,7 @@ manaplus_SOURCES += gui/base/actionevent.hpp \ gui/base/basiccontainer.hpp \ gui/base/cliprectangle.hpp \ gui/base/color.hpp \ - gui/base/deathlistener.hpp \ + listeners/deathlistener.h \ gui/base/event.hpp \ gui/base/exception.hpp \ gui/base/focushandler.hpp \ diff --git a/src/gui/base/basiccontainer.hpp b/src/gui/base/basiccontainer.hpp index d6dd38b63..0fec2c0e7 100644 --- a/src/gui/base/basiccontainer.hpp +++ b/src/gui/base/basiccontainer.hpp @@ -67,9 +67,10 @@ #include #include -#include "gui/base/deathlistener.hpp" #include "gui/base/widget.hpp" +#include "listeners/deathlistener.h" + namespace gcn { /** diff --git a/src/gui/base/deathlistener.hpp b/src/gui/base/deathlistener.hpp deleted file mode 100644 index b325166c2..000000000 --- a/src/gui/base/deathlistener.hpp +++ /dev/null @@ -1,109 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2014 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef GCN_DEATHLISTENER_HPP -#define GCN_DEATHLISTENER_HPP - -#include - -#include "gui/base/event.hpp" - -namespace gcn -{ - /** - * Interface for listening for death events from widgets. - * - * @see Widget::addDeathListener, Widget::removeDeathListener - * @author Olof Naessén - * @since 0.6.0 - */ - class DeathListener - { - public: - /** - * Destructor. - */ - virtual ~DeathListener() - { } - - /** - * Called when a widget dies. It is used to be able to recieve - * a notification when a death of a widget occurs. - * - * @param event The event of the death. - */ - virtual void death(const Event& event) = 0; - - protected: - /** - * Constructor. - * - * You should not be able to make an instance of DeathListener, - * therefore its constructor is protected. - */ - DeathListener() - { } - }; -} // namespace gcn - -#endif // end GCN_DEATHLISTENER_HPP diff --git a/src/gui/base/widget.cpp b/src/gui/base/widget.cpp index c14914cc2..b9a98ff1c 100644 --- a/src/gui/base/widget.cpp +++ b/src/gui/base/widget.cpp @@ -70,7 +70,6 @@ #include "gui/base/actionevent.hpp" #include "listeners/actionlistener.h" #include "gui/base/basiccontainer.hpp" -#include "gui/base/deathlistener.hpp" #include "gui/base/event.hpp" #include "gui/base/exception.hpp" #include "gui/base/focushandler.hpp" @@ -80,6 +79,8 @@ #include "gui/base/mouselistener.hpp" #include "gui/base/widgetlistener.hpp" +#include "listeners/deathlistener.h" + #include "render/graphics.h" #include "debug.h" diff --git a/src/gui/base/widget.hpp b/src/gui/base/widget.hpp index 1c05c2d03..b896ac1e9 100644 --- a/src/gui/base/widget.hpp +++ b/src/gui/base/widget.hpp @@ -74,12 +74,12 @@ #include "localconsts.h" class ActionListener; +class DeathListener; class Graphics; namespace gcn { class BasicContainer; - class DeathListener; class FocusHandler; class FocusListener; class Font; diff --git a/src/listeners/deathlistener.h b/src/listeners/deathlistener.h new file mode 100644 index 000000000..ad2eb5364 --- /dev/null +++ b/src/listeners/deathlistener.h @@ -0,0 +1,106 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* _______ __ __ __ ______ __ __ _______ __ __ + * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ + * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / + * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / + * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / + * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / + * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ + * + * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson + * + * + * Per Larsson a.k.a finalman + * Olof Naessén a.k.a jansem/yakslem + * + * Visit: http://guichan.sourceforge.net + * + * License: (BSD) + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name of Guichan nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LISTENERS_DEATHLISTENER_HPP +#define LISTENERS_DEATHLISTENER_HPP + +#include + +#include "gui/base/event.hpp" + +/** + * Interface for listening for death events from widgets. + * + * @see Widget::addDeathListener, Widget::removeDeathListener + * @author Olof Naessén + * @since 0.6.0 + */ +class DeathListener +{ + public: + /** + * Destructor. + */ + virtual ~DeathListener() + { } + + /** + * Called when a widget dies. It is used to be able to recieve + * a notification when a death of a widget occurs. + * + * @param event The event of the death. + */ + virtual void death(const gcn::Event &event) = 0; + + protected: + /** + * Constructor. + * + * You should not be able to make an instance of DeathListener, + * therefore its constructor is protected. + */ + DeathListener() + { } +}; + +#endif // LISTENERS_DEATHLISTENER_HPP -- cgit v1.2.3-70-g09d2