summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-16 16:52:15 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-16 16:52:15 +0300
commitb8412102b392310c5f7748bb2da36b3600e0fe08 (patch)
tree6c646efa77e98b1a02953002e6cc1ca6062ea621
parentdb0cb4f13de9b1a6cc7eacbcf8f41aa7982456a2 (diff)
downloadmv-b8412102b392310c5f7748bb2da36b3600e0fe08.tar.gz
mv-b8412102b392310c5f7748bb2da36b3600e0fe08.tar.bz2
mv-b8412102b392310c5f7748bb2da36b3600e0fe08.tar.xz
mv-b8412102b392310c5f7748bb2da36b3600e0fe08.zip
Move equipbox into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/widgets/equipmentbox.h41
-rw-r--r--src/gui/windows/equipmentwindow.cpp1
-rw-r--r--src/gui/windows/equipmentwindow.h13
5 files changed, 45 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e7b69cf3..a0c4bdce9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -145,6 +145,7 @@ SET(SRCS
gui/widgets/dropdown.h
gui/widgets/emoteshortcutcontainer.cpp
gui/widgets/emoteshortcutcontainer.h
+ gui/widgets/equipmentbox.h
gui/widgets/extendedlistbox.cpp
gui/widgets/extendedlistbox.h
gui/widgets/extendedlistboxitem.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a8ace3385..0194bf7fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -237,6 +237,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/dropdown.h \
gui/widgets/emoteshortcutcontainer.cpp \
gui/widgets/emoteshortcutcontainer.h \
+ gui/widgets/equipmentbox.h \
gui/widgets/extendedlistbox.cpp \
gui/widgets/extendedlistbox.h \
gui/widgets/extendedlistboxitem.h \
diff --git a/src/gui/widgets/equipmentbox.h b/src/gui/widgets/equipmentbox.h
new file mode 100644
index 000000000..d3c314ea9
--- /dev/null
+++ b/src/gui/widgets/equipmentbox.h
@@ -0,0 +1,41 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_WIDGETS_EQUIPMENTBOX_H
+#define GUI_WIDGETS_EQUIPMENTBOX_H
+
+#include "localconsts.h"
+
+class Image;
+
+struct EquipmentBox final
+{
+ EquipmentBox(const int x0, const int y0, Image *const img) :
+ x(x0), y(y0), image(img)
+ { }
+
+ A_DELETE_COPY(EquipmentBox)
+
+ int x;
+ int y;
+ Image *image;
+};
+
+#endif // GUI_WIDGETS_EQUIPMENTBOX_H
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 4c026281b..ebe5a81b9 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -40,6 +40,7 @@
#include "gui/windows/setupwindow.h"
#include "gui/widgets/button.h"
+#include "gui/widgets/equipmentbox.h"
#include "gui/widgets/playerbox.h"
#include "resources/imageset.h"
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index 45d4246e3..1f9dbcbcd 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -42,18 +42,7 @@ class Item;
class ItemPopup;
class PlayerBox;
-struct EquipmentBox final
-{
- EquipmentBox(const int x0, const int y0, Image *const img) :
- x(x0), y(y0), image(img)
- { }
-
- A_DELETE_COPY(EquipmentBox)
-
- int x;
- int y;
- Image *image;
-};
+struct EquipmentBox;
/**
* Equipment dialog.