Missing alias qualifiers

Author: MaximDude

System/ContentFile.cpp

@@ -115,7 +115,7 @@ namespace RTE {
 			RTEAssert(pReturnBitmap, "Failed to load datafile object with following path and name:\n\n" + m_DataPath);
 
 			// Insert the bitmap into the map, PASSING OVER OWNERSHIP OF THE LOADED DATAFILE
-			m_sLoadedBitmaps[bitDepth].insert(pair<std::string, BITMAP *>(m_DataPath, pReturnBitmap));
+			m_sLoadedBitmaps[bitDepth].insert(std::pair<std::string, BITMAP *>(m_DataPath, pReturnBitmap));
 		}
 
 		return pReturnBitmap;
@@ -268,7 +268,7 @@ namespace RTE {
 			RTEAssert(pReturnSample, "Failed to load datafile object with following path and name:\n\n" + m_DataPath);
 
 			// Insert the Sound object into the map, PASSING OVER OWNERSHIP OF THE LOADED DATAFILE
-			m_sLoadedSamples.insert(pair<std::string, AUDIO_STRUCT *>(m_DataPath, pReturnSample));
+			m_sLoadedSamples.insert(std::pair<std::string, AUDIO_STRUCT *>(m_DataPath, pReturnSample));
 		}
 		return pReturnSample;
 	}

System/DataModule.cpp

@@ -318,7 +318,7 @@ namespace RTE {
 		bool foundAny = false;
 
 		// Find either the Entity typelist that contains all entities in this DataModule, or the specific class' typelist (which will get all derived classes too)
-		map<std::string, std::list<std::pair<std::string, Entity *>>>::iterator classItr = m_TypeMap.find((type.empty() || type == "All") ? "Entity" : type);
+		std::map<std::string, std::list<std::pair<std::string, Entity *>>>::iterator classItr = m_TypeMap.find((type.empty() || type == "All") ? "Entity" : type);
 
 		if (classItr != m_TypeMap.end()) {
 			//RTEAssert(!(type.empty() || type == "All") && !classItr->second.empty(), "DataModule has class entry without instances in its map!?");
@@ -340,7 +340,7 @@ namespace RTE {
 			return false;
 		}
 
-		map<std::string, std::list<std::pair<std::string, Entity *>>>::iterator classItr = m_TypeMap.find(type);
+		std::map<std::string, std::list<std::pair<std::string, Entity *>>>::iterator classItr = m_TypeMap.find(type);
 		if (classItr != m_TypeMap.end()) {
 			RTEAssert(!classItr->second.empty(), "DataModule has class entry without instances in its map!?");
 

System/PathFinder.cpp

@@ -33,7 +33,7 @@ namespace RTE {
 			// Start the column height over at middle of the top node each new column
 			nodePos.m_Y = static_cast<float>(nodeDimension) / 2.0F;
 			// Create the new column and fill it out
-			vector<PathNode *> newColumn;
+			std::vector<PathNode *> newColumn;
 			for (int y = 0; y < nodeYCount; ++y) {
 				// Make sure no cell centers are off the scene (since they can overlap the far edge of the scene)
 				if (nodePos.m_Y >= sceneHeight) { nodePos.m_Y = sceneHeight - 1; }
@@ -112,7 +112,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	int PathFinder::CalculatePath(Vector start, Vector end, list<Vector> &pathResult, float &totalCostResult, float digStrength) {
+	int PathFinder::CalculatePath(Vector start, Vector end, std::list<Vector> &pathResult, float &totalCostResult, float digStrength) {
 		RTEAssert(m_pPather, "No pather exists, can't calculate the path!");
 
 		// Make sure start and end are within scene bounds
@@ -132,14 +132,14 @@ namespace RTE {
 		m_DigStrength = digStrength;
 
 		// Do the actual pathfinding, fetch out the list of states that comprise the best path
-		vector<void *> statePath;
+		std::vector<void *> statePath;
 		int result = m_pPather->Solve((void *)(m_NodeGrid[startNodeX][startNodeY]), (void *)(m_NodeGrid[endNodeX][endNodeY]), &statePath, &totalCostResult);
 
 		// We got something back
 		if (!statePath.empty()) {
 			// Replace the approximate first point from the pathfound path with the exact starting point
 			pathResult.push_back(start);
-			vector<void *>::iterator itr = statePath.begin();
+			std::vector<void *>::iterator itr = statePath.begin();
 			itr++;
 
 			// Convert from a list of state void pointers to a list of scene position vectors
@@ -180,10 +180,10 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	void PathFinder::RecalculateAreaCosts(const list<Box> &boxList) {
+	void PathFinder::RecalculateAreaCosts(const std::list<Box> &boxList) {
 		// Go through all the boxes and see if any of the node centers are inside each
 		Box box;
-		for (list<Box>::const_iterator bItr = boxList.begin(); bItr != boxList.end(); bItr++) {
+		for (std::list<Box>::const_iterator bItr = boxList.begin(); bItr != boxList.end(); bItr++) {
 			// Get the current area box and make sure it's unflipped
 			box = (*bItr);
 			box.Unflip();

System/RTETools.cpp

@@ -116,7 +116,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	void OpenBrowserToURL(string goToURL) {
+	void OpenBrowserToURL(std::string goToURL) {
 		system(std::string("start ").append(goToURL).c_str());
 	}
 
@@ -132,7 +132,7 @@ namespace RTE {
 		std::string line;
 		std::string::size_type pos = 0;
 		std::string::size_type endPos = 0;
-		std::string::size_type commentPos = string::npos;
+		std::string::size_type commentPos = std::string::npos;
 		bool blockCommented = false;
 
 		while (!pFile->eof()) {

System/Reader.cpp

@@ -66,7 +66,7 @@ namespace RTE {
 	void Reader::Destroy(bool notInherited) {
 		delete m_pStream;
 		// Delete all the streams in the stream stack
-		for (list<StreamInfo>::iterator itr = m_StreamStack.begin(); itr != m_StreamStack.end(); ++itr) {
+		for (std::list<StreamInfo>::iterator itr = m_StreamStack.begin(); itr != m_StreamStack.end(); ++itr) {
 			delete (*itr).m_pStream;
 		}
 		Clear();

System/Serializable.h

@@ -41,7 +41,7 @@ namespace RTE {
 
 			// This is the engine for processing all properties of this Serializable upon read creation.
 			while (reader.NextProperty()) {
-				string propName = reader.ReadPropName();
+				std::string propName = reader.ReadPropName();
 				// We need to check if propName != "" because ReadPropName may return "" when it reads an InlcudeFile without any properties,
 				// in a case they are all commented out or it's the last line in file.
 				// Also ReadModuleProperty may return "" when it skips IncludeFile till the end of file.

System/Vector.cpp

@@ -150,10 +150,10 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	Vector & Vector::operator=(const deque<Vector> &rhs) {
+	Vector & Vector::operator=(const std::deque<Vector> &rhs) {
 		Clear();
 		if (rhs.empty()) { return *this; }
-		for (deque<Vector>::const_iterator itr = rhs.begin(); itr != rhs.end(); ++itr) {
+		for (std::deque<Vector>::const_iterator itr = rhs.begin(); itr != rhs.end(); ++itr) {
 			*this += *itr;
 		}
 		*this /= rhs.size();