From 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 13 Jul 2017 23:50:42 +0300 Subject: Add vector.h for use different vectors. Also replace include into "utils/vector.h" --- src/gui/focushandler.h | 3 ++- src/gui/models/beingslistmodel.h | 3 +-- src/gui/models/shopitems.h | 3 +-- src/gui/models/tablemodel.h | 3 ++- src/gui/palette.h | 3 ++- src/gui/widgets/equipmentpage.h | 2 +- src/gui/widgets/layoutarray.h | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/gui') 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 -#include #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 +#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 +#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 -#include #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 #include #include -#include // 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 +#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 +#include "utils/vector.h" #include "localconsts.h" -- cgit v1.2.3-60-g2f50