Remove Win32 implementation from common file.

lib/filelister.cpp

@@ -137,151 +137,6 @@ bool FileLister::acceptFile(const std::string &filename)
 
 #if defined(_WIN32)
 
-// Here is the catch: cppcheck core is Ansi code (using char type).
-// When compiling Unicode targets WinAPI automatically uses *W Unicode versions
-// of called functions. So we must convert data given to WinAPI functions from
-// ANSI to Unicode. Likewise we must convert data we get from WinAPI from
-// Unicode to ANSI.
-
-#if defined(UNICODE)
-
-static bool TransformUcs2ToAnsi(LPCWSTR psUcs, LPSTR psAnsi, int nAnsi)
-{
-    WideCharToMultiByte(CP_ACP, 0, psUcs, -1, psAnsi, nAnsi, NULL, NULL);
-    return true;
-}
-
-static bool TransformAnsiToUcs2(LPCSTR psAnsi, LPWSTR psUcs, UINT nUcs)
-{
-    MultiByteToWideChar(CP_ACP, 0, psAnsi, -1, psUcs, nUcs);
-    return true;
-}
-
-static BOOL MyIsDirectory(std::string path)
-{
-    WCHAR * unicodeCleanPath = new WCHAR[path.size() + 1];
-    TransformAnsiToUcs2(path.c_str(), unicodeCleanPath,
-                        (path.size() * sizeof(WCHAR)) + 1);
-    // See http://msdn.microsoft.com/en-us/library/bb773621(VS.85).aspx
-    BOOL res = PathIsDirectory(unicodeCleanPath);
-    delete [] unicodeCleanPath;
-    return res;
-}
-
-static HANDLE MyFindFirstFile(std::string path, LPWIN32_FIND_DATA findData)
-{
-    WCHAR * unicodeOss = new wchar_t[path.size() + 1];
-    TransformAnsiToUcs2(path.c_str(), unicodeOss, (path.size() + 1) * sizeof(WCHAR));
-    HANDLE hFind = FindFirstFile(unicodeOss, findData);
-    delete [] unicodeOss;
-    return hFind;
-}
-
-#else // defined(UNICODE)
-
-static BOOL MyIsDirectory(std::string path)
-{
-#ifdef __BORLANDC__
-    return (GetFileAttributes(path.c_str()) & FILE_ATTRIBUTE_DIRECTORY);
-#else
-// See http://msdn.microsoft.com/en-us/library/bb773621(VS.85).aspx
-return PathIsDirectory(path.c_str());
-#endif
-}
-
-static HANDLE MyFindFirstFile(std::string path, LPWIN32_FIND_DATA findData)
-{
-    HANDLE hFind = FindFirstFile(path.c_str(), findData);
-    return hFind;
-}
-
-#endif // defined(UNICODE)
-
-void FileLister::recursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive)
-{
-    // oss is the search string passed into FindFirst and FindNext.
-    // bdir is the base directory which is used to form pathnames.
-    // It always has a trailing backslash available for concatenation.
-    std::ostringstream bdir, oss;
-
-    std::string cleanedPath = path;
-    std::replace(cleanedPath.begin(), cleanedPath.end(), '/', '\\');
-
-    oss << cleanedPath;
-
-    if (MyIsDirectory(cleanedPath.c_str()))
-    {
-        char c = cleanedPath[ cleanedPath.size()-1 ];
-        switch (c)
-        {
-        case '\\':
-            oss << '*';
-            bdir << cleanedPath;
-            break;
-        case '*':
-            bdir << cleanedPath.substr(0, cleanedPath.length() - 1);
-            break;
-        default:
-            oss << "\\*";
-            bdir << cleanedPath << '\\';
-        }
-    }
-    else
-    {
-        std::string::size_type pos;
-        pos = cleanedPath.find_last_of('\\');
-        if (std::string::npos != pos)
-        {
-            bdir << cleanedPath.substr(0, pos + 1);
-        }
-    }
-
-    WIN32_FIND_DATA ffd;
-    HANDLE hFind = MyFindFirstFile(oss.str(), &ffd);
-    if (INVALID_HANDLE_VALUE == hFind)
-        return;
-
-    do
-    {
-        if (ffd.cFileName[0] == '.' || ffd.cFileName[0] == '\0')
-            continue;
-
-#if defined(UNICODE)
-        char * ansiFfd = new char[wcslen(ffd.cFileName) + 1];
-        TransformUcs2ToAnsi(ffd.cFileName, ansiFfd, wcslen(ffd.cFileName) + 1);
-#else // defined(UNICODE)
-        char * ansiFfd = &ffd.cFileName[0];
-#endif // defined(UNICODE)
-
-        std::ostringstream fname;
-        fname << bdir.str().c_str() << ansiFfd;
-
-        if ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
-        {
-            // File
-
-            // If recursive is not used, accept all files given by user
-            if (!recursive || FileLister::acceptFile(ansiFfd))
-                filenames.push_back(fname.str());
-        }
-        else if (recursive)
-        {
-            // Directory
-            FileLister::recursiveAddFiles(filenames, fname.str().c_str(), recursive);
-        }
-#if defined(UNICODE)
-        delete [] ansiFfd;
-#endif // defined(UNICODE)
-    }
-    while (FindNextFile(hFind, &ffd) != FALSE);
-
-    if (INVALID_HANDLE_VALUE != hFind)
-    {
-        FindClose(hFind);
-        hFind = INVALID_HANDLE_VALUE;
-    }
-}
-
 #else // other than _WIN32
 
 ///////////////////////////////////////////////////////////////////////////////

lib/filelister.h

@@ -29,7 +29,7 @@
 class FileLister
 {
 public:
-    virtual void recursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive);
+    virtual void recursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive) = 0;
     virtual std::string simplifyPath(const char *originalPath);
     virtual bool sameFileName(const std::string &fname1, const std::string &fname2);
     virtual bool acceptFile(const std::string &filename);

lib/filelister_win32.cpp

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "filelister.h"
 #include "filelister_win32.h"
 #include <sstream>
 #include <vector>
@@ -171,7 +172,7 @@ void FileListerWin32::recursiveAddFiles(std::vector<std::string> &filenames, con
         else if (recursive)
         {
             // Directory
-            FileLister::recursiveAddFiles(filenames, fname.str().c_str(), recursive);
+            getFileLister()->recursiveAddFiles(filenames, fname.str().c_str(), recursive);
         }
 #if defined(UNICODE)
         delete [] ansiFfd;