From 07e8275965ccb989e3bcc288e2440bffcbca4a8e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Feb 2014 17:14:00 +0300 Subject: move playerrelationlistener into listeners directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/playerrelations.h | 2 +- src/being/playerrelationslistener.h | 43 --------------------------------- src/gui/windows/socialwindow.h | 3 +-- src/listeners/playerrelationslistener.h | 43 +++++++++++++++++++++++++++++++++ 6 files changed, 47 insertions(+), 48 deletions(-) delete mode 100644 src/being/playerrelationslistener.h create mode 100644 src/listeners/playerrelationslistener.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4060c28b8..5e2385332 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -720,7 +720,7 @@ SET(SRCS being/playerinfo.h being/playerrelations.cpp being/playerrelations.h - being/playerrelationslistener.h + listeners/playerrelationslistener.h position.cpp position.h properties.h diff --git a/src/Makefile.am b/src/Makefile.am index aa8edd335..ca18b42a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -835,7 +835,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/playerinfo.h \ being/playerrelations.cpp \ being/playerrelations.h \ - being/playerrelationslistener.h \ + listeners/playerrelationslistener.h \ position.cpp \ position.h \ properties.h \ diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h index 360930879..cddec5f10 100644 --- a/src/being/playerrelations.h +++ b/src/being/playerrelations.h @@ -25,7 +25,7 @@ #include "utils/stringvector.h" -#include "being/playerrelationslistener.h" +#include "listeners/playerrelationslistener.h" #include #include diff --git a/src/being/playerrelationslistener.h b/src/being/playerrelationslistener.h deleted file mode 100644 index 983f731e4..000000000 --- a/src/being/playerrelationslistener.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2008-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * 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 . - */ - -#ifndef BEING_PLAYERRELATIONSLISTENER_H -#define BEING_PLAYERRELATIONSLISTENER_H - -#include - -class PlayerRelationsListener -{ - public: - virtual ~PlayerRelationsListener() - { } - - virtual void updatedPlayer(const std::string &name) = 0; - - virtual void updateAll() = 0; - - protected: - PlayerRelationsListener() - { } -}; - -#endif // BEING_PLAYERRELATIONSLISTENER_H diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index fc93aed4f..57fbd5be5 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -24,9 +24,8 @@ #include "gui/widgets/window.h" -#include "being/playerrelationslistener.h" - #include "listeners/actionlistener.h" +#include "listeners/playerrelationslistener.h" #include #include diff --git a/src/listeners/playerrelationslistener.h b/src/listeners/playerrelationslistener.h new file mode 100644 index 000000000..b95f18c33 --- /dev/null +++ b/src/listeners/playerrelationslistener.h @@ -0,0 +1,43 @@ +/* + * The ManaPlus Client + * Copyright (C) 2008-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * 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 . + */ + +#ifndef LISTERNERS_PLAYERRELATIONSLISTENER_H +#define LISTERNERS_PLAYERRELATIONSLISTENER_H + +#include + +class PlayerRelationsListener +{ + public: + virtual ~PlayerRelationsListener() + { } + + virtual void updatedPlayer(const std::string &name) = 0; + + virtual void updateAll() = 0; + + protected: + PlayerRelationsListener() + { } +}; + +#endif // LISTERNERS_PLAYERRELATIONSLISTENER_H -- cgit v1.2.3-60-g2f50