summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 17:14:00 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 17:14:00 +0300
commit07e8275965ccb989e3bcc288e2440bffcbca4a8e (patch)
tree2c367568c287e0494bf842f8dda7a972ed0b778a
parent70b8ee71b559e968ad1b5c740703910f79351c5f (diff)
downloadmanaverse-07e8275965ccb989e3bcc288e2440bffcbca4a8e.tar.gz
manaverse-07e8275965ccb989e3bcc288e2440bffcbca4a8e.tar.bz2
manaverse-07e8275965ccb989e3bcc288e2440bffcbca4a8e.tar.xz
manaverse-07e8275965ccb989e3bcc288e2440bffcbca4a8e.zip
move playerrelationlistener into listeners directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/being/playerrelations.h2
-rw-r--r--src/gui/windows/socialwindow.h3
-rw-r--r--src/listeners/playerrelationslistener.h (renamed from src/being/playerrelationslistener.h)6
5 files changed, 7 insertions, 8 deletions
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 <list>
#include <map>
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 <string>
#include <map>
diff --git a/src/being/playerrelationslistener.h b/src/listeners/playerrelationslistener.h
index 983f731e4..b95f18c33 100644
--- a/src/being/playerrelationslistener.h
+++ b/src/listeners/playerrelationslistener.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_PLAYERRELATIONSLISTENER_H
-#define BEING_PLAYERRELATIONSLISTENER_H
+#ifndef LISTERNERS_PLAYERRELATIONSLISTENER_H
+#define LISTERNERS_PLAYERRELATIONSLISTENER_H
#include <string>
@@ -40,4 +40,4 @@ class PlayerRelationsListener
{ }
};
-#endif // BEING_PLAYERRELATIONSLISTENER_H
+#endif // LISTERNERS_PLAYERRELATIONSLISTENER_H