Index: src/ch/TTaskDefinition.h =================================================================== diff -u -N -r69b48f0b4d7fad78f95854e95fca166014311474 -rb684bec49aaaea4b89ab2e599497f4085d8698a3 --- src/ch/TTaskDefinition.h (.../TTaskDefinition.h) (revision 69b48f0b4d7fad78f95854e95fca166014311474) +++ src/ch/TTaskDefinition.h (.../TTaskDefinition.h) (revision b684bec49aaaea4b89ab2e599497f4085d8698a3) @@ -24,7 +24,7 @@ #define __TTASKDEFINITION_H__ #include "TTaskOperationPlan.h" -#include "TConfig.h" +#include "../libchcore/TConfig.h" #include "FileInfo.h" /////////////////////////////////////////////////////////////////////////// @@ -60,9 +60,9 @@ const TOperationPlan& GetOperationPlan() const; // Task configuration - void SetConfig(const TConfig& rConfig); - TConfig& GetConfiguration(); - const TConfig& GetConfiguration() const; + void SetConfig(const chcore::TConfig& rConfig); + chcore::TConfig& GetConfiguration(); + const chcore::TConfig& GetConfiguration() const; // Serialization void Load(const CString& strPath); @@ -78,7 +78,7 @@ TOperationPlan m_tOperationPlan; ///< Describes the operation along with sub-operations to be performed on the task input data // Global task settings - TConfig m_tConfiguration; + chcore::TConfig m_tConfiguration; // Other info (volatile, not to be saved to xml) mutable bool m_bModified; ///< Some parameters has been modified and this object needs to be serialized again