Index: src/ch/TSubTaskBase.cpp
===================================================================
diff -u -r9a171c5d46f2bc029d99a698d88eeff60497cd3b -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/TSubTaskBase.cpp (.../TSubTaskBase.cpp) (revision 9a171c5d46f2bc029d99a698d88eeff60497cd3b)
+++ src/ch/TSubTaskBase.cpp (.../TSubTaskBase.cpp) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -22,7 +22,7 @@
// ============================================================================
#include "stdafx.h"
#include "TSubTaskBase.h"
-#include "TBasePathData.h"
+#include "../libchcore/TBasePathData.h"
#include "TLocalFilesystem.h"
#include "TSubTaskContext.h"
#include "../libchcore/TTaskDefinition.h"
@@ -42,7 +42,7 @@
chcore::TSmartPath TSubTaskBase::CalculateDestinationPath(const CFileInfoPtr& spFileInfo, chcore::TSmartPath pathDst, int iFlags) const
{
- const TBasePathDataContainer& rSourcePathsInfo = GetContext().GetBasePathDataContainer();
+ const chcore::TBasePathDataContainer& rSourcePathsInfo = GetContext().GetBasePathDataContainer();
if(!spFileInfo)
THROW(_T("Invalid pointer"), 0, 0, 0);
Index: src/ch/TSubTaskContext.cpp
===================================================================
diff -u -rab32897e61cc637a1e28d9dc3f0489b8d16a429c -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/TSubTaskContext.cpp (.../TSubTaskContext.cpp) (revision ab32897e61cc637a1e28d9dc3f0489b8d16a429c)
+++ src/ch/TSubTaskContext.cpp (.../TSubTaskContext.cpp) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -23,7 +23,7 @@
#include "stdafx.h"
#include "TSubTaskContext.h"
-TSubTaskContext::TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats,
+TSubTaskContext::TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats,
TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog, chcore::IFeedbackHandler* piFeedbackHandler,
chcore::TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal) :
m_rTaskDefinition(rTaskDefinition),
Index: src/ch/TSubTaskContext.h
===================================================================
diff -u -rab32897e61cc637a1e28d9dc3f0489b8d16a429c -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision ab32897e61cc637a1e28d9dc3f0489b8d16a429c)
+++ src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -30,9 +30,9 @@
class IFeedbackHandler;
class TTaskDefinition;
class TWorkerThreadController;
+ class TBasePathDataContainer;
}
-class TBasePathDataContainer;
class TTaskLocalStats;
class TTaskConfigTracker;
class TTaskBasicProgressInfo;
@@ -44,16 +44,16 @@
class TSubTaskContext
{
public:
- TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats,
+ TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats,
TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog,
chcore::IFeedbackHandler* piFeedbackHandler, chcore::TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal);
~TSubTaskContext();
chcore::TTaskDefinition& GetTaskDefinition() { return m_rTaskDefinition; }
const chcore::TTaskDefinition& GetTaskDefinition() const { return m_rTaskDefinition; }
- TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; }
- const TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; }
+ chcore::TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; }
+ const chcore::TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; }
CFileInfoArray& GetFilesCache() { return m_rFilesCache; }
const CFileInfoArray& GetFilesCache() const { return m_rFilesCache; }
@@ -83,7 +83,7 @@
chcore::TTaskDefinition& m_rTaskDefinition;
// information about input paths
- TBasePathDataContainer& m_rBasePathDataContainer;
+ chcore::TBasePathDataContainer& m_rBasePathDataContainer;
// data on which to operate
CFileInfoArray& m_rFilesCache;
Index: src/ch/TSubTaskCopyMove.cpp
===================================================================
diff -u -r4be0f47d68a1a161529dc55901659b9daec996e3 -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision 4be0f47d68a1a161529dc55901659b9daec996e3)
+++ src/ch/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -272,7 +272,7 @@
if(stBaseIndex >= GetContext().GetBasePathDataContainer().GetCount())
THROW(_T("Index out of bounds"), 0, 0, 0);
- TBasePathDataPtr spPathData = GetContext().GetBasePathDataContainer().GetAt(stBaseIndex);
+ chcore::TBasePathDataPtr spPathData = GetContext().GetBasePathDataContainer().GetAt(stBaseIndex);
return spPathData->GetMove();
}
Index: src/ch/TSubTaskScanDirectory.cpp
===================================================================
diff -u -r4be0f47d68a1a161529dc55901659b9daec996e3 -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/TSubTaskScanDirectory.cpp (.../TSubTaskScanDirectory.cpp) (revision 4be0f47d68a1a161529dc55901659b9daec996e3)
+++ src/ch/TSubTaskScanDirectory.cpp (.../TSubTaskScanDirectory.cpp) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -28,7 +28,7 @@
#include "FeedbackHandler.h"
#include "TLocalFilesystem.h"
#include "../libchcore/FeedbackHandlerBase.h"
-#include "TBasePathData.h"
+#include "../libchcore/TBasePathData.h"
#include "../libchcore/TWorkerThreadController.h"
#include "TTaskLocalStats.h"
@@ -48,7 +48,7 @@
CFileInfoArray& rFilesCache = GetContext().GetFilesCache();
chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition();
chcore::IFeedbackHandler* piFeedbackHandler = GetContext().GetFeedbackHandler();
- const TBasePathDataContainer& rarrSourcePathsInfo = GetContext().GetBasePathDataContainer();
+ const chcore::TBasePathDataContainer& rarrSourcePathsInfo = GetContext().GetBasePathDataContainer();
chcore::TWorkerThreadController& rThreadController = GetContext().GetThreadController();
TTaskLocalStats& rTaskLocalStats = GetContext().GetTaskLocalStats();
Index: src/ch/ch.vc90.vcproj
===================================================================
diff -u -r3d0d2c62687aa15c5720d8c9810258bc651a9a77 -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/ch.vc90.vcproj (.../ch.vc90.vcproj) (revision 3d0d2c62687aa15c5720d8c9810258bc651a9a77)
+++ src/ch/ch.vc90.vcproj (.../ch.vc90.vcproj) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -463,14 +463,6 @@
>
-
-
-
-
Index: src/ch/task.h
===================================================================
diff -u -r4be0f47d68a1a161529dc55901659b9daec996e3 -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/ch/task.h (.../task.h) (revision 4be0f47d68a1a161529dc55901659b9daec996e3)
+++ src/ch/task.h (.../task.h) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -27,7 +27,7 @@
#include "FileFilter.h"
#include "../libchcore/TTaskDefinition.h"
#include "TTaskConfigTracker.h"
-#include "TBasePathData.h"
+#include "../libchcore/TBasePathData.h"
#include "TSubTaskBase.h"
#include "TTaskLocalStats.h"
#include "TTaskGlobalStats.h"
@@ -210,7 +210,7 @@
TTaskConfigTracker m_cfgTracker;
- TBasePathDataContainer m_arrSourcePathsInfo;
+ chcore::TBasePathDataContainer m_arrSourcePathsInfo;
// current task state (derivatives of the task initial information)
// changing slowly or only partially
Fisheye: tag 9a171c5d46f2bc029d99a698d88eeff60497cd3b is not in file src/libchcore/TBasePathData.cpp
Fisheye: Tag d345f15636dc88c4c40fe310ac7777bd024e12d9 refers to a dead (removed) revision in file `src/ch/TBasePathData.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: tag 9a171c5d46f2bc029d99a698d88eeff60497cd3b is not in file src/libchcore/TBasePathData.h
Fisheye: Tag d345f15636dc88c4c40fe310ac7777bd024e12d9 refers to a dead (removed) revision in file `src/ch/TBasePathData.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/libchcore/libchcore.vc90.vcproj
===================================================================
diff -u -rab32897e61cc637a1e28d9dc3f0489b8d16a429c -rd345f15636dc88c4c40fe310ac7777bd024e12d9
--- src/libchcore/libchcore.vc90.vcproj (.../libchcore.vc90.vcproj) (revision ab32897e61cc637a1e28d9dc3f0489b8d16a429c)
+++ src/libchcore/libchcore.vc90.vcproj (.../libchcore.vc90.vcproj) (revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
@@ -340,93 +340,13 @@
Name="Core"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+