UNLOZE/sourcemod
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace ke::Vector with std::vector.

Browse Source
This commit is contained in:
David Anderson
2020-05-31 11:35:51 -07:00
parent e5ddbd9886
commit 5d94f0bea8
41 changed files with 1174 additions and 1174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/clientprefs/cookie.cpp
+10 -10
View File
@@ -59,7 +59,7 @@ void CookieManager::Unload()
}
/* Find all cookies and delete them */
for (size_t iter = 0; iter < cookieList.length(); ++iter)
for (size_t iter = 0; iter < cookieList.size(); ++iter)
delete cookieList[iter];
cookieList.clear();
@@ -95,7 +95,7 @@ Cookie *CookieManager::CreateCookie(const char *name, const char *description, C
op->m_params.cookie = pCookie;
cookieFinder.insert(name, pCookie);
cookieList.append(pCookie);
cookieList.push_back(pCookie);
g_ClientPrefs.AddQueryToQueue(op);
@@ -111,7 +111,7 @@ bool CookieManager::GetCookieValue(Cookie *pCookie, int client, char **value)
{
data = new CookieData("");
data->parent = pCookie;
clientData[client].append(data);
clientData[client].push_back(data);
pCookie->data[client] = data;
data->changed = false;
data->timestamp = 0;
@@ -130,7 +130,7 @@ bool CookieManager::SetCookieValue(Cookie *pCookie, int client, const char *valu
{
data = new CookieData(value);
data->parent = pCookie;
clientData[client].append(data);
clientData[client].push_back(data);
pCookie->data[client] = data;
}
else
@@ -185,8 +185,8 @@ void CookieManager::OnClientDisconnecting(int client)
g_ClientPrefs.ClearQueryCache(player->GetSerial());
}
ke::Vector<CookieData *> &clientvec = clientData[client];
for (size_t iter = 0; iter < clientvec.length(); ++iter)
std::vector<CookieData *> &clientvec = clientData[client];
for (size_t iter = 0; iter < clientvec.size(); ++iter)
{
current = clientvec[iter];
dbId = current->parent->dbid;
@@ -263,7 +263,7 @@ void CookieManager::ClientConnectCallback(int serial, IQuery *data)
pData->parent = parent;
parent->data[client] = pData;
clientData[client].append(pData);
clientData[client].push_back(pData);
}
statsLoaded[client] = true;
@@ -317,18 +317,18 @@ bool CookieManager::AreClientCookiesPending(int client)
void CookieManager::OnPluginDestroyed(IPlugin *plugin)
{
ke::Vector<char *> *pList;
std::vector<char *> *pList;
if (plugin->GetProperty("SettingsMenuItems", (void **)&pList, true))
{
ke::Vector<char *> &menuitems = (*pList);
std::vector<char *> &menuitems = (*pList);
char *name;
ItemDrawInfo draw;
const char *info;
AutoMenuData * data;
unsigned itemcount;
for (size_t p_iter = 0; p_iter < menuitems.length(); ++p_iter)
for (size_t p_iter = 0; p_iter < menuitems.size(); ++p_iter)
{
name = menuitems[p_iter];
itemcount = clientMenu->GetItemCount();
extensions/clientprefs/cookie.h
+2 -2
View File
@@ -132,12 +132,12 @@ public:
public:
IForward *cookieDataLoadedForward;
ke::Vector<Cookie *> cookieList;
std::vector<Cookie *> cookieList;
IBaseMenu *clientMenu;
private:
NameHashSet<Cookie *> cookieFinder;
ke::Vector<CookieData *> clientData[SM_MAXPLAYERS+1];
std::vector<CookieData *> clientData[SM_MAXPLAYERS+1];
bool connected[SM_MAXPLAYERS+1];
bool statsLoaded[SM_MAXPLAYERS+1];
extensions/clientprefs/extension.cpp
+4 -4
View File
@@ -313,7 +313,7 @@ bool ClientPrefs::AddQueryToQueue(TQueryOp *query)
std::lock_guard<std::mutex> lock(queryLock);
if (!Database)
{
cachedQueries.append(query);
cachedQueries.push_back(query);
return false;
}
@@ -331,7 +331,7 @@ void ClientPrefs::ProcessQueryCache()
if (!Database)
return;
for (size_t iter = 0; iter < cachedQueries.length(); ++iter)
for (size_t iter = 0; iter < cachedQueries.size(); ++iter)
{
TQueryOp *op = cachedQueries[iter];
op->SetDatabase(Database);
@@ -373,13 +373,13 @@ void ClientPrefs::ClearQueryCache(int serial)
{
std::lock_guard<std::mutex> lock(queryLock);
for (size_t iter = 0; iter < cachedQueries.length(); ++iter)
for (size_t iter = 0; iter < cachedQueries.size(); ++iter)
{
TQueryOp *op = cachedQueries[iter];
if (op && op->PullQueryType() == Query_SelectData && op->PullQuerySerial() == serial)
{
op->Destroy();
cachedQueries.remove(iter--);
ke::RemoveAt(&cachedQueries, iter--);
}
}
}
extensions/clientprefs/extension.h
+1 -1
View File
@@ -158,7 +158,7 @@ public:
bool databaseLoading;
private:
ke::Vector<TQueryOp *> cachedQueries;
std::vector<TQueryOp *> cachedQueries;
std::mutex queryLock;
IdentityToken_t *identity;
};
extensions/clientprefs/natives.cpp
+7 -7
View File
@@ -299,7 +299,7 @@ static cell_t ReadCookieIterator(IPluginContext *pContext, const cell_t *params)
return pContext->ThrowNativeError("Invalid Cookie iterator handle %x (error %d)", hndl, err);
}
if (*iter >= g_CookieManager.cookieList.length())
if (*iter >= g_CookieManager.cookieList.size())
{
return 0;
}
@@ -356,18 +356,18 @@ cell_t AddSettingsMenuItem(IPluginContext *pContext, const cell_t *params)
/* Track this in case the plugin unloads */
IPlugin *pPlugin = plsys->FindPluginByContext(pContext->GetContext());
ke::Vector<char *> *pList = NULL;
std::vector<char *> *pList = NULL;
if (!pPlugin->GetProperty("SettingsMenuItems", (void **)&pList, false) || !pList)
{
pList = new ke::Vector<char *>;
pList = new std::vector<char *>;
pPlugin->SetProperty("SettingsMenuItems", pList);
}
char *copyarray = new char[strlen(display)+1];
g_pSM->Format(copyarray, strlen(display)+1, "%s", display);
pList->append(copyarray);
pList->push_back(copyarray);
return 0;
}
@@ -426,18 +426,18 @@ cell_t AddSettingsPrefabMenuItem(IPluginContext *pContext, const cell_t *params)
/* Track this in case the plugin unloads */
IPlugin *pPlugin = plsys->FindPluginByContext(pContext->GetContext());
ke::Vector<char *> *pList = NULL;
std::vector<char *> *pList = NULL;
if (!pPlugin->GetProperty("SettingsMenuItems", (void **)&pList, false) || !pList)
{
pList = new ke::Vector<char *>;
pList = new std::vector<char *>;
pPlugin->SetProperty("SettingsMenuItems", pList);
}
char *copyarray = new char[strlen(display)+1];
g_pSM->Format(copyarray, strlen(display)+1, "%s", display);
pList->append(copyarray);
pList->push_back(copyarray);
return 0;
}