[Scummvm-cvs-logs] SF.net SVN: scummvm:[35381] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 35381
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35381&view=rev
Author:   fingolfin
Date:     2008-12-15 12:55:13 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/common/archive.h

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2008-12-15 12:33:47 UTC (rev 35380)
+++ scummvm/trunk/common/archive.cpp	2008-12-15 12:55:13 UTC (rev 35381)
@@ -263,8 +263,8 @@
 
 
 
-SearchSet::ArchiveList::iterator SearchSet::find(const String &name) const {
-	ArchiveList::iterator it = _list.begin();
+SearchSet::ArchiveNodeList::iterator SearchSet::find(const String &name) const {
+	ArchiveNodeList::iterator it = _list.begin();
 	for ( ; it != _list.end(); it++) {
 		if (it->_name == name)
 			break;
@@ -278,7 +278,7 @@
 	order prevails.
 */
 void SearchSet::insert(const Node &node) {
-	ArchiveList::iterator it = _list.begin();
+	ArchiveNodeList::iterator it = _list.begin();
 	for ( ; it != _list.end(); it++) {
 		if (it->_priority < node._priority)
 			break;
@@ -299,7 +299,7 @@
 }
 
 void SearchSet::remove(const String &name) {
-	ArchiveList::iterator it = find(name);
+	ArchiveNodeList::iterator it = find(name);
 	if (it != _list.end()) {
 		if (it->_autoFree)
 			delete it->_arc;
@@ -312,7 +312,7 @@
 }
 
 void SearchSet::clear() {
-	for (ArchiveList::iterator i = _list.begin(); i != _list.end(); ++i) {
+	for (ArchiveNodeList::iterator i = _list.begin(); i != _list.end(); ++i) {
 		if (i->_autoFree)
 			delete i->_arc;
 	}
@@ -321,7 +321,7 @@
 }
 
 void SearchSet::setPriority(const String &name, int priority) {
-	ArchiveList::iterator it = find(name);
+	ArchiveNodeList::iterator it = find(name);
 	if (it == _list.end()) {
 		warning("SearchSet::setPriority: archive '%s' is not present", name.c_str());
 		return;
@@ -340,7 +340,7 @@
 	if (name.empty())
 		return false;
 
-	ArchiveList::iterator it = _list.begin();
+	ArchiveNodeList::iterator it = _list.begin();
 	for ( ; it != _list.end(); it++) {
 		if (it->_arc->hasFile(name))
 			return true;
@@ -352,7 +352,7 @@
 int SearchSet::listMatchingMembers(ArchiveMemberList &list, const String &pattern) {
 	int matches = 0;
 
-	ArchiveList::iterator it = _list.begin();
+	ArchiveNodeList::iterator it = _list.begin();
 	for ( ; it != _list.end(); it++)
 		matches += it->_arc->listMatchingMembers(list, pattern);
 
@@ -362,7 +362,7 @@
 int SearchSet::listMembers(ArchiveMemberList &list) {
 	int matches = 0;
 
-	ArchiveList::iterator it = _list.begin();
+	ArchiveNodeList::iterator it = _list.begin();
 	for ( ; it != _list.end(); it++)
 		matches += it->_arc->listMembers(list);
 
@@ -373,7 +373,7 @@
 	if (name.empty())
 		return ArchiveMemberPtr();
 
-	ArchiveList::iterator it = _list.begin();
+	ArchiveNodeList::iterator it = _list.begin();
 	for ( ; it != _list.end(); it++) {
 		if (it->_arc->hasFile(name))
 			return it->_arc->getMember(name);
@@ -386,7 +386,7 @@
 	if (name.empty())
 		return 0;
 
-	ArchiveList::iterator it = _list.begin();
+	ArchiveNodeList::iterator it = _list.begin();
 	for ( ; it != _list.end(); it++) {
 		if (it->_arc->hasFile(name))
 			return it->_arc->openFile(name);

Modified: scummvm/trunk/common/archive.h
===================================================================
--- scummvm/trunk/common/archive.h	2008-12-15 12:33:47 UTC (rev 35380)
+++ scummvm/trunk/common/archive.h	2008-12-15 12:55:13 UTC (rev 35381)
@@ -248,10 +248,10 @@
 			: _priority(priority), _name(name), _arc(arc), _autoFree(autoFree) {
 		}
 	};
-	typedef List<Node> ArchiveList;
-	ArchiveList _list;
+	typedef List<Node> ArchiveNodeList;
+	ArchiveNodeList _list;
 
-	ArchiveList::iterator find(const String &name) const;
+	ArchiveNodeList::iterator find(const String &name) const;
 
 	// Add an archive keeping the list sorted by ascending priorities.
 	void insert(const Node& node);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.