Skip to content

Commit 5d94f0b

Browse files
dvanderdvander
committed
Replace ke::Vector with std::vector.
1 parent e5ddbd9 commit 5d94f0b

41 files changed

Lines changed: 1173 additions & 1173 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/ChatTriggers.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,26 +137,26 @@ void ChatTriggers::OnSourceModGameInitialized()
137137
};
138138

139139
if (ConCommand *say = FindCommand("say")) {
140-
hooks_.append(sCoreProviderImpl.AddCommandHook(say, pre_hook));
141-
hooks_.append(sCoreProviderImpl.AddPostCommandHook(say, post_hook));
140+
hooks_.push_back(sCoreProviderImpl.AddCommandHook(say, pre_hook));
141+
hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say, post_hook));
142142
}
143143
if (ConCommand *say_team = FindCommand("say_team")) {
144-
hooks_.append(sCoreProviderImpl.AddCommandHook(say_team, pre_hook));
145-
hooks_.append(sCoreProviderImpl.AddPostCommandHook(say_team, post_hook));
144+
hooks_.push_back(sCoreProviderImpl.AddCommandHook(say_team, pre_hook));
145+
hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say_team, post_hook));
146146
}
147147

148148
#if SOURCE_ENGINE == SE_EPISODEONE
149149
m_bIsINS = (strcmp(g_SourceMod.GetGameFolderName(), "insurgency") == 0);
150150
if (m_bIsINS) {
151151
if (ConCommand *say2 = FindCommand("say2")) {
152-
hooks_.append(sCoreProviderImpl.AddCommandHook(say2, pre_hook));
153-
hooks_.append(sCoreProviderImpl.AddPostCommandHook(say2, post_hook));
152+
hooks_.push_back(sCoreProviderImpl.AddCommandHook(say2, pre_hook));
153+
hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say2, post_hook));
154154
}
155155
}
156156
#elif SOURCE_ENGINE == SE_NUCLEARDAWN
157157
if (ConCommand *say_squad = FindCommand("say_squad")) {
158-
hooks_.append(sCoreProviderImpl.AddCommandHook(say_squad, pre_hook));
159-
hooks_.append(sCoreProviderImpl.AddPostCommandHook(say_squad, post_hook));
158+
hooks_.push_back(sCoreProviderImpl.AddCommandHook(say_squad, pre_hook));
159+
hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say_squad, post_hook));
160160
}
161161
#endif
162162
}

‎core/ChatTriggers.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class ChatTriggers : public SMGlobalClass
7373
bool ClientIsFlooding(int client);
7474
cell_t CallOnClientSayCommand(int client);
7575
private:
76-
ke::Vector<ke::RefPtr<CommandHook>> hooks_;
76+
std::vector<ke::RefPtr<CommandHook>> hooks_;
7777
std::string m_PubTrigger;
7878
std::string m_PrivTrigger;
7979
bool m_bWillProcessInPost;

‎core/GameHooks.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void GameHooks::OnVSPReceived()
9191

9292
void GameHooks::Shutdown()
9393
{
94-
for (size_t i = 0; i < hooks_.length(); i++)
94+
for (size_t i = 0; i < hooks_.size(); i++)
9595
SH_REMOVE_HOOK_ID(hooks_[i]);
9696
hooks_.clear();
9797

‎core/GameHooks.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ class GameHooks
114114
void SetCommandClient(int client);
115115

116116
private:
117-
class HookList : public ke::Vector<int>
117+
class HookList : public std::vector<int>
118118
{
119119
public:
120120
HookList &operator += (int hook_id) {
121-
this->append(hook_id);
121+
this->push_back(hook_id);
122122
return *this;
123123
}
124124
};

‎core/MenuStyle_Base.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ Handle_t CBaseMenu::GetHandle()
628628
bool CBaseMenu::AppendItem(const char *info, const ItemDrawInfo &draw)
629629
{
630630
if (m_Pagination == (unsigned)MENU_NO_PAGINATION
631-
&& m_items.length() >= m_pStyle->GetMaxPageItems())
631+
&& m_items.size() >= m_pStyle->GetMaxPageItems())
632632
{
633633
return false;
634634
}
@@ -640,19 +640,19 @@ bool CBaseMenu::AppendItem(const char *info, const ItemDrawInfo &draw)
640640
item.display = std::make_unique<std::string>(draw.display);
641641
item.style = draw.style;
642642

643-
m_items.append(std::move(item));
643+
m_items.push_back(std::move(item));
644644
return true;
645645
}
646646

647647
bool CBaseMenu::InsertItem(unsigned int position, const char *info, const ItemDrawInfo &draw)
648648
{
649649
if (m_Pagination == (unsigned)MENU_NO_PAGINATION &&
650-
m_items.length() >= m_pStyle->GetMaxPageItems())
650+
m_items.size() >= m_pStyle->GetMaxPageItems())
651651
{
652652
return false;
653653
}
654654

