mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-09-27 01:00:46 +00:00
refactor: begin unglobbing std::vector
This commit is contained in:
@@ -74,9 +74,9 @@ ArchiveFile::~ArchiveFile()
|
||||
delete m_cachedData;
|
||||
}
|
||||
|
||||
vector<std::wstring> *ArchiveFile::getFileList()
|
||||
std::vector<std::wstring> *ArchiveFile::getFileList()
|
||||
{
|
||||
vector<std::wstring> *out = new vector<std::wstring>();
|
||||
std::vector<std::wstring> *out = new std::vector<std::wstring>();
|
||||
|
||||
for ( AUTO_VAR(it, m_index.begin());
|
||||
it != m_index.end();
|
||||
|
||||
@@ -31,7 +31,7 @@ public:
|
||||
ArchiveFile(File file);
|
||||
~ArchiveFile();
|
||||
|
||||
vector<std::wstring> *getFileList();
|
||||
std::vector<std::wstring> *getFileList();
|
||||
bool hasFile(const std::wstring &filename);
|
||||
int getFileSize(const std::wstring &filename);
|
||||
byteArray getFile(const std::wstring &filename);
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "../../Minecraft.World/IO/Streams/FloatBuffer.h"
|
||||
|
||||
std::unordered_map<int,int> MemoryTracker::GL_LIST_IDS;
|
||||
vector<int> MemoryTracker::TEXTURE_IDS;
|
||||
std::vector<int> MemoryTracker::TEXTURE_IDS;
|
||||
|
||||
int MemoryTracker::genLists(int count)
|
||||
{
|
||||
|
||||
@@ -13,7 +13,7 @@ class MemoryTracker
|
||||
{
|
||||
private:
|
||||
static std::unordered_map<int,int> GL_LIST_IDS;
|
||||
static vector<int> TEXTURE_IDS;
|
||||
static std::vector<int> TEXTURE_IDS;
|
||||
|
||||
public:
|
||||
static int genLists(int count);
|
||||
|
||||
@@ -17,16 +17,16 @@ StringTable::StringTable(PBYTE pbData, DWORD dwSize)
|
||||
int versionNumber = dis.readInt();
|
||||
int languagesCount = dis.readInt();
|
||||
|
||||
vector< pair<std::wstring, int> > langSizeMap;
|
||||
std::vector< pair<std::wstring, int> > langSizeMap;
|
||||
for(int i = 0; i < languagesCount; ++i)
|
||||
{
|
||||
std::wstring langId = dis.readUTF();
|
||||
int langSize = dis.readInt();
|
||||
|
||||
langSizeMap.push_back( vector< pair<std::wstring, int> >::value_type(langId, langSize));
|
||||
langSizeMap.push_back( std::vector< pair<std::wstring, int> >::value_type(langId, langSize));
|
||||
}
|
||||
|
||||
vector<std::wstring> locales;
|
||||
std::vector<std::wstring> locales;
|
||||
app.getLocale(locales);
|
||||
|
||||
bool foundLang = false;
|
||||
|
||||
@@ -16,7 +16,7 @@ private:
|
||||
bool isStatic;
|
||||
|
||||
std::unordered_map<std::wstring, std::wstring> m_stringsMap;
|
||||
vector<std::wstring> m_stringsVec;
|
||||
std::vector<std::wstring> m_stringsVec;
|
||||
|
||||
byteArray src;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ class WstringLookup
|
||||
private:
|
||||
UINT numIDs;
|
||||
std::unordered_map<std::wstring, UINT> str2int;
|
||||
vector<std::wstring> int2str;
|
||||
std::vector<std::wstring> int2str;
|
||||
|
||||
public:
|
||||
WstringLookup();
|
||||
|
||||
Reference in New Issue
Block a user