3.0

1 files changed, 63 insertions, 63 deletions

diff --git a/comparison.h b/comparison.h
index dc8c4b8d..28f9d8a3 100644
--- a/comparison.h
+++ b/comparison.h
@@ -8,69 +8,69 @@ class StatusHandler;
 
 namespace FreeFileSync
 {
-    class FilterProcess;
-
-    struct FolderPairCfg
-    {
-        FolderPairCfg(const Zstring& leftDir,
-                      const Zstring& rightDir,
-                      bool filterAct,
-                      const wxString& include,
-                      const wxString& exclude,
-                      const SyncConfiguration& syncCfg) :
-                leftDirectory(leftDir),
-                rightDirectory(rightDir),
-                filterIsActive(filterAct),
-                includeFilter(include),
-                excludeFilter(exclude),
-                syncConfiguration(syncCfg) {}
-
-        Zstring leftDirectory;
-        Zstring rightDirectory;
-
-        bool filterIsActive;
-        wxString includeFilter;
-        wxString excludeFilter;
-
-        SyncConfiguration syncConfiguration;
-    };
-    std::vector<FolderPairCfg> extractCompareCfg(const MainConfiguration& mainCfg);
-
-
-    //class handling comparison process
-    class CompareProcess
-    {
-    public:
-        CompareProcess(const bool traverseSymLinks,
-                       const unsigned int fileTimeTol,
-                       const bool ignoreOneHourDiff,
-                       xmlAccess::OptionalDialogs& warnings,
-                       StatusHandler* handler);
-
-        void startCompareProcess(const std::vector<FolderPairCfg>& directoryPairs,
-                                 const CompareVariant cmpVar,
-                                 FolderComparison& output);
-
-    private:
-        void compareByTimeSize(const std::vector<FolderPairCfg>& directoryPairsFormatted, FolderComparison& output);
-
-        void compareByContent(const std::vector<FolderPairCfg>& directoryPairsFormatted, FolderComparison& output);
-
-        //create comparison result table and fill relation except for files existing on both sides
-        void performBaseComparison(const FolderPairCfg& pair, BaseDirMapping& output, std::vector<FileMapping*>& appendUndefined);
-
-        //buffer accesses to the same directories; useful when multiple folder pairs are used
-        class DirectoryBuffer;
-        boost::shared_ptr<DirectoryBuffer> directoryBuffer; //std::auto_ptr does not work with forward declarations!
-
-        const unsigned int fileTimeTolerance; //max allowed file time deviation
-        const bool ignoreOneHourDifference;
-
-        xmlAccess::OptionalDialogs& m_warnings;
-
-        StatusHandler* const statusUpdater;
-        const Zstring txtComparingContentOfFiles;
-    };
+class FilterProcess;
+
+struct FolderPairCfg
+{
+    FolderPairCfg(const Zstring& leftDir,
+                  const Zstring& rightDir,
+                  bool filterAct,
+                  const Zstring& include,
+                  const Zstring& exclude,
+                  const SyncConfiguration& syncCfg) :
+        leftDirectory(leftDir),
+        rightDirectory(rightDir),
+        filterIsActive(filterAct),
+        includeFilter(include),
+        excludeFilter(exclude),
+        syncConfiguration(syncCfg) {}
+
+    Zstring leftDirectory;
+    Zstring rightDirectory;
+
+    bool filterIsActive;
+    Zstring includeFilter;
+    Zstring excludeFilter;
+
+    SyncConfiguration syncConfiguration;
+};
+std::vector<FolderPairCfg> extractCompareCfg(const MainConfiguration& mainCfg);
+
+
+//class handling comparison process
+class CompareProcess
+{
+public:
+    CompareProcess(const bool traverseSymLinks,
+                   const unsigned int fileTimeTol,
+                   const bool ignoreOneHourDiff,
+                   xmlAccess::OptionalDialogs& warnings,
+                   StatusHandler* handler);
+
+    void startCompareProcess(const std::vector<FolderPairCfg>& directoryPairs,
+                             const CompareVariant cmpVar,
+                             FolderComparison& output);
+
+private:
+    void compareByTimeSize(const std::vector<FolderPairCfg>& directoryPairsFormatted, FolderComparison& output);
+
+    void compareByContent(const std::vector<FolderPairCfg>& directoryPairsFormatted, FolderComparison& output);
+
+    //create comparison result table and fill relation except for files existing on both sides
+    void performBaseComparison(BaseDirMapping& output, std::vector<FileMapping*>& appendUndefined);
+
+    //buffer accesses to the same directories; useful when multiple folder pairs are used
+    class DirectoryBuffer;
+    boost::shared_ptr<DirectoryBuffer> directoryBuffer; //std::auto_ptr does not work with forward declarations!
+
+    const unsigned int fileTimeTolerance; //max allowed file time deviation
+    const bool ignoreOneHourDifference;
+
+    xmlAccess::OptionalDialogs& m_warnings;
+
+    StatusHandler* const statusUpdater;
+    const Zstring txtComparingContentOfFiles;
+};
 }
 
 #endif // COMPARISON_H_INCLUDED