diff --git a/src/App/ProjectFile.cpp b/src/App/ProjectFile.cpp index b79ff11c94..316d185689 100644 --- a/src/App/ProjectFile.cpp +++ b/src/App/ProjectFile.cpp @@ -143,7 +143,7 @@ private: metadata.uuid = propMap.at("Uid"); } - void readProperty(DOMNode* propNode, std::map& propMap) + static void readProperty(DOMNode* propNode, std::map& propMap) { DOMNode* nameAttr = propNode->getAttributes()->getNamedItem(XStr("name").unicodeForm()); if (nameAttr) { @@ -530,7 +530,7 @@ std::string ProjectFile::extractInputFile(const std::string& name) return {}; } -void ProjectFile::readInputFile(const std::string& name, std::stringstream& str) +void ProjectFile::readInputFile(const std::string& name, std::ostream& str) { Base::FileInfo fi(extractInputFile(name)); if (fi.exists()) { @@ -543,7 +543,7 @@ void ProjectFile::readInputFile(const std::string& name, std::stringstream& str) // Read the given input file from the zip directly into the given stream (not using a temporary // file) -void ProjectFile::readInputFileDirect(const std::string& name, std::stringstream& str) +void ProjectFile::readInputFileDirect(const std::string& name, std::ostream& str) { zipios::ZipFile project(stdFile); std::unique_ptr istr(project.getInputStream(name)); diff --git a/src/App/ProjectFile.h b/src/App/ProjectFile.h index b4e2a6c409..b0b30038dc 100644 --- a/src/App/ProjectFile.h +++ b/src/App/ProjectFile.h @@ -156,11 +156,11 @@ public: /** * Extracts, via a temporary file the content of an input file of @a name. */ - void readInputFile(const std::string& name, std::stringstream& str); + void readInputFile(const std::string& name, std::ostream& str); /** * Directly extracts the content of an input file of @a name. */ - void readInputFileDirect(const std::string& name, std::stringstream& str); + void readInputFileDirect(const std::string& name, std::ostream& str); /** * Replaces the input file @a name with the content of the given @a stream. * The method returns the file name of the newly created project file.