summaryrefslogtreecommitdiff
path: root/src/gui/models
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/models')
-rw-r--r--src/gui/models/beingslistmodel.h4
-rw-r--r--src/gui/models/colormodel.h2
-rw-r--r--src/gui/models/extendednamesmodel.cpp2
-rw-r--r--src/gui/models/extendednamesmodel.h4
-rw-r--r--src/gui/models/playertablemodel.h2
-rw-r--r--src/gui/models/serverslistmodel.h2
-rw-r--r--src/gui/models/shopitems.cpp14
-rw-r--r--src/gui/models/shopitems.h10
-rw-r--r--src/gui/models/tablemodel.h4
-rw-r--r--src/gui/models/touchactionmodel.cpp4
-rw-r--r--src/gui/models/touchactionmodel.h2
-rw-r--r--src/gui/models/updatelistmodel.h2
12 files changed, 26 insertions, 26 deletions
diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
index db17f4833..a0a9d2920 100644
--- a/src/gui/models/beingslistmodel.h
+++ b/src/gui/models/beingslistmodel.h
@@ -45,7 +45,7 @@ class BeingsListModel final : public AvatarListModel
mMembers.clear();
}
- std::vector<Avatar*> *getMembers() RETURNS_NONNULL A_WARN_UNUSED
+ STD_VECTOR<Avatar*> *getMembers() RETURNS_NONNULL A_WARN_UNUSED
{
return &mMembers;
}
@@ -60,7 +60,7 @@ class BeingsListModel final : public AvatarListModel
return CAST_S32(mMembers.size());
}
- std::vector<Avatar*> mMembers;
+ STD_VECTOR<Avatar*> mMembers;
};
#endif // GUI_MODELS_BEINGSLISTMODEL_H
diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h
index 225bc6536..9d621dfbe 100644
--- a/src/gui/models/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -63,7 +63,7 @@ class ColorModel final : public ListModel
protected:
StringVect mNames;
- std::vector<ColorPair> mColors;
+ STD_VECTOR<ColorPair> mColors;
};
#endif // GUI_MODELS_COLORMODEL_H
diff --git a/src/gui/models/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp
index 146473a91..76191ae5a 100644
--- a/src/gui/models/extendednamesmodel.cpp
+++ b/src/gui/models/extendednamesmodel.cpp
@@ -59,7 +59,7 @@ const Image *ExtendedNamesModel::getImageAt(int i)
void ExtendedNamesModel::clear()
{
mNames.clear();
- FOR_EACH (std::vector<Image*>::iterator, it, mImages)
+ FOR_EACH (STD_VECTOR<Image*>::iterator, it, mImages)
{
if (*it != nullptr)
(*it)->decRef();
diff --git a/src/gui/models/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h
index cf1d13f6e..2e85a4b2b 100644
--- a/src/gui/models/extendednamesmodel.h
+++ b/src/gui/models/extendednamesmodel.h
@@ -43,7 +43,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel
StringVect &getNames() A_WARN_UNUSED
{ return mNames; }
- std::vector<Image*> &getImages() A_WARN_UNUSED
+ STD_VECTOR<Image*> &getImages() A_WARN_UNUSED
{ return mImages; }
size_t size() A_WARN_UNUSED
@@ -56,7 +56,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel
protected:
StringVect mNames;
- std::vector<Image*> mImages;
+ STD_VECTOR<Image*> mImages;
};
#endif // GUI_MODELS_EXTENDEDNAMESMODEL_H
diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h
index 4c8792bc7..dfb00eeb4 100644
--- a/src/gui/models/playertablemodel.h
+++ b/src/gui/models/playertablemodel.h
@@ -61,7 +61,7 @@ class PlayerTableModel final : public Widget2,
protected:
StringVect *mPlayers;
- std::vector<Widget *> mWidgets;
+ STD_VECTOR<Widget *> mWidgets;
PlayerRelationListModel *mListModel;
};
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
index 206daa02a..8e236ebe0 100644
--- a/src/gui/models/serverslistmodel.h
+++ b/src/gui/models/serverslistmodel.h
@@ -109,7 +109,7 @@ class ServersListModel final : public ListModel
}
private:
- typedef std::vector<VersionString> VersionStrings;
+ typedef STD_VECTOR<VersionString> VersionStrings;
ServerInfos *mServers;
VersionStrings mVersionStrings;
diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp
index 763b75390..27e05ff12 100644
--- a/src/gui/models/shopitems.cpp
+++ b/src/gui/models/shopitems.cpp
@@ -133,10 +133,10 @@ ShopItem *ShopItems::at(const size_t i) const
return mShopItems.at(i);
}
-bool ShopItems::findInAllItems(std::vector<ShopItem*>::iterator &it,
+bool ShopItems::findInAllItems(STD_VECTOR<ShopItem*>::iterator &it,
const ShopItem *const item)
{
- const std::vector<ShopItem*>::iterator it_end = mAllShopItems.end();
+ const STD_VECTOR<ShopItem*>::iterator it_end = mAllShopItems.end();
for (it = mAllShopItems.begin(); it != it_end; ++ it)
{
if (*it == item)
@@ -151,7 +151,7 @@ void ShopItems::erase(const unsigned int i)
return;
const ShopItem *const item = *(mShopItems.begin() + i);
- std::vector<ShopItem*>::iterator it;
+ STD_VECTOR<ShopItem*>::iterator it;
if (findInAllItems(it, item))
mAllShopItems.erase(it);
mShopItems.erase(mShopItems.begin() + i);
@@ -163,7 +163,7 @@ void ShopItems::del(const unsigned int i)
return;
ShopItem *item = *(mShopItems.begin() + i);
- std::vector<ShopItem*>::iterator it;
+ STD_VECTOR<ShopItem*>::iterator it;
if (findInAllItems(it, item))
mAllShopItems.erase(it);
mShopItems.erase(mShopItems.begin() + i);
@@ -180,8 +180,8 @@ void ShopItems::clear()
ShopItem *ShopItems::findItem(const int id,
const ItemColor color) const
{
- std::vector<ShopItem*>::const_iterator it = mShopItems.begin();
- const std::vector<ShopItem*>::const_iterator e = mShopItems.end();
+ STD_VECTOR<ShopItem*>::const_iterator it = mShopItems.begin();
+ const STD_VECTOR<ShopItem*>::const_iterator e = mShopItems.end();
while (it != e)
{
ShopItem *const item = *it;
@@ -197,7 +197,7 @@ ShopItem *ShopItems::findItem(const int id,
void ShopItems::updateList()
{
mShopItems.clear();
- FOR_EACH (std::vector<ShopItem*>::iterator, it, mAllShopItems)
+ FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, mAllShopItems)
{
ShopItem *const item = *it;
if ((item != nullptr) && item->isVisible())
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index 8bb6719d7..26c5a94e4 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -132,10 +132,10 @@ class ShopItems final : public ListModel
*/
void clear();
- std::vector<ShopItem*> &items() A_WARN_UNUSED
+ STD_VECTOR<ShopItem*> &items() A_WARN_UNUSED
{ return mShopItems; }
- std::vector<ShopItem*> &allItems() A_WARN_UNUSED
+ STD_VECTOR<ShopItem*> &allItems() A_WARN_UNUSED
{ return mAllShopItems; }
void setMergeDuplicates(const bool b)
@@ -153,13 +153,13 @@ class ShopItems final : public ListModel
ShopItem *findItem(const int id,
const ItemColor color) const A_WARN_UNUSED;
- bool findInAllItems(std::vector<ShopItem*>::iterator &it,
+ bool findInAllItems(STD_VECTOR<ShopItem*>::iterator &it,
const ShopItem *const item);
/** The list of items in the shop. */
- std::vector<ShopItem*> mAllShopItems;
+ STD_VECTOR<ShopItem*> mAllShopItems;
- std::vector<ShopItem*> mShopItems;
+ STD_VECTOR<ShopItem*> mShopItems;
std::string mCurrency;
diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h
index f28a60a6f..23f286c2e 100644
--- a/src/gui/models/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -146,8 +146,8 @@ class StaticTableModel final : public TableModel
int mRows;
int mColumns;
int mHeight;
- std::vector<Widget *> mTableModel;
- std::vector<int> mWidths;
+ STD_VECTOR<Widget *> mTableModel;
+ STD_VECTOR<int> mWidths;
};
#endif // GUI_MODELS_TABLEMODEL_H
diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp
index 7f6b68ef7..1998d2752 100644
--- a/src/gui/models/touchactionmodel.cpp
+++ b/src/gui/models/touchactionmodel.cpp
@@ -50,7 +50,7 @@ TouchActionsModel::TouchActionsModel() :
mActionId(),
mActionToSelection()
{
- std::vector<SetupActionData*> data;
+ STD_VECTOR<SetupActionData*> data;
for (int f = 0, fsz = touchActionDataSize; f < fsz; f ++)
{
@@ -64,7 +64,7 @@ TouchActionsModel::TouchActionsModel() :
std::sort(data.begin(), data.end(), touchActionSorter);
int cnt = 0;
- FOR_EACH (std::vector<SetupActionData*>::iterator, it, data)
+ FOR_EACH (STD_VECTOR<SetupActionData*>::iterator, it, data)
{
const SetupActionData *const data1 = *it;
mNames.push_back(data1->name);
diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h
index a3ea05c9d..2d8cff02a 100644
--- a/src/gui/models/touchactionmodel.h
+++ b/src/gui/models/touchactionmodel.h
@@ -42,7 +42,7 @@ class TouchActionsModel final : public NamesModel
int getSelectionFromAction(const InputActionT action) const;
private:
- std::vector<InputActionT> mActionId;
+ STD_VECTOR<InputActionT> mActionId;
std::map<InputActionT, int> mActionToSelection;
};
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index f50072112..cd4ba50c3 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -40,7 +40,7 @@ class UpdateListModel final : public ListModel
mNames(),
mServer(server)
{
- FOR_EACH(std::vector<HostsGroup>::const_iterator,
+ FOR_EACH(STD_VECTOR<HostsGroup>::const_iterator,
it,
server->updateHosts)
{