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

[fingolfin at users.sourceforge.net]

Revision: 31501
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31501&view=rev
Author:   fingolfin
Date:     2008-04-14 05:11:10 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
Removed Common::Array::contains()

Modified Paths:
--------------
    scummvm/trunk/common/array.h
    scummvm/trunk/common/config-manager.cpp

Modified: scummvm/trunk/common/array.h
===================================================================
--- scummvm/trunk/common/array.h	2008-04-14 12:08:00 UTC (rev 31500)
+++ scummvm/trunk/common/array.h	2008-04-14 12:11:10 UTC (rev 31501)
@@ -140,10 +140,6 @@
 		return _data + _size;
 	}
 
-	bool contains(const T &key) const {
-		return find(begin(), end(), key) != end();
-	}
-
 	void reserve(uint newCapacity) {
 		if (newCapacity <= _capacity)
 			return;

Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2008-04-14 12:08:00 UTC (rev 31500)
+++ scummvm/trunk/common/config-manager.cpp	2008-04-14 12:11:10 UTC (rev 31501)
@@ -270,7 +270,6 @@
 	if (!cfg_file.open(_filename, File::kFileWriteMode)) {
 		warning("Unable to write configuration file: %s", _filename.c_str());
 	} else {
-
 		// First write the domains in _domainSaveOrder, in that order.
 		// Note: It's possible for _domainSaveOrder to list domains which
 		// are not present anymore.
@@ -285,11 +284,12 @@
 
 		DomainMap::const_iterator d;
 
+
 		// Now write the domains which haven't been written yet
-		if (!_domainSaveOrder.contains(kApplicationDomain))
+		if (find(_domainSaveOrder.begin(), _domainSaveOrder.end(), kApplicationDomain) == _domainSaveOrder.end())
 			writeDomain(cfg_file, kApplicationDomain, _appDomain);
 		for (d = _gameDomains.begin(); d != _gameDomains.end(); ++d) {
-			if (!_domainSaveOrder.contains(d->_key))
+			if (find(_domainSaveOrder.begin(), _domainSaveOrder.end(), d->_key) == _domainSaveOrder.end())
 				writeDomain(cfg_file, d->_key, d->_value);
 		}
 	}


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