Update of Lithuanian translation (#496)

[winmerge-jp/winmerge-jp.git] / Src / DirTravel.cpp

diff --git a/Src/DirTravel.cpp b/Src/DirTravel.cpp
index e11868b..bc7ba5a 100644 (file)
--- a/Src/DirTravel.cpp
+++ b/Src/DirTravel.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "pch.h"
 #include "DirTravel.h"
 #include <algorithm>
 #include <Poco/DirectoryIterator.h>
@@ -17,6 +18,7 @@
 #include "unicoder.h"
 #include "paths.h"
 #include "Win_VersionHelper.h"
+#include "DebugNew.h"
 
 using Poco::DirectoryIterator;
 using Poco::Timestamp;
@@ -35,16 +37,16 @@ void LoadAndSortFiles(const String& sDir, DirItemArray * dirs, DirItemArray * fi
 }
 
 /**
- * @brief Find files and subfolders from given folder.
- * This function saves all files and subfolders in given folder to arrays.
+ * @brief Find file and sub-folder names from given folder.
+ * This function saves all file and sub-folder names in given folder to arrays.
  * We use 64-bit version of stat() to get times since find doesn't return
  * valid times for very old files (around year 1970). Even stat() seems to
  * give negative time values but we can live with that. Those around 1970
- * times can happen when file is created so that it  doesn't get valid
- * creation or modificatio dates.
+ * times can happen when file is created so that it doesn't get valid
+ * creation or modification dates.
  * @param [in] sDir Base folder for files and subfolders.
- * @param [in, out] dirs Array where subfolders are stored.
- * @param [in, out] files Array where files are stored.
+ * @param [in, out] dirs Array where subfolder names are stored.
+ * @param [in, out] files Array where file names are stored.
  */
 static void LoadFiles(const String& sDir, DirItemArray * dirs, DirItemArray * files)
 {
@@ -79,7 +81,7 @@ static void LoadFiles(const String& sDir, DirItemArray * dirs, DirItemArray * fi
        WIN32_FIND_DATA ff;
        HANDLE h;
        if (IsWin7_OrGreater()) // (also 'Windows Server 2008 R2' and greater) for FindExInfoBasic and FIND_FIRST_EX_LARGE_FETCH
-               h = FindFirstFileEx(TFile(sPattern).wpath().c_str(), FindExInfoBasic, &ff, FindExSearchNameMatch, NULL, FIND_FIRST_EX_LARGE_FETCH);
+               h = FindFirstFileEx(TFile(sPattern).wpath().c_str(), FindExInfoBasic, &ff, FindExSearchNameMatch, nullptr, FIND_FIRST_EX_LARGE_FETCH);
        else
                h = FindFirstFile(TFile(sPattern).wpath().c_str(), &ff);
        if (h != INVALID_HANDLE_VALUE)