diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp index 7077b6a8bdc..c421d699c2d 100644 --- a/devtools/create_project/cmake.cpp +++ b/devtools/create_project/cmake.cpp @@ -330,7 +330,7 @@ void CMakeProvider::writeDefines(const BuildSetup &setup, std::ofstream &output) } } -void CMakeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, +void CMakeProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) { std::string lastName; diff --git a/devtools/create_project/cmake.h b/devtools/create_project/cmake.h index f2e3047c658..8f62e22b573 100644 --- a/devtools/create_project/cmake.h +++ b/devtools/create_project/cmake.h @@ -46,7 +46,7 @@ protected: void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir, const StringList &includeList, const StringList &excludeList) final; - void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, + void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) final; const char *getProjectExtension() final; diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp index 14183521405..2921fe6be46 100644 --- a/devtools/create_project/codeblocks.cpp +++ b/devtools/create_project/codeblocks.cpp @@ -248,7 +248,7 @@ void CodeBlocksProvider::writeDefines(const StringList &defines, std::ofstream & output << "\t\t\t\t\t\n"; } -void CodeBlocksProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, +void CodeBlocksProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) { for (FileNode::NodeList::const_iterator i = dir.children.begin(); i != dir.children.end(); ++i) { diff --git a/devtools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h index fbd82bc182d..340b77bf429 100644 --- a/devtools/create_project/codeblocks.h +++ b/devtools/create_project/codeblocks.h @@ -41,7 +41,7 @@ protected: void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir, const StringList &includeList, const StringList &excludeList) final; - void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, + void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) final; void writeReferences(const BuildSetup &setup, std::ofstream &output) final; diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index d93468eff85..4e945a71692 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -1800,7 +1800,7 @@ std::string ProjectProvider::getLastPathComponent(const std::string &path) { return path.substr(pos + 1); } -void ProjectProvider::addFilesToProject(const std::string &dir, std::ofstream &projectFile, +void ProjectProvider::addFilesToProject(const std::string &dir, std::ostream &projectFile, const StringList &includeList, const StringList &excludeList, const std::string &filePrefix) { FileNode *files = scanFiles(dir, includeList, excludeList); diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index feb7615fc93..af2450bb021 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -551,7 +551,7 @@ protected: * @param objPrefix Prefix to use for object files, which would name clash. * @param filePrefix Generic prefix to all files of the node. */ - virtual void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, + virtual void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) = 0; /** @@ -575,7 +575,7 @@ protected: * @param excludeList Files to exclude (must have a relative directory as prefix). * @param filePrefix Prefix to use for relative path arguments. */ - void addFilesToProject(const std::string &dir, std::ofstream &projectFile, + void addFilesToProject(const std::string &dir, std::ostream &projectFile, const StringList &includeList, const StringList &excludeList, const std::string &filePrefix); diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 574d2cf3850..f866a089f71 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -506,7 +506,7 @@ void MSBuildProvider::outputNasmCommand(std::ostream &projectFile, const std::st } } -void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int, +void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int, const std::string &objPrefix, const std::string &filePrefix) { // Reset lists _filters.clear(); diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h index f92376b0f0b..cd0f4d992a8 100644 --- a/devtools/create_project/msbuild.h +++ b/devtools/create_project/msbuild.h @@ -36,7 +36,7 @@ protected: void outputProjectSettings(std::ofstream &project, const std::string &name, const BuildSetup &setup, bool isRelease, MSVC_Architecture arch, const std::string &configuration); - void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, + void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) override; void writeReferences(const BuildSetup &setup, std::ofstream &output) override; diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index a25d7dabf23..bd9b56062f0 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -375,7 +375,7 @@ void XcodeProvider::outputMainProjectFile(const BuildSetup &setup) { ////////////////////////////////////////////////////////////////////////// // Files ////////////////////////////////////////////////////////////////////////// -void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, +void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) { // Ensure that top-level groups are generated for i.e. engines/ diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index 5305d9c3191..c5a01e733ee 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -44,7 +44,7 @@ protected: void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir, const StringList &includeList, const StringList &excludeList) final; - void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation, + void writeFileListToProject(const FileNode &dir, std::ostream &projectFile, const int indentation, const std::string &objPrefix, const std::string &filePrefix) final; private: enum {