diff --git a/code/nel/tools/pipeline/plugin_library/process_info.cpp b/code/nel/tools/pipeline/plugin_library/process_info.cpp index 838a38c78..e0412ffe0 100644 --- a/code/nel/tools/pipeline/plugin_library/process_info.cpp +++ b/code/nel/tools/pipeline/plugin_library/process_info.cpp @@ -40,7 +40,11 @@ using namespace std; namespace PIPELINE { -void sjdflkmsdjfmlkqsjlkfdj() { } +void IProcessInfo::getDependentPaths(std::vector &resultAppend) +{ + getDependentDirectories(resultAppend); + getDependentFiles(resultAppend); +} } /* namespace PIPELINE */ diff --git a/code/nel/tools/pipeline/plugin_library/process_info.h b/code/nel/tools/pipeline/plugin_library/process_info.h index 50a1fbef4..c402e4673 100644 --- a/code/nel/tools/pipeline/plugin_library/process_info.h +++ b/code/nel/tools/pipeline/plugin_library/process_info.h @@ -66,6 +66,8 @@ public: virtual void getDependentDirectories(std::vector &resultAppend) = 0; /// Must return all files on which the process handler depends, ONLY if these are not in dependent directories. virtual void getDependentFiles(std::vector &resultAppend) = 0; + /// Combines getDependentDirectories and getDependentFiles. + void getDependentPaths(std::vector &resultAppend); }; /* class IProcessInfo */ diff --git a/code/nel/tools/pipeline/plugin_nel/process_interface_info.cpp b/code/nel/tools/pipeline/plugin_nel/process_interface_info.cpp index 8d07840a5..575af28be 100644 --- a/code/nel/tools/pipeline/plugin_nel/process_interface_info.cpp +++ b/code/nel/tools/pipeline/plugin_nel/process_interface_info.cpp @@ -51,7 +51,7 @@ CProcessInterfaceInfo::~CProcessInterfaceInfo() } -void CProcessInterfaceInfo::getDependentDirectories(std::vector &result) +void CProcessInterfaceInfo::getDependentDirectories(std::vector &resultAppend) { { uint nb; @@ -61,7 +61,7 @@ void CProcessInterfaceInfo::getDependentDirectories(std::vector &re { std::stringstream ss; ss << "Interface.Atlas[" << i << "].SrcDirectories"; - m_PipelineProcess->getValues(result, ss.str()); + m_PipelineProcess->getValues(resultAppend, ss.str()); } } } @@ -73,23 +73,23 @@ void CProcessInterfaceInfo::getDependentDirectories(std::vector &re { std::stringstream ss; ss << "Interface.AtlasDxtc[" << i << "].SrcDirectories"; - m_PipelineProcess->getValues(result, ss.str()); + m_PipelineProcess->getValues(resultAppend, ss.str()); } } } { std::stringstream ss; ss << "Interface.Fullscreen.SrcDirectories"; - m_PipelineProcess->getValues(result, ss.str()); + m_PipelineProcess->getValues(resultAppend, ss.str()); } { std::stringstream ss; ss << "Interface.3D.SrcDirectories"; - m_PipelineProcess->getValues(result, ss.str()); + m_PipelineProcess->getValues(resultAppend, ss.str()); } } -void CProcessInterfaceInfo::getDependentFiles(std::vector &result) +void CProcessInterfaceInfo::getDependentFiles(std::vector &resultAppend) { } diff --git a/code/nel/tools/pipeline/plugin_nel/process_interface_info.h b/code/nel/tools/pipeline/plugin_nel/process_interface_info.h index 6a6cfbf7b..4629cb7d2 100644 --- a/code/nel/tools/pipeline/plugin_nel/process_interface_info.h +++ b/code/nel/tools/pipeline/plugin_nel/process_interface_info.h @@ -56,8 +56,8 @@ public: CProcessInterfaceInfo(); virtual ~CProcessInterfaceInfo(); - virtual void getDependentDirectories(std::vector &result); - virtual void getDependentFiles(std::vector &result); + virtual void getDependentDirectories(std::vector &resultAppend); + virtual void getDependentFiles(std::vector &resultAppend); NLMISC_DECLARE_CLASS(CProcessInterfaceInfo) }; /* class CProcessInterfaceInfo */