1.15

1 files changed, 14 insertions, 8 deletions

diff --git a/comparison.h b/comparison.h
index a5705238..bbd93f9a 100644
--- a/comparison.h
+++ b/comparison.h
@@ -4,31 +4,37 @@
 #include "FreeFileSync.h"
 #include "library/statusHandler.h"
 
+class DirectoryDescrBuffer;
 
 namespace FreeFileSync
 {
-    bool foldersAreValidForComparison(const vector<FolderPair>& folderPairs, wxString& errorMessage);
-    bool foldersHaveDependencies(const vector<FolderPair>& folderPairs, wxString& warningMessage);
+    bool foldersAreValidForComparison(const std::vector<FolderPair>& folderPairs, wxString& errorMessage);
+    bool foldersHaveDependencies(     const std::vector<FolderPair>& folderPairs, wxString& warningMessage);
 
     //class handling comparison process
     class CompareProcess
     {
     public:
-        CompareProcess(bool lineBreakOnMessages, StatusHandler* handler);
+        CompareProcess(bool lineBreakOnMessages, bool handleDstOnFat32Drives, StatusHandler* handler);
 
-        void startCompareProcess(const vector<FolderPair>& directoryPairsFormatted,
+        void startCompareProcess(const std::vector<FolderPair>& directoryPairsFormatted,
                                  const CompareVariant cmpVar,
                                  FileCompareResult& output) throw(AbortThisProcess);
 
     private:
+        void compareByTimeSize(const std::vector<FolderPair>& directoryPairsFormatted, FileCompareResult& output);
+
+        void compareByContent(const std::vector<FolderPair>& directoryPairsFormatted, FileCompareResult& output);
+
         //create comparison result table and fill relation except for files existing on both sides
-        void performBaseComparison(const vector<FolderPair>& directoryPairsFormatted,
+        void performBaseComparison(const FolderPair& pair,
+                                   DirectoryDescrBuffer& descriptionBuffer,
                                    FileCompareResult& output);
 
+        const bool includeLineBreak; //optional line break for status messages (used by GUI mode only)
+        const bool handleDstOnFat32;
         StatusHandler* statusUpdater;
-        wxString optionalLineBreak; //optional line break for status messages (used by GUI mode only)
-
-        const Zstring txtComparingContentOfFiles;
+        Zstring txtComparingContentOfFiles;
     };
 }