summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-13 23:50:42 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-13 23:50:42 +0300
commit16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (patch)
tree1db34fd6c50a1421ac186a3652f1e43494881286 /src/gui
parentf5c004a94061cab1685fa063b039dc2eec29cbbe (diff)
downloadmv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.gz
mv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.bz2
mv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.xz
mv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.zip
Add vector.h for use different vectors.
Also replace <vector> include into "utils/vector.h"
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/focushandler.h3
-rw-r--r--src/gui/models/beingslistmodel.h3
-rw-r--r--src/gui/models/shopitems.h3
-rw-r--r--src/gui/models/tablemodel.h3
-rw-r--r--src/gui/palette.h3
-rw-r--r--src/gui/widgets/equipmentpage.h2
-rw-r--r--src/gui/widgets/layoutarray.h2
7 files changed, 10 insertions, 9 deletions
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 3d0847515..346abc7b8 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -66,8 +66,9 @@
#ifndef GUI_FOCUSHANDLER_H
#define GUI_FOCUSHANDLER_H
+#include "utils/vector.h"
+
#include <list>
-#include <vector>
#include "localconsts.h"
diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
index a50b20d8d..db17f4833 100644
--- a/src/gui/models/beingslistmodel.h
+++ b/src/gui/models/beingslistmodel.h
@@ -26,8 +26,7 @@
#include "utils/cast.h"
#include "utils/dtor.h"
-
-#include <vector>
+#include "utils/vector.h"
class BeingsListModel final : public AvatarListModel
{
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index d162ce524..8bb6719d7 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -30,8 +30,7 @@
#include "gui/models/listmodel.h"
#include "utils/cast.h"
-
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h
index dc3462f19..f28a60a6f 100644
--- a/src/gui/models/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -23,8 +23,9 @@
#ifndef GUI_MODELS_TABLEMODEL_H
#define GUI_MODELS_TABLEMODEL_H
+#include "utils/vector.h"
+
#include <set>
-#include <vector>
#include "localconsts.h"
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 00f295cc4..f75f3f8fb 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -28,10 +28,11 @@
#include "gui/color.h"
+#include "utils/vector.h"
+
#include <map>
#include <set>
#include <string>
-#include <vector>
// Default Gradient Delay
#define GRADIENT_DELAY 40
diff --git a/src/gui/widgets/equipmentpage.h b/src/gui/widgets/equipmentpage.h
index 9e7670bbe..33cbbf13f 100644
--- a/src/gui/widgets/equipmentpage.h
+++ b/src/gui/widgets/equipmentpage.h
@@ -21,7 +21,7 @@
#ifndef GUI_WIDGETS_EQUIPMENTPAGE_H
#define GUI_WIDGETS_EQUIPMENTPAGE_H
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/gui/widgets/layoutarray.h b/src/gui/widgets/layoutarray.h
index 2f5d766e7..2a35635dc 100644
--- a/src/gui/widgets/layoutarray.h
+++ b/src/gui/widgets/layoutarray.h
@@ -23,7 +23,7 @@
#ifndef GUI_WIDGETS_LAYOUTARRAY_H
#define GUI_WIDGETS_LAYOUTARRAY_H
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"