#5108: Use std::ifstream to read from absolute filesystem paths inste…

…ad of the custom TextFileInputStream.
codereader · Nov 27, 2020 · c3a01d0 · c3a01d0
1 parent 7e63672
commit c3a01d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/libs/debugging/ScopedDebugTimer.h b/libs/debugging/ScopedDebugTimer.h
@@ -36,7 +36,6 @@
 #endif
 
 #include <string>
-#include "stream/TextFileInputStream.h"
 
 namespace {
 

diff --git a/plugins/sound/SoundPlayer.cpp b/plugins/sound/SoundPlayer.cpp
@@ -5,7 +5,6 @@
 #include <vector>
 #include "string/case_conv.h"
 
-#include "stream/TextFileInputStream.h"
 #include "os/path.h"
 #include <memory>
 

diff --git a/radiantcore/map/Map.cpp b/radiantcore/map/Map.cpp
@@ -24,7 +24,6 @@
 #include "imapformat.h"
 
 #include "registry/registry.h"
-#include "stream/TextFileInputStream.h"
 #include "entitylib.h"
 #include "gamelib.h"
 #include "os/path.h"

diff --git a/radiantcore/map/MapResource.cpp b/radiantcore/map/MapResource.cpp
@@ -21,7 +21,6 @@
 #include "os/file.h"
 #include "os/fs.h"
 #include "scene/Traverse.h"
-#include "stream/TextFileInputStream.h"
 #include "scenelib.h"
 
 #include <functional>
@@ -384,15 +383,13 @@ void MapResource::openFileStream(const std::string& path, const std::function<vo
 	{
 		rMessage() << "Open file " << path << " from filesystem...";
 
-		TextFileInputStream file(path);
+        std::ifstream stream(path);
 
-		if (file.failed())
-		{
-			rError() << "failure" << std::endl;
-			throw OperationException(fmt::format(_("Failure opening file:\n{0}"), path));
-		}
-
-		std::istream stream(&file);
+        if (!stream)
+        {
+            rError() << "failure" << std::endl;
+            throw OperationException(fmt::format(_("Failure opening file:\n{0}"), path));
+        }
 
 		rMessage() << "success." << std::endl;