Use STL containers instead of irr::core::list

sfan5 · sfan5 · commit f1e4a671dc52 · 2013-09-09T22:50:51.000+02:00
diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
@@ -139,7 +139,7 @@ MapBlock* Database_Dummy::loadBlock(v3s16 blockpos)
 	return(NULL);
 }
 
-void Database_Dummy::listAllLoadableBlocks(core::list<v3s16> &dst)
+void Database_Dummy::listAllLoadableBlocks(std::list<v3s16> &dst)
 {
 	for(std::map<unsigned long long, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)
 	{
diff --git a/src/database-dummy.h b/src/database-dummy.h
@@ -16,7 +16,7 @@ class Database_Dummy : public Database
 	virtual void endSave();
         virtual void saveBlock(MapBlock *block);
         virtual MapBlock* loadBlock(v3s16 blockpos);
-        virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
+        virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
         virtual int Initialized(void);
 	~Database_Dummy();
 private:
diff --git a/src/database-leveldb.cpp b/src/database-leveldb.cpp
@@ -146,7 +146,7 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
 	return(NULL);
 }
 
-void Database_LevelDB::listAllLoadableBlocks(core::list<v3s16> &dst)
+void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst)
 {
 	leveldb::Iterator* it = m_database->NewIterator(leveldb::ReadOptions());
 	for (it->SeekToFirst(); it->Valid(); it->Next()) {
diff --git a/src/database-leveldb.h b/src/database-leveldb.h
@@ -21,7 +21,7 @@ class Database_LevelDB : public Database
 	virtual void endSave();
         virtual void saveBlock(MapBlock *block);
         virtual MapBlock* loadBlock(v3s16 blockpos);
-        virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
+        virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
         virtual int Initialized(void);
 	~Database_LevelDB();
 private:
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
@@ -294,7 +294,7 @@ void Database_SQLite3::createDatabase()
 	
 }
 
-void Database_SQLite3::listAllLoadableBlocks(core::list<v3s16> &dst)
+void Database_SQLite3::listAllLoadableBlocks(std::list<v3s16> &dst)
 {
 	verifyDatabase();
 	
diff --git a/src/database-sqlite3.h b/src/database-sqlite3.h
@@ -22,7 +22,7 @@ class Database_SQLite3 : public Database
 
         virtual void saveBlock(MapBlock *block);
         virtual MapBlock* loadBlock(v3s16 blockpos);
-        virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
+        virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
         virtual int Initialized(void);
 	~Database_SQLite3();
 private:
diff --git a/src/database.h b/src/database.h
@@ -8,7 +8,7 @@
 #include "main.h"
 #include "filesys.h"
 #include "serialization.h"
-#include <irrList.h>
+#include <list>
 
 class Database;
 class ServerMap;
@@ -23,7 +23,7 @@ class Database
 	virtual MapBlock* loadBlock(v3s16 blockpos)=0;
 	long long getBlockAsInteger(const v3s16 pos);
 	v3s16 getIntegerAsBlock(long long i);
-	virtual void listAllLoadableBlocks(core::list<v3s16> &dst)=0;
+	virtual void listAllLoadableBlocks(std::list<v3s16> &dst)=0;
 	virtual int Initialized(void)=0;
 	virtual ~Database() {};
 };
diff --git a/src/map.cpp b/src/map.cpp
@@ -3371,10 +3371,7 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
 		errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
 				<<"all blocks that are stored in flat files"<<std::endl;
 	}
-	core::list<v3s16> dst_;
-	dbase->listAllLoadableBlocks(dst_);
-	for(core::list<v3s16>::Iterator i = dst_.begin(); i != dst_.end(); ++i)
-		dst.push_back(*i);
+	dbase->listAllLoadableBlocks(dst);
 }
 
 void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ MapBlock* Database_Dummy::loadBlock(v3s16 blockpos)`
`139`	`139`	`return(NULL);`
`140`	`140`	`}`
`141`	`141`
`142`		`-void Database_Dummy::listAllLoadableBlocks(core::list<v3s16> &dst)`
	`142`	`+void Database_Dummy::listAllLoadableBlocks(std::list<v3s16> &dst)`
`143`	`143`	`{`
`144`	`144`	`for(std::map<unsigned long long, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)`
`145`	`145`	`{`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)`
`146`	`146`	`return(NULL);`
`147`	`147`	`}`
`148`	`148`
`149`		`-void Database_LevelDB::listAllLoadableBlocks(core::list<v3s16> &dst)`
	`149`	`+void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst)`
`150`	`150`	`{`
`151`	`151`	`leveldb::Iterator* it = m_database->NewIterator(leveldb::ReadOptions());`
`152`	`152`	`for (it->SeekToFirst(); it->Valid(); it->Next()) {`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ void Database_SQLite3::createDatabase()`
`294`	`294`
`295`	`295`	`}`
`296`	`296`
`297`		`-void Database_SQLite3::listAllLoadableBlocks(core::list<v3s16> &dst)`
	`297`	`+void Database_SQLite3::listAllLoadableBlocks(std::list<v3s16> &dst)`
`298`	`298`	`{`
`299`	`299`	`verifyDatabase();`
`300`	`300`
Original file line number	Diff line number	Diff line change
`@@ -3371,10 +3371,7 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)`
`3371`	`3371`	`errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "`
`3372`	`3372`	`<<"all blocks that are stored in flat files"<<std::endl;`
`3373`	`3373`	`}`
`3374`		`- core::list<v3s16> dst_;`
`3375`		`- dbase->listAllLoadableBlocks(dst_);`
`3376`		`- for(core::list<v3s16>::Iterator i = dst_.begin(); i != dst_.end(); ++i)`
`3377`		`- dst.push_back(*i);`
	`3374`	`+ dbase->listAllLoadableBlocks(dst);`
`3378`	`3375`	`}`
`3379`	`3376`
`3380`	`3377`	`void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)`