Index: src/ch/task.h
===================================================================
diff -u -N -r633a533cb6e741d44fe28aa56339e1d2709b1b27 -r0cd863a6e51b221c4f7bf6e7b83ddfc43a5d433f
--- src/ch/task.h	(.../task.h)	(revision 633a533cb6e741d44fe28aa56339e1d2709b1b27)
+++ src/ch/task.h	(.../task.h)	(revision 0cd863a6e51b221c4f7bf6e7b83ddfc43a5d433f)
@@ -122,7 +122,7 @@
 	// thread
 	void SetPriority(int nPriority);
 
-	void Load(const CString& strPath);
+	void Load(const chcore::TSmartPath& strPath);
 	void Store();
 
 	void BeginProcessing();
@@ -136,18 +136,18 @@
 	void GetSnapshot(TASK_DISPLAY_DATA *pData);
 	void GetMiniSnapshot(TASK_MINI_DISPLAY_DATA *pData);
 
-	void SetTaskDirectory(const CString& strDir);
-	CString GetTaskDirectory() const;
+	void SetTaskDirectory(const chcore::TSmartPath& strDir);
+	chcore::TSmartPath GetTaskDirectory() const;
 
-	void SetTaskFilePath(const CString& strPath);
-	CString GetTaskFilePath() const;
+	void SetTaskFilePath(const chcore::TSmartPath& strPath);
+	chcore::TSmartPath GetTaskFilePath() const;
 
 	void SetForceFlag(bool bFlag = true);
 	bool GetForceFlag();
 
 	size_t GetSessionUniqueID() const { return m_stSessionUniqueID; }
 
-	CString GetRelatedPath(EPathType ePathType);
+	chcore::TSmartPath GetRelatedPath(EPathType ePathType);
 
 protected:
 	CTask(chcore::IFeedbackHandler* piFeedbackHandler, size_t stSessionUniqueID);
@@ -204,7 +204,7 @@
 	void KillThread();
 	void RequestStopThread();
 
-	CString GetRelatedPathNL(EPathType ePathType);
+	chcore::TSmartPath GetRelatedPathNL(EPathType ePathType);
 
 	static void OnCfgOptionChanged(const chcore::TStringSet& rsetChanges, void* pParam);
 
@@ -234,8 +234,8 @@
 	bool m_bForce;						// if the continuation of tasks should be independent of max concurrently running task limit
 	bool m_bContinue;					// allows task to continue
 
-	CString m_strTaskDirectory;			// base path at which the files will be stored
-	CString m_strFilePath;				// exact filename with path to the task definition file
+	chcore::TSmartPath m_strTaskDirectory;			// base path at which the files will be stored
+	chcore::TSmartPath m_strFilePath;				// exact filename with path to the task definition file
 
 	bool m_bRareStateModified;			// rarely changing state has been modified
 	bool m_bOftenStateModified;			// rarely changing state has been modified
@@ -271,7 +271,7 @@
 	void Create(chcore::IFeedbackHandlerFactory* piFeedbackHandlerFactory);
 
 	CTaskPtr CreateTask(const chcore::TTaskDefinition& tTaskDefinition);
-	CTaskPtr ImportTask(const CString& strTaskPath);
+	CTaskPtr ImportTask(const chcore::TSmartPath& strTaskPath);
 
 	size_t GetSize() const;
 
@@ -304,15 +304,15 @@
 
 	bool AreAllFinished();
 
-	void SetTasksDir(const tchar_t* pszPath);
+	void SetTasksDir(const chcore::TSmartPath& pathDir);
 
 protected:
 	void StopAllTasksNL();
 
 	CTaskPtr CreateEmptyTask();
 
 public:
-	tstring_t m_strTasksDir;
+	chcore::TSmartPath m_pathTasksDir;
 
 	mutable boost::shared_mutex m_lock;