aboutsummaryrefslogtreecommitdiff
path: root/common/config-file.cpp
diff options
context:
space:
mode:
authorMax Horn2009-05-19 11:42:14 +0000
committerMax Horn2009-05-19 11:42:14 +0000
commit65b5d318140c7ff846455a37ec7ae63e635bcdcf (patch)
tree77f278ceec1e54e097056df0b2820e414eed8290 /common/config-file.cpp
parent4d59f620f9fdc1dfd7ccd6c7d30a0b5de480eb20 (diff)
downloadscummvm-rg350-65b5d318140c7ff846455a37ec7ae63e635bcdcf.tar.gz
scummvm-rg350-65b5d318140c7ff846455a37ec7ae63e635bcdcf.tar.bz2
scummvm-rg350-65b5d318140c7ff846455a37ec7ae63e635bcdcf.zip
COMMON: Removed Stream::ioFailed() and clearIOFailed(), as they are deprecated; however, retained ioFailed in SeekableReadStream and File for now (so for now this mainly affects WriteStream subclasses)
svn-id: r40725
Diffstat (limited to 'common/config-file.cpp')
-rw-r--r--common/config-file.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/config-file.cpp b/common/config-file.cpp
index 61437a60ab..9b69452b2e 100644
--- a/common/config-file.cpp
+++ b/common/config-file.cpp
@@ -87,7 +87,7 @@ bool ConfigFile::loadFromStream(SeekableReadStream &stream) {
// TODO: Detect if a section occurs multiple times (or likewise, if
// a key occurs multiple times inside one section).
- while (!stream.eos() && !stream.ioFailed()) {
+ while (!stream.eos() && !stream.err()) {
lineno++;
// Read a line
@@ -179,7 +179,7 @@ bool ConfigFile::loadFromStream(SeekableReadStream &stream) {
if (!section.name.empty())
_sections.push_back(section);
- return (!stream.ioFailed() || stream.eos());
+ return (!stream.err() || stream.eos());
}
bool ConfigFile::saveToFile(const String &filename) {
@@ -232,7 +232,7 @@ bool ConfigFile::saveToStream(WriteStream &stream) {
}
stream.flush();
- return !stream.ioFailed();
+ return !stream.err();
}