Convert last uses of CString in paths.cpp/paths.h to String.

diff --git a/Src/FileOrFolderSelect.cpp b/Src/FileOrFolderSelect.cpp
index be1b381..d9a1f46 100644 (file)
--- a/Src/FileOrFolderSelect.cpp
+++ b/Src/FileOrFolderSelect.cpp
@@ -127,7 +127,7 @@ BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
                bRetVal = GetSaveFileName((OPENFILENAME *)&ofn);
        // common file dialog populated sSelectedFile variable's buffer
        sSelectedFile.ReleaseBuffer();
-       SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
+       SetCurrentDirectory(paths_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
 
        if (bRetVal)
                path = sSelectedFile;
@@ -254,7 +254,7 @@ BOOL SelectFileOrFolder(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*
        BOOL bRetVal = GetOpenFileName((OPENFILENAME *)&ofn);
        // common file dialog populated sSelectedFile variable's buffer
        sSelectedFile.ReleaseBuffer();
-       SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
+       SetCurrentDirectory(paths_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
 
        if (bRetVal)
        {

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 2d9be42..e7bdb18 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2174,7 +2174,7 @@ void CMainFrame::OnDropFiles(HDROP dropInfo)
        for (UINT i = 0; i < fileCount; i++)
        {
                // if this was a shortcut, we need to expand it to the target path
-               CString expandedFile = ExpandShortcut(files[i]);
+               CString expandedFile = ExpandShortcut((LPCTSTR)files[i]).c_str();
 
                // if that worked, we should have a real file name
                if (!expandedFile.IsEmpty()) 

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 1183e3a..6bb11de 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -813,7 +813,8 @@ static String CmdlineOption(int idres)
  */
 CString CMergeApp::GetDefaultEditor()
 {
-       CString path = paths_GetWindowsDirectory() + _T("\\NOTEPAD.EXE");
+       CString path = paths_GetWindowsDirectory().c_str();
+       path += _T("\\NOTEPAD.EXE");
        return path;
 }
 
@@ -829,7 +830,7 @@ CString CMergeApp::GetDefaultEditor()
  */
 CString CMergeApp::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
 {
-       CString pathMyFolders = paths_GetMyDocuments(NULL);
+       CString pathMyFolders = paths_GetMyDocuments(NULL).c_str();
        CString pathFilters(pathMyFolders);
        if (pathFilters.Right(1) != _T("\\"))
                pathFilters += _T("\\");

diff --git a/Src/PatchDlg.cpp b/Src/PatchDlg.cpp
index de9cf2a..f6c88d6 100644 (file)
--- a/Src/PatchDlg.cpp
+++ b/Src/PatchDlg.cpp
@@ -134,7 +134,7 @@ void CPatchDlg::OnOK()
        }
  
        // Check that result (patch) file is absolute path
-       if (!paths_IsPathAbsolute(m_fileResult))
+       if (!paths_IsPathAbsolute((LPCTSTR)m_fileResult))
        {
                ResMsgBox1(IDS_PATH_NOT_ABSOLUTE, m_fileResult, MB_ICONSTOP);
                m_ctlResult.SetFocus();

diff --git a/Src/paths.cpp b/Src/paths.cpp
index a05cc64..5a785bb 100644 (file)
--- a/Src/paths.cpp
+++ b/Src/paths.cpp
@@ -13,7 +13,7 @@
 #include <shlobj.h>
 
 static bool IsSlash(LPCTSTR pszStart, int nPos);
-static bool GetDirName(const CString & sDir, CString& sName);
+static bool GetDirName(LPCTSTR sDir, String& sName);
 
 /** 
  * @brief Checks if char in string is slash.
@@ -115,7 +115,7 @@ void paths_normalize(String & sPath)
  * @return true if canonical name exists.
  * @todo Should we return empty string as sName when returning false?
  */
-static bool GetDirName(LPCTSTR sDir, CString& sName)
+static bool GetDirName(LPCTSTR sDir, String& sName)
 {
        // FindFirstFile doesn't work for root:
        // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/fs/findfirstfile.asp
@@ -270,7 +270,7 @@ bool paths_CreateIfNeeded(LPCTSTR szPath)
        if (*szPath == '\0')
                return false;
 
-       CString sTemp;
+       String sTemp;
        if (GetDirName(szPath, sTemp))
                return true;
 
@@ -286,7 +286,7 @@ bool paths_CreateIfNeeded(LPCTSTR szPath)
        }
        // Now fullPath holds our desired path
 
-       CString sLong;
+       String sLong;
        TCHAR *ptr = fullPath;
        TCHAR *end = NULL;
 
@@ -318,7 +318,7 @@ bool paths_CreateIfNeeded(LPCTSTR szPath)
                // advance to next component (or set ptr==0 to flag end)
                ptr = (end ? end+1 : 0);
 
-               CString sNextName;
+               String sNextName;
                if (!GetDirName(fullPath, sNextName))
                {
                        // try to create directory, and then double-check its existence
@@ -375,48 +375,48 @@ PATH_EXISTENCE GetPairComparability(LPCTSTR pszLeft, LPCTSTR pszRight)
  * @param [in] inFile Shortcut to expand.
  * @return Full path or empty string if error happened.
  */
-CString ExpandShortcut(const CString &inFile)
+String ExpandShortcut(const String &inFile)
 {
-       CString outFile;
-
-    // Make sure we have a path
-    ASSERT(inFile != _T(""));
-
-    IShellLink* psl;
-    HRESULT hres;
-
-    // Create instance for shell link
-    hres = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
-        IID_IShellLink, (LPVOID*) &psl);
-    if (SUCCEEDED(hres))
-    {
-        // Get a pointer to the persist file interface
-        IPersistFile* ppf;
-        hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*) &ppf);
-        if (SUCCEEDED(hres))
-        {
-            USES_CONVERSION;
-            LPCTSTR szFile = inFile;
-            // Load shortcut
-            hres = ppf->Load(T2CW(szFile), STGM_READ);
-
-            if (SUCCEEDED(hres)) {
+       String outFile;
+
+       // Make sure we have a path
+       ASSERT(inFile != _T(""));
+
+       IShellLink* psl;
+       HRESULT hres;
+
+       // Create instance for shell link
+       hres = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+               IID_IShellLink, (LPVOID*) &psl);
+       if (SUCCEEDED(hres))
+       {
+               // Get a pointer to the persist file interface
+               IPersistFile* ppf;
+               hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*) &ppf);
+               if (SUCCEEDED(hres))
+               {
+                       USES_CONVERSION;
+                       LPCTSTR szFile = inFile.c_str();
+                       // Load shortcut
+                       hres = ppf->Load(T2CW(szFile), STGM_READ);
+
+                       if (SUCCEEDED(hres))
+                       {
                                WIN32_FIND_DATA wfd;
                                // find the path from that
-                               HRESULT hres = psl->GetPath(outFile.GetBuffer(MAX_PATH), 
-                                                               MAX_PATH,
-                                                               &wfd, 
-                                                               SLGP_UNCPRIORITY);
-
-                               outFile.ReleaseBuffer();
-            }
-            ppf->Release();
-        }
-        psl->Release();
-    }
+                               TCHAR buf[MAX_PATH] = {0};
+                               HRESULT hres = psl->GetPath(buf, MAX_PATH, &wfd,
+                                       SLGP_UNCPRIORITY);
+
+                               outFile = buf;
+                       }
+                       ppf->Release();
+               }
+               psl->Release();
+       }
 
        // if this fails, outFile == ""
-    return outFile;
+       return outFile;
 }
 
 /** 
@@ -489,26 +489,22 @@ String paths_GetParentPath(LPCTSTR path)
  * @param [in] path Original path.
  * @return Last subdirectory in path.
  */
-CString paths_GetLastSubdir(const CString & path)
+String paths_GetLastSubdir(const String & path)
 {
-       CString parentPath(path);
-       int len = parentPath.GetLength();
+       String parentPath(path);
+       int len = parentPath.length();
 
        // Remove last '\' from paths
        if (parentPath[len - 1] == '\\')
        {
-               parentPath.Delete(len - 1, 1);
+               parentPath.erase(len - 1, 1);
                --len;
        }
 
        // Find last part of path
-       int pos = parentPath.ReverseFind('\\');
-
+       int pos = parentPath.find_last_of('\\');
        if (pos > 2)
-       {
-               parentPath.Delete(0, pos);
-       }
-
+               parentPath.erase(0, pos);
        return parentPath;
 }
 
@@ -517,12 +513,12 @@ CString paths_GetLastSubdir(const CString & path)
  * @param [in] path Path to check.
  * @return TRUE if given path is absolute path.
  */
-BOOL paths_IsPathAbsolute(const CString &path)
+BOOL paths_IsPathAbsolute(const String &path)
 {
-       if (path.GetLength() < 3)
+       if (path.length() < 3)
                return FALSE;
        
-       int pos = path.ReverseFind('\\');
+       int pos = path.find_last_of('\\');
 
        // Absolute path must have "\" and cannot start with it.
        // Also "\\blahblah" is invalid.
@@ -568,12 +564,11 @@ String paths_EnsurePathExist(const String & sPath)
  * @brief Get Windows directory.
  * @return Windows directory.
  */
-CString paths_GetWindowsDirectory()
+String paths_GetWindowsDirectory()
 {
-       CString str;
-       GetWindowsDirectory(str.GetBuffer(MAX_PATH), MAX_PATH);
-       str.ReleaseBuffer();
-       return str;
+       TCHAR buf[MAX_PATH] = {0};
+       GetWindowsDirectory(buf, MAX_PATH);
+       return buf;
 }
 
 /**
@@ -582,16 +577,16 @@ CString paths_GetWindowsDirectory()
  * @param [in] hWindow Parent window.
  * @return Full path to My Documents -folder.
  */
-CString paths_GetMyDocuments(HWND hWindow)
+String paths_GetMyDocuments(HWND hWindow)
 {
        LPITEMIDLIST pidl;
        LPMALLOC pMalloc;
-       CString path;
-       TCHAR szPath[MAX_PATH] = {0};
+       String path;
 
        HRESULT rv = SHGetSpecialFolderLocation(hWindow, CSIDL_PERSONAL, &pidl);
        if (rv == S_OK)
        {
+               TCHAR szPath[MAX_PATH] = {0};
                if (SHGetPathFromIDList(pidl, szPath))
                {
                        path = szPath;

diff --git a/Src/paths.h b/Src/paths.h
index 2d26d72..4bf6bb2 100644 (file)
--- a/Src/paths.h
+++ b/Src/paths.h
@@ -28,13 +28,13 @@ void paths_normalize(String & sPath);
 String paths_GetLongPath(LPCTSTR szPath, BOOL bExpandEnvs = TRUE);
 bool paths_CreateIfNeeded(LPCTSTR szPath);
 PATH_EXISTENCE GetPairComparability(LPCTSTR pszLeft, LPCTSTR pszRight);
-CString ExpandShortcut(const CString &inFile);
+String ExpandShortcut(const String &inFile);
 String paths_ConcatPath(const String & path, const String & subpath);
 String paths_GetParentPath(LPCTSTR path);
-CString paths_GetLastSubdir(const CString & path);
-BOOL paths_IsPathAbsolute(const CString & path);
+String paths_GetLastSubdir(const String & path);
+BOOL paths_IsPathAbsolute(const String & path);
 String paths_EnsurePathExist(const String & sPath);
-CString paths_GetWindowsDirectory();
-CString paths_GetMyDocuments(HWND hWindow);
+String paths_GetWindowsDirectory();
+String paths_GetMyDocuments(HWND hWindow);
 
 #endif // paths_h_included