655-
if (position >= m_items.length())
655+
if (position >= m_items.size())
656656
return false;
657657

658658
CItem item;
@@ -661,16 +661,16 @@ bool CBaseMenu::InsertItem(unsigned int position, const char *info, const ItemDr
661661
item.display = std::make_unique<std::string>(draw.display);
662662
item.style = draw.style;
663663

664-
m_items.insert(position, std::move(item));
664+
ke::InsertAt(&m_items, position, std::move(item));
665665
return true;
666666
}
667667

668668
bool CBaseMenu::RemoveItem(unsigned int position)
669669
{
670-
if (position >= m_items.length())
670+
if (position >= m_items.size())
671671
return false;
672672

673-
m_items.remove(position);
673+
ke::RemoveAt(&m_items, position);
674674
return true;
675675
}
676676

@@ -681,7 +681,7 @@ void CBaseMenu::RemoveAllItems()
681681

682682
const char *CBaseMenu::GetItemInfo(unsigned int position, ItemDrawInfo *draw/* =NULL */)
683683
{
684-
if (position >= m_items.length())
684+
if (position >= m_items.size())
685685
return NULL;
686686

687687
if (draw)
@@ -695,7 +695,7 @@ const char *CBaseMenu::GetItemInfo(unsigned int position, ItemDrawInfo *draw/* =
695695

696696
unsigned int CBaseMenu::GetItemCount()
697697
{
698-
return m_items.length();
698+
return m_items.size();
699699
}
700700

701701
bool CBaseMenu::SetPagination(unsigned int itemsPerPage)
@@ -825,5 +825,5 @@ IMenuHandler *CBaseMenu::GetHandler()
825825

826826
unsigned int CBaseMenu::GetBaseMemUsage()
827827
{
828-
return m_Title.length() + (m_items.length() * sizeof(CItem));
828+
return m_Title.size() + (m_items.size() * sizeof(CItem));
829829
}

‎core/MenuStyle_Base.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class CBaseMenu : public IBaseMenu
161161
std::string m_Title;
162162
IMenuStyle *m_pStyle;
163163
unsigned int m_Pagination;
164-
ke::Vector<CItem> m_items;
164+
std::vector<CItem> m_items;
165165
bool m_bShouldDelete;
166166
bool m_bCancelling;
167167
IdentityToken_t *m_pOwner;

‎core/logic/CDataPack.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ CDataPack::~CDataPack()
4646
Initialize();
4747
}
4848

49-
static ke::Vector<std::unique_ptr<CDataPack>> sDataPackCache;
49+
static std::vector<std::unique_ptr<CDataPack>> sDataPackCache;
5050

5151
CDataPack *CDataPack::New()
5252
{
5353
if (sDataPackCache.empty())
5454
return new CDataPack();
5555

5656
CDataPack *pack = sDataPackCache.back().release();
57-
sDataPackCache.pop();
57+
sDataPackCache.pop_back();
5858
pack->Initialize();
5959
return pack;
6060
}
6161

6262
void
6363
CDataPack::Free(CDataPack *pack)
6464
{
65-
sDataPackCache.append(static_cast<CDataPack *>(pack));
65+
sDataPackCache.emplace_back(pack);
6666
}
6767

6868
void CDataPack::Initialize()
@@ -87,7 +87,7 @@ size_t CDataPack::CreateMemory(size_t size, void **addr)
8787
val.type = CDataPackType::Raw;
8888
val.pData.vval = new uint8_t[size + sizeof(size)];
8989
reinterpret_cast<size_t *>(val.pData.vval)[0] = size;
90-
elements.insert(position, val);
90+
ke::InsertAt(&elements, position, val);
9191

9292
return position++;
9393
}
@@ -97,23 +97,23 @@ void CDataPack::PackCell(cell_t cell)
9797
InternalPack val;
9898
val.type = CDataPackType::Cell;
9999
val.pData.cval = cell;
100-
elements.insert(position++, val);
100+
ke::InsertAt(&elements, position++, val);
101101
}
102102

103103
void CDataPack::PackFunction(cell_t function)
104104
{
105105
InternalPack val;
106106
val.type = CDataPackType::Function;
107107
val.pData.cval = function;
108-
elements.insert(position++, val);
108+
ke::InsertAt(&elements, position++, val);
109109
}
110110

111111
void CDataPack::PackFloat(float floatval)
112112
{
113113
InternalPack val;
114114
val.type = CDataPackType::Float;
115115
val.pData.fval = floatval;
116-
elements.insert(position++, val);
116+
ke::InsertAt(&elements, position++, val);
117117
}
118118

119119
void CDataPack::PackString(const char *string)
@@ -122,7 +122,7 @@ void CDataPack::PackString(const char *string)
122122
val.type = CDataPackType::String;
123123
std::string *sval = new std::string(string);
124124
val.pData.sval = sval;
125-
elements.insert(position++, val);
125+
ke::InsertAt(&elements, position++, val);
126126
}
127127

128128
void CDataPack::PackCellArray(cell_t const *vals, cell_t count)
@@ -133,7 +133,7 @@ void CDataPack::PackCellArray(cell_t const *vals, cell_t count)
133133
val.pData.aval = new cell_t [count + 1];
134134
memcpy(&val.pData.aval[1], vals, sizeof(cell_t) * (count + 1));
135135
val.pData.aval[0] = count;
136-
elements.insert(position++, val);
136+
ke::InsertAt(&elements, position++, val);
137137
}
138138

139139
void CDataPack::PackFloatArray(cell_t const *vals, cell_t count)
@@ -144,7 +144,7 @@ void CDataPack::PackFloatArray(cell_t const *vals, cell_t count)
144144
val.pData.aval = new cell_t [count + 1];
145145
memcpy(&val.pData.aval[1], vals, sizeof(cell_t) * (count + 1));
146146
val.pData.aval[0] = count;
147-
elements.insert(position++, val);
147+
ke::InsertAt(&elements, position++, val);
148148
}
149149

150150
void CDataPack::Reset() const
@@ -159,7 +159,7 @@ size_t CDataPack::GetPosition() const
159159

160160
bool CDataPack::SetPosition(size_t pos) const
161161
{
162-
if (pos > elements.length())
162+
if (pos > elements.size())
163163
return false;
164164

165165
position = pos;
@@ -192,7 +192,7 @@ float CDataPack::ReadFloat() const
192192

193193
bool CDataPack::IsReadable(size_t bytes) const
194194
{
195-
return (position < elements.length());
195+
return (position < elements.size());
196196
}
197197

198198
const char *CDataPack::ReadString(size_t *len) const
@@ -207,7 +207,7 @@ const char *CDataPack::ReadString(size_t *len) const
207207

208208
const std::string &val = *elements[position++].pData.sval;
209209
if (len)
210-
*len = val.length();
210+
*len = val.size();
211211

212212
return val.c_str();
213213
}
@@ -270,7 +270,7 @@ void *CDataPack::ReadMemory(size_t *size) const
270270

271271
bool CDataPack::RemoveItem(size_t pos)
272272
{
273-
if (!elements.length())
273+
if (!elements.size())
274274
{
275275
return false;
276276
}
@@ -280,7 +280,7 @@ bool CDataPack::RemoveItem(size_t pos)
280280
pos = position;
281281
}
282282

283-
if (pos >= elements.length())
283+
if (pos >= elements.size())
284284
{
285285
return false;
286286
}
@@ -312,6 +312,6 @@ bool CDataPack::RemoveItem(size_t pos)
312312
}
313313
}
314314

315-
elements.remove(pos);
315+
ke::RemoveAt(&elements, pos);
316316
return true;
317317
}

‎core/logic/CDataPack.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class CDataPack
204204

205205
public:
206206
void Initialize();
207-
inline size_t GetCapacity() const { return this->elements.length(); };
207+
inline size_t GetCapacity() const { return this->elements.size(); };
208208
inline CDataPackType GetCurrentType(void) const { return this->elements[this->position].type; };
209209
bool RemoveItem(size_t pos = -1);
210210

@@ -222,7 +222,7 @@ class CDataPack
222222
CDataPackType type;
223223
} InternalPack;
224224

225-
ke::Vector<InternalPack> elements;
225+
std::vector<InternalPack> elements;
226226
mutable size_t position;
227227
};
228228

‎core/logic/Database.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void DBManager::RemoveDriver(IDBDriver *pDriver)
210210
}
211211

212212
ConfDbInfoList *list = m_Builder.GetConfigList();
213-
for (size_t i = 0; i < list->length(); i++)
213+
for (size_t i = 0; i < list->size(); i++)
214214
{
215215
ke::RefPtr<ConfDbInfo> current = list->at(i);
216216
if (current->realDriver == pDriver)

‎core/logic/DatabaseConfBuilder.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ SMCResult DatabaseConfBuilder::ReadSMC_LeavingSection(const SMCStates *states)
161161

162162
/* Save it.. */
163163
m_ParseCurrent->AddRef();
164-
m_ParseList->append(m_ParseCurrent);
164+
m_ParseList->push_back(m_ParseCurrent);
165165
m_ParseCurrent = nullptr;
166166

167167
/* Go up one level */

0 commit comments

Comments
 (0)